diff --git a/.editorconfig b/.editorconfig index 020db105c04a..de4715d5c902 100644 --- a/.editorconfig +++ b/.editorconfig @@ -24,7 +24,7 @@ insert_final_newline = false # see https://nixos.org/nixpkgs/manual/#chap-conventions # Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces -[*.{bash,json,lock,md,nix,pl,pm,py,rb,sh,xml}] +[*.{bash,js,json,lock,md,nix,pl,pm,py,rb,sh,xml}] indent_style = space # Match docbook files, set indent width of one @@ -32,7 +32,7 @@ indent_style = space indent_size = 1 # Match json/lockfiles/markdown/nix/ruby files, set indent width of two -[*.{json,lock,md,nix,rb}] +[*.{js,json,lock,md,nix,rb}] indent_size = 2 # Match all the Bash code in Nix files, set indent width of two diff --git a/ci/.editorconfig b/ci/.editorconfig deleted file mode 100644 index 180d0765eed9..000000000000 --- a/ci/.editorconfig +++ /dev/null @@ -1,4 +0,0 @@ -# TODO: Move to top-level via staging PR -[*.js] -indent_style = space -indent_size = 2 diff --git a/doc/hooks/meson.section.md b/doc/hooks/meson.section.md index c3cd89b12e89..dcbe8b8f56cf 100644 --- a/doc/hooks/meson.section.md +++ b/doc/hooks/meson.section.md @@ -91,3 +91,4 @@ Meson setup hook. - `prefixKey` - `enableParallelBuilding` +- `enableParallelChecking` diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md index 9bc2aea293e6..c97911fb349f 100644 --- a/doc/hooks/versionCheckHook.section.md +++ b/doc/hooks/versionCheckHook.section.md @@ -31,7 +31,7 @@ It does so in a clean environment (using `env --ignore-environment`), and it che The variables that this phase control are: - `dontVersionCheck`: Disable adding this hook to the [`preInstallCheckHooks`](#ssec-installCheck-phase). Useful if you do want to load the bash functions of the hook, but run them differently. -- `versionCheckProgram`: The full path to the program that should print the `${version}` string. Defaults roughly to `${placeholder "out"}/bin/${pname}`. Using `$out` in the value of this variable won't work, as environment variables from this variable are not expanded by the hook. Hence using `placeholder` is unavoidable. +- `versionCheckProgram`: The full path to the program that should print the `${version}` string. Defaults to using the first non-empty value `$binary` out of `${NIX_MAIN_PROGRAM}` and `${pname}`, in that order, to build roughly `${placeholder "out"}/bin/$binary`. `${NIX_MAIN_PROGRAM}`'s value comes from `meta.mainProgram`, and does not normally need to be set explicitly. When setting `versionCheckProgram`, using `$out` directly won't work, as environment variables from this variable are not expanded by the hook. Hence using `placeholder "out"` is unavoidable. - `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--help` and then `--version`. Examples: `version`, `-V`, `-v`. - `versionCheckKeepEnvironment`: A list of environment variables to keep and pass to the command. Only those variables should be added to this list that are actually required for the version command to work. If it is not feasible to explicitly list all these environment variables you can set this parameter to the special value `"*"` to disable the `--ignore-environment` flag and thus keep all environment variables. - `preVersionCheck`: A hook to run before the check is done. diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md index 1a40f4cc1a24..39ad3a564b56 100644 --- a/doc/languages-frameworks/cuda.section.md +++ b/doc/languages-frameworks/cuda.section.md @@ -65,97 +65,6 @@ for your specific card(s). Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/) and release notes for their software package. -## Adding a new CUDA release {#adding-a-new-cuda-release} - -> **WARNING** -> -> This section of the docs is still very much in progress. Feedback is welcome in GitHub Issues tagging @NixOS/cuda-maintainers or on [Matrix](https://matrix.to/#/#cuda:nixos.org). - -The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer, which we provide through the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. - -All new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) in place of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit), as they are much easier to maintain and update. - -### Updating CUDA redistributables {#updating-cuda-redistributables} - -1. Go to NVIDIA's index of CUDA redistributables: -2. Make a note of the new version of CUDA available. -3. Run - - ```bash - nix run github:connorbaker/cuda-redist-find-features -- \ - download-manifests \ - --log-level DEBUG \ - --version \ - https://developer.download.nvidia.com/compute/cuda/redist \ - ./pkgs/development/cuda-modules/cuda/manifests - ``` - - This will download a copy of the manifest for the new version of CUDA. -4. Run - - ```bash - nix run github:connorbaker/cuda-redist-find-features -- \ - process-manifests \ - --log-level DEBUG \ - --version \ - https://developer.download.nvidia.com/compute/cuda/redist \ - ./pkgs/development/cuda-modules/cuda/manifests - ``` - - This will generate a `redistrib_features_.json` file in the same directory as the manifest. -5. Update the `cudaVersionMap` attribute set in `pkgs/development/cuda-modules/cuda/extension.nix`. - -### Updating cuTensor {#updating-cutensor} - -1. Repeat the steps present in [Updating CUDA redistributables](#updating-cuda-redistributables) with the following changes: - - Use the index of cuTensor redistributables: - - Use the newest version of cuTensor available instead of the newest version of CUDA. - - Use `pkgs/development/cuda-modules/cutensor/manifests` instead of `pkgs/development/cuda-modules/cuda/manifests`. - - Skip the step of updating `cudaVersionMap` in `pkgs/development/cuda-modules/cuda/extension.nix`. - -### Updating supported compilers and GPUs {#updating-supported-compilers-and-gpus} - -1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers. -2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix` to include any new GPUs supported by the new release of CUDA. - -### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit} - -> **WARNING** -> -> While the CUDA Toolkit runfile installer is still available in Nixpkgs as the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute, its use is not recommended and should it be considered deprecated. Please migrate to the CUDA redistributables provided by the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. -> -> To ensure packages relying on the CUDA Toolkit runfile installer continue to build, it will continue to be updated until a migration path is available. - -1. Go to NVIDIA's CUDA Toolkit runfile installer download page: -2. Select the appropriate OS, architecture, distribution, and version, and installer type. - - - For example: Linux, x86_64, Ubuntu, 22.04, runfile (local) - - NOTE: Typically, we use the Ubuntu runfile. It is unclear if the runfile for other distributions will work. - -3. Take the link provided by the installer instructions on the webpage after selecting the installer type and get its hash by running: - - ```bash - nix store prefetch-file --hash-type sha256 - ``` - -4. Update `pkgs/development/cuda-modules/cudatoolkit/releases.nix` to include the release. - -### Updating the CUDA package set {#updating-the-cuda-package-set} - -1. Include a new `cudaPackages__` package set in `pkgs/top-level/all-packages.nix`. - - - NOTE: Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing. - -2. Successfully build the closure of the new package set, updating `pkgs/development/cuda-modules/cuda/overrides.nix` as needed. Below are some common failures: - -| Unable to ... | During ... | Reason | Solution | Note | -| --- | --- | --- | --- | --- | -| Find headers | `configurePhase` or `buildPhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain the headers | -| Find libraries | `configurePhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain CMake configuration files | -| Find libraries | `buildPhase` or `patchelf` | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contain the libraries | - -In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary. - ## Running Docker or Podman containers with CUDA support {#cuda-docker-podman} It is possible to run Docker or Podman containers with CUDA support. The recommended mechanism to perform this task is to use the [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/index.html). @@ -201,7 +110,7 @@ $ nix run nixpkgs#jq -- -r '.devices[].name' < /var/run/cdi/nvidia-container-too all ``` -### Specifying what devices to expose to the container {#specifying-what-devices-to-expose-to-the-container} +### Specifying what devices to expose to the container {#cuda-specifying-what-devices-to-expose-to-the-container} You can choose what devices are exposed to your containers by using the identifier on the generated CDI specification. Like follows: @@ -222,7 +131,7 @@ GPU 1: NVIDIA GeForce RTX 2080 SUPER (UUID: ) By default, the NVIDIA Container Toolkit will use the GPU index to identify specific devices. You can change the way to identify what devices to expose by using the `hardware.nvidia-container-toolkit.device-name-strategy` NixOS attribute. ::: -### Using docker-compose {#using-docker-compose} +### Using docker-compose {#cuda-using-docker-compose} It's possible to expose GPU's to a `docker-compose` environment as well. With a `docker-compose.yaml` file like follows: @@ -256,3 +165,142 @@ services: - nvidia.com/gpu=0 - nvidia.com/gpu=1 ``` + +## Contributing {#cuda-contributing} + +::: {.warning} +This section of the docs is still very much in progress. Feedback is welcome in GitHub Issues tagging @NixOS/cuda-maintainers or on [Matrix](https://matrix.to/#/#cuda:nixos.org). +::: + +### Package set maintenance {#cuda-package-set-maintenance} + +The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer, which we provide through the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. + +All new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) in place of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit), as they are much easier to maintain and update. + +#### Updating redistributables {#cuda-updating-redistributables} + +1. Go to NVIDIA's index of CUDA redistributables: +2. Make a note of the new version of CUDA available. +3. Run + + ```bash + nix run github:connorbaker/cuda-redist-find-features -- \ + download-manifests \ + --log-level DEBUG \ + --version \ + https://developer.download.nvidia.com/compute/cuda/redist \ + ./pkgs/development/cuda-modules/cuda/manifests + ``` + + This will download a copy of the manifest for the new version of CUDA. +4. Run + + ```bash + nix run github:connorbaker/cuda-redist-find-features -- \ + process-manifests \ + --log-level DEBUG \ + --version \ + https://developer.download.nvidia.com/compute/cuda/redist \ + ./pkgs/development/cuda-modules/cuda/manifests + ``` + + This will generate a `redistrib_features_.json` file in the same directory as the manifest. +5. Update the `cudaVersionMap` attribute set in `pkgs/development/cuda-modules/cuda/extension.nix`. + +#### Updating cuTensor {#cuda-updating-cutensor} + +1. Repeat the steps present in [Updating CUDA redistributables](#cuda-updating-redistributables) with the following changes: + - Use the index of cuTensor redistributables: + - Use the newest version of cuTensor available instead of the newest version of CUDA. + - Use `pkgs/development/cuda-modules/cutensor/manifests` instead of `pkgs/development/cuda-modules/cuda/manifests`. + - Skip the step of updating `cudaVersionMap` in `pkgs/development/cuda-modules/cuda/extension.nix`. + +#### Updating supported compilers and GPUs {#cuda-updating-supported-compilers-and-gpus} + +1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers. +2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/data/cuda.nix` to include any new GPUs supported by the new release of CUDA. + +#### Updating the CUDA Toolkit runfile installer {#cuda-updating-the-cuda-toolkit} + +::: {.warning} +While the CUDA Toolkit runfile installer is still available in Nixpkgs as the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute, its use is not recommended, and it should be considered deprecated. Please migrate to the CUDA redistributables provided by the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. + +To ensure packages relying on the CUDA Toolkit runfile installer continue to build, it will continue to be updated until a migration path is available. +::: + +1. Go to NVIDIA's CUDA Toolkit runfile installer download page: +2. Select the appropriate OS, architecture, distribution, and version, and installer type. + + - For example: Linux, x86_64, Ubuntu, 22.04, runfile (local) + - NOTE: Typically, we use the Ubuntu runfile. It is unclear if the runfile for other distributions will work. + +3. Take the link provided by the installer instructions on the webpage after selecting the installer type and get its hash by running: + + ```bash + nix store prefetch-file --hash-type sha256 + ``` + +4. Update `pkgs/development/cuda-modules/cudatoolkit/releases.nix` to include the release. + +#### Updating the CUDA package set {#cuda-updating-the-cuda-package-set} + +1. Include a new `cudaPackages__` package set in `pkgs/top-level/all-packages.nix`. + + - NOTE: Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing. + +2. Successfully build the closure of the new package set, updating `pkgs/development/cuda-modules/cuda/overrides.nix` as needed. Below are some common failures: + +| Unable to ... | During ... | Reason | Solution | Note | +| -------------- | -------------------------------- | ------------------------------------------------ | -------------------------- | ------------------------------------------------------------ | +| Find headers | `configurePhase` or `buildPhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contains the headers | +| Find libraries | `configurePhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contains CMake configuration files | +| Find libraries | `buildPhase` or `patchelf` | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contains the libraries | + +Failure to run the resulting binary is typically the most challenging to diagnose, as it may involve a combination of the aforementioned issues. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. Try the following debugging steps: + +1. First ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath). +2. Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. +3. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary. + +### Writing tests {#cuda-writing-tests} + +::: {.caution} +The existence of `passthru.testers` and `passthru.tests` should be considered an implementation detail -- they are not meant to be a public or stable interface. +::: + +In general, there are two attribute sets in `passthru` that are used to build and run tests for CUDA packages: `passthru.testers` and `passthru.tests`. Each attribute set may contain an attribute set named `cuda`, which contains CUDA-specific derivations. The `cuda` attribute set is used to separate CUDA-specific derivations from those which support multiple implementations (e.g., OpenCL, ROCm, etc.) or have different licenses. For an example of such generic derivations, see the `magma` package. + +::: {.note} +Derivations are nested under the `cuda` attribute due to an OfBorg quirk: if evaluation fails (e.g., because of unfree licenses), the entire enclosing attribute set is discarded. This prevents other attributes in the set from being discovered, evaluated, or built. +::: + +#### `passthru.testers` {#cuda-passthru-testers} + +Attributes added to `passthru.testers` are derivations which produce an executable which runs a test. The produced executable should: + +- Take care to set up the environment, make temporary directories, and so on. +- Be registered as the derivation's `meta.mainProgram` so that it can be run directly. + +::: {.note} +Testers which always require CUDA should be placed in `passthru.testers.cuda`, while those which are generic should be placed in `passthru.testers`. +::: + +The `passthru.testers` attribute set allows running tests outside the Nix sandbox. There are a number of reasons why this is useful, since such a test: + +- Can be run on non-NixOS systems, when wrapped with utilities like `nixGL` or `nix-gl-host`. +- Has network access patterns which are difficult or impossible to sandbox. +- Is free to produce output which is not deterministic, such as timing information. + +#### `passthru.tests` {#cuda-passthru-tests} + +Attributes added to `passthru.tests` are derivations which run tests inside the Nix sandbox. Tests should: + +- Use the executables produced by `passthru.testers`, where possible, to avoid duplication of test logic. +- Include `requiredSystemFeatures = [ "cuda" ];`, possibly conditioned on the value of `cudaSupport` if they are generic, to ensure that they are only run on systems exposing a CUDA-capable GPU. + +::: {.note} +Tests which always require CUDA should be placed in `passthru.tests.cuda`, while those which are generic should be placed in `passthru.tests`. +::: + +This is useful for tests which are deterministic (e.g., checking exit codes) and which can be provided with all necessary resources in the sandbox. diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index e327eb43ea40..166e0d4c7266 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -444,6 +444,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "..."; + fetcherVersion = 2; }; }) ``` @@ -558,6 +559,41 @@ set `prePnpmInstall` to the right commands to run. For example: In this example, `prePnpmInstall` will be run by both `pnpm.configHook` and by the `pnpm.fetchDeps` builder. +#### PNPM `fetcherVersion` {#javascript-pnpm-fetcherVersion} + +This is the version of the output of `pnpm.fetchDeps`, if you haven't set it already, you can use `1` with your current hash: + +```nix +{ + # ... + pnpmDeps = pnpm.fetchDeps { + # ... + hash = "..."; # you can use your already set hash here + fetcherVersion = 1; + }; +} +``` + +After upgrading to a newer `fetcherVersion`, you need to regenerate the hash: + +```nix +{ + # ... + pnpmDeps = pnpm.fetchDeps { + # ... + hash = "..."; # clear this hash and generate a new one + fetcherVersion = 2; + }; +} +``` + +This variable ensures that we can make changes to the output of `pnpm.fetchDeps` without breaking existing hashes. +Changes can include workarounds or bug fixes to existing PNPM issues. + +##### Version history {#javascript-pnpm-fetcherVersion-versionHistory} + +- 1: Initial version, nothing special +- 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975) ### Yarn {#javascript-yarn} diff --git a/doc/redirects.json b/doc/redirects.json index 4175d8ef4c91..bf27cda98186 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -2756,33 +2756,53 @@ "cuda": [ "index.html#cuda" ], - "adding-a-new-cuda-release": [ - "index.html#adding-a-new-cuda-release" - ], - "updating-cuda-redistributables": [ - "index.html#updating-cuda-redistributables" - ], - "updating-cutensor": [ - "index.html#updating-cutensor" - ], - "updating-supported-compilers-and-gpus": [ - "index.html#updating-supported-compilers-and-gpus" - ], - "updating-the-cuda-toolkit": [ - "index.html#updating-the-cuda-toolkit" - ], - "updating-the-cuda-package-set": [ - "index.html#updating-the-cuda-package-set" + "cuda-contributing": [ + "index.html#cuda-contributing" ], "cuda-docker-podman": [ "index.html#cuda-docker-podman" ], - "specifying-what-devices-to-expose-to-the-container": [ + "cuda-package-set-maintenance": [ + "index.html#cuda-package-set-maintenance", + "index.html#adding-a-new-cuda-release" + ], + "cuda-passthru-testers": [ + "index.html#cuda-passthru-testers" + ], + "cuda-passthru-tests": [ + "index.html#cuda-passthru-tests" + ], + "cuda-specifying-what-devices-to-expose-to-the-container": [ + "index.html#cuda-specifying-what-devices-to-expose-to-the-container", "index.html#specifying-what-devices-to-expose-to-the-container" ], - "using-docker-compose": [ + "cuda-updating-redistributables": [ + "index.html#cuda-updating-redistributables", + "index.html#updating-cuda-redistributables" + ], + "cuda-updating-cutensor": [ + "index.html#cuda-updating-cutensor", + "index.html#updating-cutensor" + ], + "cuda-updating-supported-compilers-and-gpus": [ + "index.html#cuda-updating-supported-compilers-and-gpus", + "index.html#updating-supported-compilers-and-gpus" + ], + "cuda-updating-the-cuda-package-set": [ + "index.html#cuda-updating-the-cuda-package-set", + "index.html#updating-the-cuda-package-set" + ], + "cuda-updating-the-cuda-toolkit": [ + "index.html#cuda-updating-the-cuda-toolkit", + "index.html#updating-the-cuda-toolkit" + ], + "cuda-using-docker-compose": [ + "index.html#cuda-using-docker-compose", "index.html#using-docker-compose" ], + "cuda-writing-tests": [ + "index.html#cuda-writing-tests" + ], "cuelang": [ "index.html#cuelang" ], @@ -3027,7 +3047,7 @@ "ex-buildGoModule": [ "index.html#ex-buildGoModule" ], - "ssec-go-toolchain-versions" : [ + "ssec-go-toolchain-versions": [ "index.html#ssec-go-toolchain-versions" ], "buildGoModule-goModules-override": [ @@ -3327,6 +3347,12 @@ "javascript-pnpm-extraCommands": [ "index.html#javascript-pnpm-extraCommands" ], + "javascript-pnpm-fetcherVersion": [ + "index.html#javascript-pnpm-fetcherVersion" + ], + "javascript-pnpm-fetcherVersion-versionHistory": [ + "index.html#javascript-pnpm-fetcherVersion-versionHistory" + ], "javascript-yarn": [ "index.html#javascript-yarn" ], diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 0ab5bff0f700..3871e9ad9a57 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -20,6 +20,8 @@ - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011. - `command-not-found` package is now disabled by default; it works only for nix-channels based systems, and requires setup for it to work. +- Derivations setting both `separateDebugInfo` and one of `allowedReferences`, `allowedRequistes`, `disallowedReferences` or `disallowedRequisites` must now set `__structuredAttrs` to `true`. The effect of reference whitelisting or blacklisting will be disabled on the `debug` output created by `separateDebugInfo`. + - `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`. - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67). @@ -41,6 +43,8 @@ of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0), make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_3;` in your configuration. +- `go-mockery` has been updated to v3. For migration instructions see the [upstream documentation](https://vektra.github.io/mockery/latest/v3/). If v2 is still required `go-mockery_v2` has been added but will be removed on or before 2029-12-31 in-line with it's [upstream support lifecycle](https://vektra.github.io/mockery/ + ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} @@ -54,6 +58,19 @@ - `gramps` has been updated to 6.0.0 Upstream recommends [backing up your Family Trees](https://gramps-project.org/wiki/index.php/Gramps_6.0_Wiki_Manual_-_Manage_Family_Trees#Backing_up_a_Family_Tree) before upgrading. +- `meta.mainProgram`: Changing this `meta` entry can lead to a package rebuild due to being used to determine the `NIX_MAIN_PROGRAM` environment variable. + +- `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail. + + +- The debug outputs produced by `separateDebugInfo = true;` now contain symlinks mapping build-ids to the original source and ELF file. + Specifically, if `$out/bin/ninja` has build-id `483bd7f7229bdb06462222e1e353e4f37e15c293`, then + * `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.executable` is a symlink to `$out/bin/ninja` + * `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.source` is a symlink to the value of `$src` during build + * `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.sourceoverlay` is a symlink to a directory with the same structure as the expanded `$sourceRoot` but containing only a copy of files which were patched during the build + * `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.debug` is the file containing debug symbols (like before). + + ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib} diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index bdaee3dbd482..aaaeb90e9917 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1415,7 +1415,7 @@ This setup hook checks for, reports, and (by default) fails builds when "broken" This hook can be disabled by setting `dontCheckForBrokenSymlinks`. ::: {.note} -The hook only considers symlinks with targets inside the Nix store. +The hook only considers symlinks with targets inside the Nix store or $TMPDIR directory (typically /nix/store and /build in the builder environment, the later being where build is executed). ::: ::: {.note} diff --git a/flake.nix b/flake.nix index 3bd0a48a5cce..3d01030806fb 100644 --- a/flake.nix +++ b/flake.nix @@ -209,11 +209,14 @@ */ legacyPackages = forAllSystems ( system: - (import ./. { inherit system; }).extend ( - final: prev: { - lib = prev.lib.extend libVersionInfoOverlay; - } - ) + (import ./. { + inherit system; + overlays = import ./pkgs/top-level/impure-overlays.nix ++ [ + (final: prev: { + lib = prev.lib.extend libVersionInfoOverlay; + }) + ]; + }) ); /** diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a552d8cf9a4e..005baf03646b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8868,6 +8868,12 @@ github = "fzakaria"; githubId = 605070; }; + fzdslr = { + name = "FZDSLR"; + email = "fzdslr@outlook.com"; + github = "fzdslr"; + githubId = 62922415; + }; gabesoft = { email = "gabesoft@gmail.com"; github = "gabesoft"; @@ -18305,6 +18311,13 @@ githubId = 1254858; keys = [ { fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; } ]; }; + notohh = { + email = "contact@notohh.dev"; + github = "notohh"; + githubId = 31116143; + name = "notohh"; + keys = [ { fingerprint = "C3CB 3B31 AF3F 986C 39E0 BE5B BD47 506D 475E E86D"; } ]; + }; notthebee = { email = "moe@notthebe.ee"; github = "notthebee"; @@ -19389,12 +19402,6 @@ name = "Michael Bergmeister"; githubId = 53442728; }; - paveloom = { - email = "contact@paveloom.dev"; - github = "paveloom"; - githubId = 49961859; - name = "Pavel Sobolev"; - }; pawelchcki = { email = "pawel.chcki@gmail.com"; github = "pawelchcki"; @@ -23093,6 +23100,12 @@ githubId = 251028; name = "Shell Turner"; }; + shellhazard = { + email = "shellhazard@tutanota.com"; + github = "shellhazard"; + githubId = 10951745; + name = "shellhazard"; + }; shelvacu = { name = "Shelvacu"; email = "nix-maint@shelvacu.com"; diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index ef0184e77de1..ea72486c0273 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -56,6 +56,8 @@ - [Sharkey](https://joinsharkey.org), a Sharkish microblogging platform. Available as [services.sharkey](#opt-services.sharkey.enable). +- [fw-fanctrl](https://github.com/TamtamHero/fw-fanctrl), a simple systemd service to better control Framework Laptop's fan(s). Available as [hardware.fw-fanctrl](#opt-hardware.fw-fanctrl.enable). + - [mautrix-discord](https://github.com/mautrix/discord), a Matrix-Discord puppeting/relay bridge. Available as [services.mautrix-discord](#opt-services.mautrix-discord.enable). - [SuiteNumérique Meet](https://github.com/suitenumerique/meet) is an open source alternative to Google Meet and Zoom powered by LiveKit: HD video calls, screen sharing, and chat features. Built with Django and React. Available as [services.lasuite-meet](#opt-services.lasuite-meet.enable). @@ -66,6 +68,8 @@ - The Perl implementation of the `switch-to-configuration` program is removed. All switchable systems now use the Rust rewrite. Any prior usage of `system.switch.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub. +- The `no-broken-symlink` build hook now also fails builds whose output derivation contains links to $TMPDIR (typically /build, which contains the build directory). + - The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream. - The Pocket ID module ([`services.pocket-id`][#opt-services.pocket-id.enable]) and package (`pocket-id`) has been updated to 1.0.0. Some environment variables have been changed or removed, see the [migration guide](https://pocket-id.org/docs/setup/migrate-to-v1/). diff --git a/nixos/modules/hardware/fw-fanctrl.nix b/nixos/modules/hardware/fw-fanctrl.nix new file mode 100644 index 000000000000..27ab50be3179 --- /dev/null +++ b/nixos/modules/hardware/fw-fanctrl.nix @@ -0,0 +1,129 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.hardware.fw-fanctrl; + + configFormat = pkgs.formats.json { }; + configOption = configFormat.generate "config.json" cfg.config; + + configFile = pkgs.runCommand "configFile" { } '' + ${lib.getExe pkgs.jq} -s '.[0] * .[1]' ${pkgs.fw-fanctrl}/share/fw-fanctrl/config.json ${configOption} > $out + ''; +in +{ + options.hardware.fw-fanctrl = { + enable = lib.mkEnableOption "the fw-fanctrl systemd service and install the needed packages"; + + disableBatteryTempCheck = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Disable checking battery temperature sensor + ''; + }; + + config = lib.mkOption { + default = { }; + description = '' + Additional config entries for the fw-fanctrl service (documentation: https://github.com/TamtamHero/fw-fanctrl/blob/main/doc/configuration.md) + ''; + type = lib.types.submodule { + freeformType = configFormat.type; + options = { + defaultStrategy = lib.mkOption { + type = lib.types.str; + default = "lazy"; + description = "Default strategy to use"; + }; + + strategyOnDischarging = lib.mkOption { + type = lib.types.str; + default = ""; + description = "Default strategy on discharging"; + }; + + strategies = lib.mkOption { + default = null; + description = '' + Additional strategies which can be used by fw-fanctrl + ''; + type = lib.types.nullOr ( + lib.types.attrsOf ( + lib.types.submodule { + options = { + fanSpeedUpdateFrequency = lib.mkOption { + type = lib.types.ints.unsigned; + default = 5; + description = "How often the fan speed should be updated in seconds"; + }; + + movingAverageInterval = lib.mkOption { + type = lib.types.ints.unsigned; + default = 25; + description = "Interval (seconds) of the last temperatures to use to calculate the average temperature"; + }; + + speedCurve = lib.mkOption { + default = [ ]; + description = "How should the speed curve look like"; + type = lib.types.listOf ( + lib.types.submodule { + options = { + temp = lib.mkOption { + type = lib.types.int; + default = 0; + description = "Temperature in °C at which the fan speed should be changed"; + }; + + speed = lib.mkOption { + type = lib.types.ints.between 0 100; + default = 0; + description = "Percent how fast the fan should run at"; + }; + + }; + } + ); + }; + }; + } + ) + ); + }; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + fw-fanctrl + fw-ectool + ]; + + systemd.services.fw-fanctrl = { + description = "Framework Fan Controller"; + after = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${lib.getExe pkgs.fw-fanctrl} --output-format JSON run --config ${configFile} --silent ${lib.optionalString cfg.disableBatteryTempCheck "--no-battery-sensors"}"; + ExecStopPost = "${lib.getExe pkgs.fw-ectool} autofanctrl"; + }; + wantedBy = [ "multi-user.target" ]; + }; + + # Create suspend config + environment.etc."systemd/system-sleep/fw-fanctrl-suspend.sh".source = + "${pkgs.fw-fanctrl}/share/fw-fanctrl/fw-fanctrl-suspend"; + }; + + meta = { + maintainers = pkgs.fw-fanctrl.meta.maintainers; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e17e301b5c17..0ec81e5bcb7b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -67,6 +67,7 @@ ./hardware/digitalbitbox.nix ./hardware/flipperzero.nix ./hardware/flirc.nix + ./hardware/fw-fanctrl.nix ./hardware/glasgow.nix ./hardware/gpgsmartcards.nix ./hardware/graphics.nix diff --git a/nixos/modules/services/cluster/spark/default.nix b/nixos/modules/services/cluster/spark/default.nix index 3835564980b6..7d308e38cce5 100644 --- a/nixos/modules/services/cluster/spark/default.nix +++ b/nixos/modules/services/cluster/spark/default.nix @@ -104,7 +104,7 @@ in path = with pkgs; [ procps openssh - nettools + net-tools ]; description = "spark master service."; after = [ "network.target" ]; @@ -133,7 +133,7 @@ in path = with pkgs; [ procps openssh - nettools + net-tools rsync ]; description = "spark master service."; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index c6915a17b691..817adfb2112e 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -424,7 +424,7 @@ in ]; path = [ hydra-package - pkgs.nettools + pkgs.net-tools pkgs.openssh pkgs.bzip2 config.nix.package @@ -459,7 +459,7 @@ in ]; path = with pkgs; [ hydra-package - nettools + net-tools jq ]; restartTriggers = [ hydraConf ]; diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix index 17ac1df9baae..4dccffc6debe 100644 --- a/nixos/modules/services/desktops/profile-sync-daemon.nix +++ b/nixos/modules/services/desktops/profile-sync-daemon.nix @@ -43,7 +43,7 @@ in rsync kmod gawk - nettools + net-tools util-linux profile-sync-daemon ]; @@ -69,7 +69,7 @@ in rsync kmod gawk - nettools + net-tools util-linux profile-sync-daemon ]; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 85e04b992259..7b2d62e1fc97 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -894,7 +894,7 @@ in ${lib.concatStringsSep "\n" ( lib.mapAttrsToList (to: from: '' ln -sf ${from} /var/lib/postfix/conf/${to} - ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/${to} + ${pkgs.postfix}/bin/postmap -o -p /var/lib/postfix/conf/${to} '') cfg.mapFiles )} diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index f34fad9b1606..5acbc3470820 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -98,7 +98,7 @@ in # loadplugin Mail::SpamAssassin::Plugin::Shortcircuit loadplugin Mail::SpamAssassin::Plugin::SpamCop loadplugin Mail::SpamAssassin::Plugin::SPF - #loadplugin Mail::SpamAssassin::Plugin::TextCat + loadplugin Mail::SpamAssassin::Plugin::TextCat # loadplugin Mail::SpamAssassin::Plugin::TxRep loadplugin Mail::SpamAssassin::Plugin::URIDetail loadplugin Mail::SpamAssassin::Plugin::URIDNSBL @@ -183,6 +183,11 @@ in "sa-update.service" ]; + reloadTriggers = [ + config.environment.etc."mail/spamassassin/init.pre".source + config.environment.etc."mail/spamassassin/local.cf".source + ]; + serviceConfig = { User = "spamd"; Group = "spamd"; diff --git a/nixos/modules/services/misc/invidious-router.nix b/nixos/modules/services/misc/invidious-router.nix index f28538981e27..5d4fc1528890 100644 --- a/nixos/modules/services/misc/invidious-router.nix +++ b/nixos/modules/services/misc/invidious-router.nix @@ -101,6 +101,10 @@ in config = lib.mkIf cfg.enable { systemd.services.invidious-router = { wantedBy = [ "multi-user.target" ]; + + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + serviceConfig = { Restart = "on-failure"; ExecStart = "${lib.getExe cfg.package} --configfile ${configFile}"; diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 78e7f35fed4e..d719bc511c52 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -112,6 +112,12 @@ in ''; }; + extraSettings = lib.mkOption { + type = lib.types.lines; + default = ""; + description = "Extra lines to append to the generated Klipper configuration."; + }; + firmwares = lib.mkOption { description = "Firmwares klipper should manage"; default = { }; @@ -166,6 +172,10 @@ in assertion = (cfg.configFile != null) != (cfg.settings != null); message = "You need to either specify services.klipper.settings or services.klipper.configFile."; } + { + assertion = (cfg.configFile != null) -> (cfg.extraSettings == ""); + message = "You can't use services.klipper.extraSettings with services.klipper.configFile."; + } ]; services.klipper = lib.mkIf cfg.octoprintIntegration { @@ -180,7 +190,10 @@ in + lib.optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}" + lib.optionalString (cfg.logFile != null) " --logfile=${cfg.logFile}"; printerConfig = - if cfg.settings != null then format.generate "klipper.cfg" cfg.settings else cfg.configFile; + if cfg.settings != null then + builtins.toFile "klipper.cfg" ((format.generate "" cfg.settings).text + cfg.extraSettings) + else + cfg.configFile; in { description = "Klipper 3D Printer Firmware"; diff --git a/nixos/modules/services/misc/redlib.nix b/nixos/modules/services/misc/redlib.nix index 3e3cd31a814c..5e3529fbc846 100644 --- a/nixos/modules/services/misc/redlib.nix +++ b/nixos/modules/services/misc/redlib.nix @@ -95,6 +95,47 @@ in environment = mapAttrs (_: v: if isBool v then boolToString' v else toString v) cfg.settings; serviceConfig = { + # Hardening + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateIPC = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "~@mount" + "~@swap" + "~@resources" + "~@reboot" + "~@raw-io" + "~@obsolete" + "~@module" + "~@debug" + "~@cpu-emulation" + "~@clock" + "~@privileged" + ]; + UMask = "0027"; + ExecStart = [ "" "${lib.getExe cfg.package} ${args}" @@ -111,6 +152,7 @@ in # A private user cannot have process capabilities on the host's user # namespace and thus CAP_NET_BIND_SERVICE has no effect. PrivateUsers = true; + CapabilityBoundingSet = false; } ); }; diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index c6299d654e28..fc886a859da1 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -45,7 +45,7 @@ let defaultsFile = pkgs.writeText "60-defaults.conf" '' # 01-system-paths.conf ${dirStanzas home} - ZM_PATH_ARP=${lib.getBin pkgs.nettools}/bin/arp + ZM_PATH_ARP=${lib.getBin pkgs.net-tools}/bin/arp ZM_PATH_LOGS=/var/log/${dirName} ZM_PATH_MAP=/dev/shm ZM_PATH_SOCKS=/run/${dirName} diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index 8a8afcb501c8..c93d0d8c37bb 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixos/modules/services/monitoring/zabbix-agent.nix @@ -59,9 +59,9 @@ in extraPackages = mkOption { type = types.listOf types.package; - default = with pkgs; [ nettools ]; - defaultText = literalExpression "with pkgs; [ nettools ]"; - example = literalExpression "with pkgs; [ nettools mysql ]"; + default = with pkgs; [ net-tools ]; + defaultText = literalExpression "with pkgs; [ net-tools ]"; + example = literalExpression "with pkgs; [ net-tools mysql ]"; description = '' Packages to be added to the Zabbix {env}`PATH`. Typically used to add executables for scripts, but can be anything. diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index ffc828178c5d..29578cfb14ee 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -91,11 +91,11 @@ in extraPackages = mkOption { type = types.listOf types.package; default = with pkgs; [ - nettools + net-tools nmap traceroute ]; - defaultText = literalExpression "[ nettools nmap traceroute ]"; + defaultText = literalExpression "[ net-tools nmap traceroute ]"; description = '' Packages to be added to the Zabbix {env}`PATH`. Typically used to add executables for scripts, but can be anything. diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index 55dba4a7e9cc..f3606f1c2835 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -88,11 +88,11 @@ in extraPackages = mkOption { type = types.listOf types.package; default = with pkgs; [ - nettools + net-tools nmap traceroute ]; - defaultText = literalExpression "[ nettools nmap traceroute ]"; + defaultText = literalExpression "[ net-tools nmap traceroute ]"; description = '' Packages to be added to the Zabbix {env}`PATH`. Typically used to add executables for scripts, but can be anything. diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index 916b6f8293d0..57cbb9a8a6c6 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/nixos/modules/services/networking/libreswan.nix @@ -165,7 +165,7 @@ in procps nssTools iptables - nettools + net-tools ]; preStart = lib.optionalString cfg.disableRedirects '' # Disable send/receive redirects diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index bdedfd9900d5..0bd9d2a2f474 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -74,7 +74,7 @@ let path = [ pkgs.iptables pkgs.iproute2 - pkgs.nettools + pkgs.net-tools ]; serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}"; diff --git a/nixos/modules/services/networking/pihole-ftl.md b/nixos/modules/services/networking/pihole-ftl.md index 4a1b1f986708..0f79fd6101c4 100644 --- a/nixos/modules/services/networking/pihole-ftl.md +++ b/nixos/modules/services/networking/pihole-ftl.md @@ -22,6 +22,7 @@ Example configuration: { services.pihole-ftl = { enable = true; + openFirewallDNS = true; openFirewallDHCP = true; queryLogDeleter.enable = true; lists = [ diff --git a/nixos/modules/services/networking/pihole-ftl.nix b/nixos/modules/services/networking/pihole-ftl.nix index bda8ab4fa8c8..5a8c361adfeb 100644 --- a/nixos/modules/services/networking/pihole-ftl.nix +++ b/nixos/modules/services/networking/pihole-ftl.nix @@ -56,6 +56,12 @@ in example = "3"; }; + openFirewallDNS = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for pihole-FTL's DNS server."; + }; + openFirewallDHCP = mkOption { type = types.bool; default = false; @@ -434,11 +440,15 @@ in }; networking.firewall = lib.mkMerge [ - (mkIf cfg.openFirewallDHCP { + (mkIf cfg.openFirewallDNS { allowedUDPPorts = [ 53 ]; allowedTCPPorts = [ 53 ]; }) + (mkIf cfg.openFirewallDHCP { + allowedUDPPorts = [ 67 ]; + }) + (mkIf cfg.openFirewallWebserver { allowedTCPPorts = lib.pipe cfg.settings.webserver.port [ (lib.splitString ",") diff --git a/nixos/modules/services/networking/tetrd.nix b/nixos/modules/services/networking/tetrd.nix index a182cc347306..939c1227886f 100644 --- a/nixos/modules/services/networking/tetrd.nix +++ b/nixos/modules/services/networking/tetrd.nix @@ -80,8 +80,8 @@ builtins.storeDir "/etc/ssl" "/etc/static/ssl" - "${pkgs.nettools}/bin/route:/usr/bin/route" - "${pkgs.nettools}/bin/ifconfig:/usr/bin/ifconfig" + "${pkgs.net-tools}/bin/route:/usr/bin/route" + "${pkgs.net-tools}/bin/ifconfig:/usr/bin/ifconfig" ]; BindPaths = [ diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index 372fa8aac804..d99a3af8fb07 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -11,7 +11,7 @@ let [ cloud-init iproute2 - nettools + net-tools openssh shadow util-linux diff --git a/nixos/modules/services/web-apps/froide-govplan.nix b/nixos/modules/services/web-apps/froide-govplan.nix index 85294f10ea88..7fab1ad19310 100644 --- a/nixos/modules/services/web-apps/froide-govplan.nix +++ b/nixos/modules/services/web-apps/froide-govplan.nix @@ -182,6 +182,7 @@ in StateDirectory = lib.mkIf (cfg.dataDir == "/var/lib/froide-govplan") "froide-govplan"; User = "govplan"; Group = "govplan"; + TimeoutStartSec = "5m"; }; after = [ "postgresql.target" @@ -191,7 +192,7 @@ in wantedBy = [ "multi-user.target" ]; environment = { - PYTHONPATH = pkg.pythonPath; + PYTHONPATH = "${pkg.pythonPath}:${pkg}/${pkg.python.sitePackages}"; GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so"; GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so"; } diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index c8fa744d8869..c178e7403ec7 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -36,7 +36,7 @@ with lib; pkgs.which pkgs.openssl pkgs.xorg.xauth - pkgs.nettools + pkgs.net-tools pkgs.shadow pkgs.procps pkgs.util-linux diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix index d7df8903367b..421190e80ed6 100644 --- a/nixos/modules/system/boot/systemd/oomd.nix +++ b/nixos/modules/system/boot/systemd/oomd.nix @@ -45,6 +45,8 @@ in "systemd-oomd.service" "systemd-oomd.socket" ]; + # TODO: Added upstream in upcoming systemd release. Good to drop once we use v258 or later + systemd.services.systemd-oomd.after = [ "systemd-sysusers.service" ]; systemd.services.systemd-oomd.wantedBy = [ "multi-user.target" ]; environment.etc."systemd/oomd.conf".text = lib.generators.toINI { } { diff --git a/nixos/modules/virtualisation/digital-ocean-config.nix b/nixos/modules/virtualisation/digital-ocean-config.nix index a38d2d15ab84..b46cf0f82131 100644 --- a/nixos/modules/virtualisation/digital-ocean-config.nix +++ b/nixos/modules/virtualisation/digital-ocean-config.nix @@ -144,7 +144,7 @@ with lib; systemd.services.digitalocean-set-hostname = mkIf (hostName == "") { path = [ pkgs.curl - pkgs.nettools + pkgs.net-tools ]; description = "Set hostname provided by Digitalocean"; wantedBy = [ "network.target" ]; diff --git a/nixos/modules/virtualisation/vagrant-guest.nix b/nixos/modules/virtualisation/vagrant-guest.nix index d4686a678181..a4768c610672 100644 --- a/nixos/modules/virtualisation/vagrant-guest.nix +++ b/nixos/modules/virtualisation/vagrant-guest.nix @@ -23,7 +23,7 @@ in environment.systemPackages = with pkgs; [ findutils iputils - nettools + net-tools netcat nfs-utils rsync diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix index 171d2ff71cd9..40737b0d9589 100644 --- a/nixos/modules/virtualisation/waagent.nix +++ b/nixos/modules/virtualisation/waagent.nix @@ -351,7 +351,7 @@ in parted # for hostname - nettools + net-tools # for pidof procps # for useradd, usermod diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4664120c75db..7aa2dbdbdaf5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1528,7 +1528,7 @@ in virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { }; vm-variant = handleTest ./vm-variant.nix { }; vscode-remote-ssh = handleTestOn [ "x86_64-linux" ] ./vscode-remote-ssh.nix { }; - vscodium = discoverTests (import ./vscodium.nix); + vscodium = import ./vscodium.nix { inherit runTest; }; vsftpd = runTest ./vsftpd.nix; waagent = runTest ./waagent.nix; wakapi = runTest ./wakapi.nix; diff --git a/nixos/tests/flaresolverr.nix b/nixos/tests/flaresolverr.nix index dc92e03a0a60..184f57b78ff8 100644 --- a/nixos/tests/flaresolverr.nix +++ b/nixos/tests/flaresolverr.nix @@ -1,7 +1,7 @@ { lib, ... }: { name = "flaresolverr"; - meta.maintainers = with lib.maintainers; [ paveloom ]; + meta.maintainers = with lib.maintainers; [ ]; nodes.machine = { pkgs, ... }: diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix index 6d105253f29c..8e48031d1224 100644 --- a/nixos/tests/sing-box.nix +++ b/nixos/tests/sing-box.nix @@ -57,8 +57,6 @@ let "${hosts."${server_host}"}/32" ]; strict_route = false; - sniff = true; - sniff_override_destination = false; }; tproxyPort = 1081; @@ -219,6 +217,9 @@ in tag = "outbound:direct"; } ]; + route = { + default_interface = "eth1"; + }; }; }; }; @@ -267,6 +268,7 @@ in vmessOutbound ]; route = { + default_interface = "eth1"; final = "outbound:block"; rules = [ { @@ -315,25 +317,28 @@ in type = "block"; tag = "outbound:block"; } + ]; + endpoints = [ { - type = "direct"; - tag = "outbound:direct"; - } - { - detour = "outbound:direct"; type = "wireguard"; tag = "outbound:wireguard"; - interface_name = "wg0"; - local_address = [ "10.23.42.2/32" ]; + name = "wg0"; + address = [ "10.23.42.2/32" ]; mtu = 1280; private_key = wg-keys.peer1.privateKey; - peer_public_key = wg-keys.peer0.publicKey; - server = server_host; - server_port = 2408; - system_interface = true; + peers = [ + { + address = server_host; + port = 2408; + public_key = wg-keys.peer0.publicKey; + allowed_ips = [ "0.0.0.0/0" ]; + } + ]; + system = true; } ]; route = { + default_interface = "eth1"; final = "outbound:block"; }; }; @@ -377,8 +382,6 @@ in listen = "0.0.0.0"; listen_port = tproxyPort; udp_fragment = true; - sniff = true; - sniff_override_destination = false; } ]; outbounds = [ @@ -393,6 +396,7 @@ in vmessOutbound ]; route = { + default_interface = "eth1"; final = "outbound:block"; rules = [ { @@ -434,7 +438,7 @@ in independent_cache = true; fakeip = { enabled = true; - "inet4_range" = "198.18.0.0/16"; + inet4_range = "198.18.0.0/16"; }; servers = [ { @@ -458,7 +462,6 @@ in "AAAA" ]; server = "dns:fakeip"; - } ]; }; @@ -474,17 +477,17 @@ in type = "direct"; tag = "outbound:direct"; } - { - type = "dns"; - tag = "outbound:dns"; - } ]; route = { + default_interface = "eth1"; final = "outbound:direct"; rules = [ + { + action = "sniff"; + } { protocol = "dns"; - outbound = "outbound:dns"; + action = "hijack-dns"; } ]; }; diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index a3efd07bf501..8badad20b03c 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -1,12 +1,13 @@ +{ runTest }: let tests = { wayland = - { pkgs, ... }: + { lib, pkgs, ... }: { imports = [ ./common/wayland-cage.nix ]; # We scale vscodium to help OCR find the small "Untitled" text. - services.cage.program = "${pkgs.vscodium}/bin/codium --force-device-scale-factor=2"; + services.cage.program = "${lib.getExe pkgs.vscodium} --force-device-scale-factor=2"; environment.variables.NIXOS_OZONE_WL = "1"; environment.variables.DISPLAY = "do not use"; @@ -14,7 +15,7 @@ let fonts.packages = with pkgs; [ dejavu_fonts ]; }; xorg = - { pkgs, ... }: + { lib, pkgs, ... }: { imports = [ ./common/user-account.nix @@ -24,7 +25,7 @@ let virtualisation.memorySize = 2047; services.xserver.enable = true; services.xserver.displayManager.sessionCommands = '' - ${pkgs.vscodium}/bin/codium --force-device-scale-factor=2 + ${lib.getExe pkgs.vscodium} --force-device-scale-factor=2 ''; test-support.displayManager.auto.user = "alice"; }; @@ -32,21 +33,18 @@ let mkTest = name: machine: - import ./make-test-python.nix ( - { pkgs, ... }: + runTest ( + { lib, ... }: { inherit name; - nodes = { - "${name}" = machine; - }; + nodes."${name}" = machine; + + meta.maintainers = with lib.maintainers; [ + synthetica + turion + ]; - meta = with pkgs.lib.maintainers; { - maintainers = [ - synthetica - turion - ]; - }; enableOCR = true; testScript = '' @@ -91,6 +89,5 @@ let ''; } ); - in -builtins.mapAttrs (k: v: mkTest k v) tests +builtins.mapAttrs mkTest tests diff --git a/nixos/tests/whisparr.nix b/nixos/tests/whisparr.nix index ee34aca18ce5..2d6d1bd9fb16 100644 --- a/nixos/tests/whisparr.nix +++ b/nixos/tests/whisparr.nix @@ -1,7 +1,7 @@ { lib, ... }: { name = "whisparr"; - meta.maintainers = [ lib.maintainers.paveloom ]; + meta.maintainers = [ ]; nodes.machine = { pkgs, ... }: diff --git a/pkgs/applications/audio/mopidy/tidal.nix b/pkgs/applications/audio/mopidy/tidal.nix index 90e27bf0f441..dcb5044a658a 100644 --- a/pkgs/applications/audio/mopidy/tidal.nix +++ b/pkgs/applications/audio/mopidy/tidal.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { pytest-mock ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; meta = { description = "Mopidy extension for playing music from Tidal"; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index a919a0d98c4f..f92c58b93c71 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -21,11 +21,11 @@ assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.32.10"; + version = "1.33.0"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-h7LBf+DJedPvOO7O/2Nis1sorIWJ+/GFS1vnXJq2VXw="; + hash = "sha256-IpDjrt5vTRY+GhdFIWWvM8qtS18JSPmUKc+i2Dhfqp0="; }; outputs = [ diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 871c0ca56807..c89793a26ee0 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-xIQyTetHU37gTxCcQp4VCqzGdIfVQGy/aORCVba6YQ0="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 802f200440dd..32b6ae0e0c2f 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -8,8 +8,8 @@ plymouth, pam, pkg-config, - autoconf, - automake, + autoreconfHook, + gettext, libtool, libxcb, glib, @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoconf - automake + autoreconfHook + gettext yelp-tools yelp-xsl gobject-introspection @@ -88,6 +88,9 @@ stdenv.mkDerivation rec { (replaceVars ./fix-paths.patch { plymouth = "${plymouth}/bin/plymouth"; }) + + # glib gettext is deprecated and broken, so use regular gettext instead + ./use-regular-gettext.patch ]; dontWrapQtApps = true; diff --git a/pkgs/applications/display-managers/lightdm/use-regular-gettext.patch b/pkgs/applications/display-managers/lightdm/use-regular-gettext.patch new file mode 100644 index 000000000000..78efed8bf8de --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/use-regular-gettext.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 6f2e706f..6307dd59 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -195,6 +195,8 @@ dnl Internationalization + dnl ########################################################################### + + IT_PROG_INTLTOOL(0.35.0) ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.21]) + AC_SUBST(GETTEXT_PACKAGE, lightdm) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", Gettext package) + diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 71eaaa2e9ba2..ba84e12d14b3 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -37,6 +37,7 @@ in libX11, vmopts ? null, + forceWayland ? false, }: let @@ -83,9 +84,13 @@ let inherit pname jdk - extraWrapperArgs extraBuildInputs ; + extraWrapperArgs = + extraWrapperArgs + ++ lib.optionals (stdenv.hostPlatform.isLinux && forceWayland) [ + ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"'' + ]; extraLdPath = extraLdPath ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libGL ]; src = if fromSource then diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 7195226e5980..b2cfd2db9fd1 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.1401"; + version = "9.1.1475"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-oYde6i5coECUzQQEMo0dvkOXFimKe4y2aGoV2nVLx58="; + hash = "sha256-KKUzS0dS9K/jlfP+igyLX1Fwjb7Y5ZAzGLjqHvkA3bs="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index db0048e558a3..c03f4209dfed 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -8,19 +8,19 @@ gitMinimal, }: let - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; tag = "v${version}"; - hash = "sha256-0RmX/uANgU/di3Iu0V6Oe3jZj4ikzeegW/XQUZhPgRc="; + hash = "sha256-R95i3dDVBfH0oxTdK0F0ami0SAk0VVONXIlX6ZF0kmk="; }; blink-fuzzy-lib = rustPlatform.buildRustPackage { inherit version src; pname = "blink-fuzzy-lib"; useFetchCargoVendor = true; - cargoHash = "sha256-/8eiZyJEwPXAviwVMFTr+NKSwMwxdraKtrlXNU0cBM4="; + cargoHash = "sha256-pWBOPMUy/gXeujaowlp2I6kqD+Q95h+f9mXl231DN88="; nativeBuildInputs = [ gitMinimal ]; diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index 3fb21266ac0c..9f82142adf50 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "1.81.0"; - hash = "sha256-zuE+KR0iLEkQrxxS835ZYq20yxWgV1S14bay4shqVWg="; + version = "1.83.0"; + hash = "sha256-BicMVFpCmG3/NnBJUG5w8B/5039SWx6kAv8SC+Vaj5c="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4ada6b024fe3..98806af52a85 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2453,8 +2453,8 @@ let mktplcRef = { name = "vscode-vibrancy-continued"; publisher = "illixion"; - version = "1.1.54"; - hash = "sha256-CzhDStBa/LB/bzgzrFCUEcVDeBluWJPblneUbHdIcRE="; + version = "1.1.57"; + hash = "sha256-UJn+RFBlQXmPqKkFIBiD4AblnX4s0O2IK747fG+UC/0="; }; meta = { downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index 11ccd1845d0e..00203e6a4b12 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "0.16.0"; - hash = "sha256-JBHdwvlJ4BHlphABT2ViR03R4zRVSwkHkOw1n3bNzAQ="; + version = "0.16.1"; + hash = "sha256-uhAUSXB7ULNmkRSHqfbo3T3AZ3TiUaIqEZL4YwkWxtY="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 29f8d2dc6d65..c7eddaf465cb 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "RooVeterinaryInc"; name = "roo-cline"; - version = "3.22.6"; - hash = "sha256-Gu1QcGLJVSiFCO7C6q1fVbi5MOztdKyFFyEhxxCpfUE="; + version = "3.23.8"; + hash = "sha256-2k9a27sbKYcrKVFRSdneUAV/bN0Y2Q5a7vorFRmgQPo="; }; passthru.updateScript = vscode-extension-update-script { }; diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index 28aa7f84267f..d6d031c1ba2c 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-06-16"; + version = "0-unstable-2025-07-10"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "8c48d34327f5ffc44892899cf2567feaa9bbf72a"; - hash = "sha256-u5kxj4Sl7LpivEuNhTec8Z2u3Dw/X8xFDBQ++hQAtFc="; + rev = "92894e7bdb6304d23278dc77f8a9fa7212450f6e"; + hash = "sha256-uA/pm3DyT0VCyq85DzZGXjSGrKQ9uoEIfrs839ta97s="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/pcsx2.nix b/pkgs/applications/emulators/libretro/cores/pcsx2.nix index d4d618ca9883..f0623cf2d6b5 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx2.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx2.nix @@ -11,13 +11,13 @@ }: mkLibretroCore { core = "pcsx2"; - version = "0-unstable-2025-07-03"; + version = "0-unstable-2025-07-11"; src = fetchFromGitHub { owner = "libretro"; repo = "ps2"; - rev = "f8c9740897cbba47ee5ecda9f1c34d73daf81379"; - hash = "sha256-2/CYjilppD/7o3G4kNMUTbEP91DQYct0ojHwShNy8cw="; + rev = "553770c8d886acb12ff43d06b83215f46be89acc"; + hash = "sha256-C2uASKAol7PB3TEdLPCHlcUdRcaYlFwngnviY3rBklE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index f1ec8a93f18c..199fb453b1ca 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-07-01"; + version = "0-unstable-2025-07-09"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "5fa3b71304aec0d2a70569bd38c87433f719e6ce"; - hash = "sha256-t61xAqghmOmZJzAxU2Ez1ALQ8jjuHZKwmrNoRA9L+4k="; + rev = "ae9afb4e45e8de35382fb98c55d13dec9fcf8ed8"; + hash = "sha256-HWKhgGChPGhRmrXXbjEvBt0coGpQ1JAPUTd8Ze4yKww="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix index 233689c15db6..98d2de42498f 100644 --- a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication rec { umockdev ]; - pytestFlagsArray = [ + enabledTestPaths = [ "test" ]; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index beb7a046b7bd..acb72088f0da 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... }: callPackage ./generic.nix { - version = "5.2.9"; + version = "5.2.10"; kde-channel = "stable"; - hash = "sha256-CMmvVW3r8mkxvWUGeS45G0t6MzSlog9RazJJBDNKy6Y="; + hash = "sha256-pJrJcrO7lkU0h3XPFpOADL9zXINcqfn1Thep4fMHctU="; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 148b8dcb777e..362d23e8ed1f 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.1.6.7"; + version = "6.1.7.8"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-XdnKcWzw/d7yLG2efgw/gQ8UkPjExigffbomTD3YUgE="; + hash = "sha256-bdjkYrfaC/5rKqRmKr+NVmCMU871WJFNRdh92i8GJF8="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json index e7af742d589f..e52b3cc22260 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.json +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json @@ -276,8 +276,8 @@ }, { "pname": "Markdig.Signed", - "version": "0.41.1", - "hash": "sha256-A8dOAwZ9hMVPk8xZBaJOo0gu5Z01JQZiz0uZbIZA2eU=" + "version": "0.41.3", + "hash": "sha256-r4DrP47vgky0+AbNBFso7AwwzAHgrioK2B08UIxEaNI=" }, { "pname": "Microsoft.ApplicationInsights", @@ -286,13 +286,8 @@ }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "9.0.5", - "hash": "sha256-v2T37X1dm/NG0ZJWk6cXB9lf8tOc6JI4uxFPqmV7ne0=" - }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + "version": "9.0.6", + "hash": "sha256-Kk1WNf1BS+9LjjXjBrYb1YCr+23W9PJ+B9Kv2OBv2Oc=" }, { "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator", @@ -431,23 +426,23 @@ }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.11.0", - "hash": "sha256-qTBsPDE2FD/JA/n7P9g5FQPu7whUyX1X2HS62StxfLM=" + "version": "8.12.1", + "hash": "sha256-gG2S/1+fPV74J9EE3oI3FKG/bRX/F7ujRvGTgxZ4r1A=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.11.0", - "hash": "sha256-JayQNiEiMsvpoAM993VNfJOyAYkatRoFBuLO+ZBzBGo=" + "version": "8.12.1", + "hash": "sha256-NF1kPBAfiNEIsiyNSUSPwPJMEvdk6IMC+95PdqearuM=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.11.0", - "hash": "sha256-aBJSBytPxw+t68O94B8Sj+PjtBi9c2Csy5x7xyVV4m8=" + "version": "8.12.1", + "hash": "sha256-zliqyeeJ9hvPUxm+rWCHGAH+aR+OeIxNhcKxM6G5AEc=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.11.0", - "hash": "sha256-9sg63wXOJa2HrQBsC3w0vXsWww7FvCnjrtoaf7OsyuA=" + "version": "8.12.1", + "hash": "sha256-brSDa39ISF1+N8u/b/x27IN3wiu+sTll2nMf+IqWPS0=" }, { "pname": "Microsoft.NET.Test.Sdk", @@ -471,23 +466,23 @@ }, { "pname": "Microsoft.Testing.Extensions.Telemetry", - "version": "1.7.1", - "hash": "sha256-HpIgMY0LRyeeipkW+rjhsqZnso3bWUTP5GZ4EJfkR0w=" + "version": "1.7.3", + "hash": "sha256-Z6WsY2FCUbNnT5HJd7IOrfOvqknVXp6PWzTVeb0idVg=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport", - "version": "1.7.1", - "hash": "sha256-LrNo9GKe7cFL7JXKU4h1jpiGxp5465MRJFWhErfOYOs=" + "version": "1.7.3", + "hash": "sha256-QX6Oo6uI9XWRbgrjdHxzROIhTHm12ai6wIDtDuqDJwA=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", - "version": "1.7.1", - "hash": "sha256-zaDOAoEA4CF6/7rXLBO5f5d8PpcqB7hKlwdEWzaFsNk=" + "version": "1.7.3", + "hash": "sha256-PTee04FHyTHx/gF5NLckXuVje807G51MzkPrZ1gkgCw=" }, { "pname": "Microsoft.Testing.Extensions.VSTestBridge", - "version": "1.7.1", - "hash": "sha256-6o3qqXK6dxybHybl2k/aY2flxPc2z/1VQMWQPm2Ns0g=" + "version": "1.7.3", + "hash": "sha256-8d+wZmucfSO7PsviHjVxYB4q6NcjgxvnCUpLePq35sM=" }, { "pname": "Microsoft.Testing.Platform", @@ -496,13 +491,13 @@ }, { "pname": "Microsoft.Testing.Platform", - "version": "1.7.1", - "hash": "sha256-YJ41q1VXvFZh/TWo3tutGQnhNCrxv/QbDLTxCS4b/w4=" + "version": "1.7.3", + "hash": "sha256-cavX11P5o9rooqC3ZHw5h002OKRg2ZNR/VaRwpNTQYA=" }, { "pname": "Microsoft.Testing.Platform.MSBuild", - "version": "1.7.1", - "hash": "sha256-j/JO5dVIHWTbUO12ZZJdQ5CB2TcBqGfZTcmVFuT3nyA=" + "version": "1.7.3", + "hash": "sha256-cREl529UQ/c5atT8KimMgrgNdy6MrAd0sBGT8sXRRPM=" }, { "pname": "Microsoft.TestPlatform.AdapterUtilities", @@ -526,23 +521,23 @@ }, { "pname": "MSTest", - "version": "3.9.1", - "hash": "sha256-7gpZKkbGRA4kjUMHrE5pgM3jQhzYQxO3RB5OfDz0Ed4=" + "version": "3.9.3", + "hash": "sha256-sfvkUW4AZEmFduiSZYh3ZuXgE8/boC7gYMMleP4nkUA=" }, { "pname": "MSTest.Analyzers", - "version": "3.9.1", - "hash": "sha256-jr5UOnoX2mHFjMgo/e//4Fi736mkaYj6ChFuwP8jC2w=" + "version": "3.9.3", + "hash": "sha256-uD74gJNVNSQNsxyzf/5kxCBFbgIY7pYdUrKZihAyLi4=" }, { "pname": "MSTest.TestAdapter", - "version": "3.9.1", - "hash": "sha256-nlX47U5Yxds0BXJtwWtMPY+HbEFO8TRr7yC+GS1laxU=" + "version": "3.9.3", + "hash": "sha256-0krWgHpALFJMX707/SMN7b5ryEgm7taCoxtC4WBaglM=" }, { "pname": "MSTest.TestFramework", - "version": "3.9.1", - "hash": "sha256-ORwTveV9nPnx4s9av8EFt8MQ4G0pF9M8Ped/ibZXvG4=" + "version": "3.9.3", + "hash": "sha256-kkW155gzuv0xjiucutNs4RjF9g2NEIZ39+nruRun4As=" }, { "pname": "Newtonsoft.Json", @@ -646,13 +641,13 @@ }, { "pname": "Scalar.AspNetCore", - "version": "2.4.4", - "hash": "sha256-MyNRQMFXIRf6znM3SL3P+Z8jO+3Q5i23TDQuG+ZUcTY=" + "version": "2.5.3", + "hash": "sha256-5rMpkchzxeO3/694RvaVzuQS9Xqd7YGDbBzqCkNyhFs=" }, { "pname": "SteamKit2", - "version": "3.2.0", - "hash": "sha256-hB/36fP9kf+1mIx+hTELUMHe8ZkmSKxOK41ZzOaBa3E=" + "version": "3.3.0", + "hash": "sha256-/NxnVDatdrqIXCjs0P4gRjHq42r/K+wOv3JO5yiAIjU=" }, { "pname": "System.Buffers", @@ -671,33 +666,33 @@ }, { "pname": "System.Composition", - "version": "9.0.5", - "hash": "sha256-Y8MPR8xot93lo4jAgVJ101M+JN973CpvOlCSYUK7wxc=" + "version": "9.0.6", + "hash": "sha256-p8Oa6kjNnwzUPiotQZaLKNd5HWyaLAUrXDEb9+qGe4c=" }, { "pname": "System.Composition.AttributedModel", - "version": "9.0.5", - "hash": "sha256-CkqRwQGCRteSmN+nRF0rm8wGf2QA7gfqsVF8lBTg9EE=" + "version": "9.0.6", + "hash": "sha256-39rilNPGuizRbLS9uJf8xKUsJwP6OrwlIrC0b2n2ujI=" }, { "pname": "System.Composition.Convention", - "version": "9.0.5", - "hash": "sha256-iaSaDpiep+8dthACDpgN0GJ5jRqLVzCVEKNOHUuy3/0=" + "version": "9.0.6", + "hash": "sha256-/+Os5orfTZ45G+SSccBV21OGlbmqI71wZDTCbzvI3DI=" }, { "pname": "System.Composition.Hosting", - "version": "9.0.5", - "hash": "sha256-P98I/5Vs08bDObpicSzHXigXiadJA5uIKqd78WABU40=" + "version": "9.0.6", + "hash": "sha256-krp3xyEOHtF/TRu7GPKaNXe+uKhDRhlNBWAD+eAfyYg=" }, { "pname": "System.Composition.Runtime", - "version": "9.0.5", - "hash": "sha256-o4yiU61i6X2Tn20pUrf/psESngE/nGHTlJSe4S7qIQ0=" + "version": "9.0.6", + "hash": "sha256-ou4oVkNKVFcHgBsiKxmBfwLCDRberIlwD1uvR2XfMT8=" }, { "pname": "System.Composition.TypedParts", - "version": "9.0.5", - "hash": "sha256-+09hA4PfsR9BLHkV1aadh8Jx10AwcFrG+49U0vMATPU=" + "version": "9.0.6", + "hash": "sha256-2z3Pi2vu6Acyn988JeM2B5jKYxCg8LqV8p+4Z4e094g=" }, { "pname": "System.Diagnostics.DiagnosticSource", @@ -711,13 +706,13 @@ }, { "pname": "System.IO.Hashing", - "version": "9.0.4", - "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU=" + "version": "9.0.5", + "hash": "sha256-hMAhIhYl1QhtD21kSitvSnsNd9KgSydIRvjwZ/1iFes=" }, { "pname": "System.Linq.Async", - "version": "6.0.1", - "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI=" + "version": "6.0.3", + "hash": "sha256-i+2XnsOJnD7R/vCFtadp+lwrkDNAscANes2Ur0MSTl8=" }, { "pname": "System.Memory", @@ -746,8 +741,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "9.0.5", - "hash": "sha256-Ed2Ea4ssYYHBBeFs0Vva+G8lEF5VFcm+DWJl/xi7arY=" + "version": "9.0.6", + "hash": "sha256-WMa3KDeFuOLyIZduYd+9PCyx7usJMRu/q2x3eOw9MAQ=" }, { "pname": "System.Security.Principal.Windows", diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 059051c06594..c2485455d1a3 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -7,7 +7,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "9920764dafb0a7a87c355d9c87aff285e41494be"; + version = "b984a9de784afb9d11364b3541961888cab8e025"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -15,10 +15,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-w4pYFCdJiHocy41az4/tjWdBwAdI68RV/N8I0Onsofg="; + hash = "sha256-qipcDwn6Jte8MRUIgmYSuMzs4sewItlzFIeupYKkg+A="; }; - npmDepsHash = "sha256-V9u+n4CTB+BU0zeiB8vLpFkI2VJGArU6WL+PFfi624M="; + npmDepsHash = "sha256-UhakvqDoWxt/nudEqUZcp8Bk0sIdYSXCYHv8YbsrWDU="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 814427c22de7..3696b8919178 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -134,7 +134,7 @@ python3.pkgs.buildPythonApplication rec { pycryptodomex ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; postCheck = '' $out/bin/electrum help >/dev/null diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 5451e89cf459..83853d45ec5e 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -159,7 +159,7 @@ python3.pkgs.buildPythonApplication { ]; buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; - pytestFlagsArray = [ "electrum_ltc/tests" ]; + enabledTestPaths = [ "electrum_ltc/tests" ]; disabledTests = [ "test_loop" # test tries to bind 127.0.0.1 causing permission error diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 68f295594d51..571b2566f2e2 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.44"; + version = "13.45"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; tag = finalAttrs.version; - hash = "sha256-eFANrUMESQVsZwTfz20VW2Qf7hiSgtkeKszCiJ8i/jk="; + hash = "sha256-3GPpr8L+oMHCGXo3RVaky6EjDrEiBERRU6w56o17Xhc="; }; buildInputs = diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix index bbfadd2bb105..7540b915839f 100644 --- a/pkgs/applications/misc/mbutil/default.nix +++ b/pkgs/applications/misc/mbutil/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + enabledTestPaths = [ "test/test.py" ]; meta = { description = "Importer and exporter for MBTiles"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9a6810e2c8c0..3c09e098a809 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -171,22 +171,22 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-JGsleJiOo2wnIObvbQpvpmfc/CUaznVDIiNFX+eetW8=", + "hash": "sha256-lhN9YPufx6JITEhwLfqUMudXKTJqFdRCPkS+lTZpmH8=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.23.0", + "rev": "v1.23.1", "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { - "hash": "sha256-ZFHe91xPeKTdLRnOyFECjg1/7G2RPGpXSgaZOFrnDpY=", + "hash": "sha256-McRv7POFoxkehhDQWIzMY96e/Uv+lc5L0bKVlzITBZA=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.47.0", + "rev": "v2.48.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-AcHndbTWMMsE7CSnLtUdnfyIfkKVfmOobNOhvtrTh4I=" + "vendorHash": "sha256-ok73U0WWFGXp5TJ7sp7U9umq7DlChCw7fSyFmbifwKE=" }, "bitwarden": { "hash": "sha256-eqWyKPzSINSZcO8Ho0WHTeVDOxbUynOzupXu6vzTtuU=", @@ -552,11 +552,11 @@ "vendorHash": "sha256-QTcWJlwE6s4nEPSg6svzIhsJo9p9rk1gQiSr4qSTfns=" }, "gridscale": { - "hash": "sha256-GHKGlqAFWVPmD7NRFcm651XBVzTtNy8mb/sKtjULkB4=", + "hash": "sha256-zD3KiTLKALVOvFOewWyrd65p0XmLOi/bSIP27dXwveU=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v2.1.2", + "rev": "v2.2.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1147,13 +1147,13 @@ "vendorHash": null }, "sakuracloud": { - "hash": "sha256-vIP7hlPvx7o8/uXpg6TOEeoDL9FGaTBdXzziOyLrdGY=", + "hash": "sha256-IbR3m0s5LCC9tIOC67yn2yI6lssnIlc/pB6XIf0UOuk=", "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", "owner": "sacloud", "repo": "terraform-provider-sakuracloud", - "rev": "v2.28.0", + "rev": "v2.28.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-hJmMNxlhyzcnguLFJih/K1CSZHIOspTgCJ8nyVjT7mg=" + "vendorHash": "sha256-HKmIl/GjGJZmhWLrK3lMjYo1F5nmo+U9ZpvBo5hDH/0=" }, "scaleway": { "hash": "sha256-3MLtSOcMCIl3pFJH/xKK/fPQcRrW2Nx4b2jCZiUE2aw=", diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index bc358bc4d036..18ebf9e1618d 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -10,7 +10,7 @@ iptables, iputils, kmod, - nettools, + net-tools, procps, tcpdump, traceroute, @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { iptables iputils kmod - nettools + net-tools procps tcpdump traceroute diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index b730bb4eb176..c502aa52d90b 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -32,7 +32,7 @@ gst-plugins-good, gst-plugins-bad, gst-vaapi, - webrtc-audio-processing_1, + webrtc-audio-processing, }: stdenv.mkDerivation (finalAttrs: { @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-good # contains rtpbin, required for VP9 gst-plugins-bad # required for H264, MSDK gst-vaapi # required for VAAPI - webrtc-audio-processing_1 + webrtc-audio-processing ]; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 01b661171aca..5524ed9fcf0e 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -30,7 +30,7 @@ secp256k1, speex, udev, - webrtc-audio-processing, + webrtc-audio-processing_0_3, yaml-cpp, zlib, @@ -220,7 +220,7 @@ stdenv.mkDerivation rec { secp256k1 speex udev - webrtc-audio-processing + webrtc-audio-processing_0_3 yaml-cpp zlib ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index e948075cc125..2c18e5d84221 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -95,8 +95,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "140.0"; - sha512 = "2e9a5fb44b21eba3e3295205142bfad666a65f9eea43118388968320597a940cf3c5675fbcf458fbbaa9e1bb85fe8a663feda6461b7e23f7103c5bb7a1103bd4"; + version = "140.0.1"; + sha512 = "fbef1d0228c49fc9c11425b6be03bb7e44e6abc6f2027ee23317270ca2c6b0a935bb41b38667acf014bd9e1166cbe62754f1e919e04f2355dc4c833e015c78b8"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests.patch b/pkgs/applications/office/libreoffice/skip-broken-tests.patch index 959510958a7e..244935348161 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests.patch @@ -1,6 +1,8 @@ +diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx +index 231aea8d0f3c..214a23c82562 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx -@@ -595,6 +595,8 @@ void DesktopLOKTest::testGetFilterTypes() +@@ -603,6 +603,8 @@ void DesktopLOKTest::testGetFilterTypes() void DesktopLOKTest::testSearchCalc() { @@ -9,7 +11,7 @@ LibLibreOffice_Impl aOffice; LibLODocument_Impl* pDocument = loadDoc("search.ods"); pDocument->pClass->initializeForRendering(pDocument, nullptr); -@@ -625,6 +627,8 @@ void DesktopLOKTest::testSearchCalc() +@@ -633,6 +635,8 @@ void DesktopLOKTest::testSearchCalc() void DesktopLOKTest::testSearchAllNotificationsCalc() { @@ -18,6 +20,8 @@ LibLibreOffice_Impl aOffice; LibLODocument_Impl* pDocument = loadDoc("search.ods"); pDocument->pClass->initializeForRendering(pDocument, nullptr); +diff --git a/svgio/qa/cppunit/data/tdf160386.svg b/svgio/qa/cppunit/data/tdf160386.svg +index 1644b0d15514..cf429508bcd4 100644 --- a/svgio/qa/cppunit/data/tdf160386.svg +++ b/svgio/qa/cppunit/data/tdf160386.svg @@ -8,7 +8,6 @@ @@ -28,9 +32,11 @@ Привет! ☺ +diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx +index d8093e57a4e8..c95a742a68d3 100644 --- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx +++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx -@@ -361,6 +361,8 @@ void checkIssuePosition(std::shared_ptr const& pIssue, +@@ -422,6 +422,8 @@ void checkIssuePosition(std::shared_ptr const& pIssue, CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend) { @@ -39,9 +45,11 @@ // Checks the a11y checker is setting the a11y issues to the nodes // correctly when splitting and appending nodes (through undo), which // happen on editing all the time. +diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx +index b81146642bd4..2094b7ea9477 100644 --- a/sw/qa/core/text/text.cxx +++ b/sw/qa/core/text/text.cxx -@@ -1630,6 +1630,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect) +@@ -1596,6 +1596,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect) CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810) { @@ -50,9 +58,23 @@ // Load the document. // The document embeds a subset of "Source Han Serif SC" so that it works // even when the font is not installed. +diff --git a/sw/qa/extras/docbookexport/docbookexport.cxx b/sw/qa/extras/docbookexport/docbookexport.cxx +index e7543d99577e..f44f92a47c7e 100644 +--- a/sw/qa/extras/docbookexport/docbookexport.cxx ++++ b/sw/qa/extras/docbookexport/docbookexport.cxx +@@ -21,6 +21,7 @@ public: + + CPPUNIT_TEST_FIXTURE(DocbookExportTest, testsimple) + { ++ return; // fails on latest libxml + createSwDoc("simple.docx"); + save(mpFilter); + xmlDocUniquePtr pDoc = parseXml(maTempFile); +diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx +index 6cf8f22647b9..12848713771b 100644 --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx -@@ -308,6 +308,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px) +@@ -297,6 +297,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px) CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel) { @@ -61,9 +83,11 @@ createSwWebDoc("outline-level.html"); // This was 0, HTML imported into Writer lost the outline numbering for // Heading 1 styles. +diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx +index e53d22c8fd1a..2f9decb0d931 100644 --- a/sw/qa/extras/layout/layout3.cxx +++ b/sw/qa/extras/layout/layout3.cxx -@@ -1038,6 +1038,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c) +@@ -1388,6 +1388,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c) CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177) { @@ -72,6 +96,8 @@ createSwDoc("tdf155177-1-min.odt"); uno::Reference xStyle( +diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx +index 794b3bd16ed4..3feaadd7a20f 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -602,6 +602,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo56272) @@ -83,18 +109,20 @@ createSwDoc("incorrectsum.odt"); Scheduler::ProcessEventsToIdle(); uno::Reference xTablesSupplier(mxComponent, uno::UNO_QUERY); +diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx +index 4ebc4be96149..85b8908e16b9 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -2762,6 +2762,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDeleteNodeRedlineCallback) +@@ -2538,6 +2538,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testVisCursorInvalidation) - CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testVisCursorInvalidation) + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDeselectCustomShape) { + return; // flaky on some backends? + SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); - ViewCallback aView1; - int nView1 = SfxLokHelper::getView(); -@@ -3048,6 +3050,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut) + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false); +@@ -2745,6 +2747,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut) CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin) { @@ -103,7 +131,7 @@ // Load a document where the top left tile contains // paragraph and line break symbols with redlining. SwXTextDocument* pXTextDocument = createDoc("tdf43244_SpacesOnMargin.odt"); -@@ -4091,6 +4095,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) +@@ -3786,6 +3790,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) // toggling Formatting Marks on/off for one view should have no effect on other views CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) { @@ -111,13 +139,15 @@ SwXTextDocument* pXTextDocument = createDoc(); int nView1 = SfxLokHelper::getView(); +diff --git a/sw/qa/extras/uiwriter/uiwriter5.cxx b/sw/qa/extras/uiwriter/uiwriter5.cxx +index e37df27fd817..937c12e8c4c5 100644 --- a/sw/qa/extras/uiwriter/uiwriter5.cxx +++ b/sw/qa/extras/uiwriter/uiwriter5.cxx -@@ -1571,6 +1571,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldContentOperations) +@@ -1549,6 +1549,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldContentOperations) CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateHandling) { + return; // flaky on KF6 createSwDoc(); SwDoc* pDoc = getSwDoc(); - CPPUNIT_ASSERT(pDoc); + IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess(); diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d5fc795c3645..6e5fbf8b34ad 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -4,14 +4,27 @@ cmake, cups, fetchurl, + fetchpatch, fontconfig, freetype, + graphicsmagick, harfbuzzFull, hunspell, lcms2, + libcdr, + libfreehand, libjpeg, + libjxl, + libmspub, + libpagemaker, + libqxp, + librevenge, + libsysprof-capture, libtiff, + libvisio, + libwpg, libxml2, + libzmf, pixman, pkg-config, podofo_0_10, @@ -20,7 +33,7 @@ python3, lib, stdenv, - qt5, + qt6, }: let @@ -32,17 +45,17 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.4"; + version = "1.7.0"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-UzvnrwOs+qc27F96P8JWKr0gD+9coqfN7gK19E1hgp4="; + hash = "sha256-+lnWIh/3z/qTcjV5l+hlcBYuHhiRNza3F2/RD0jCQ/Y="; }; nativeBuildInputs = [ cmake pkg-config - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ @@ -51,37 +64,63 @@ stdenv.mkDerivation (finalAttrs: { cups fontconfig freetype + graphicsmagick harfbuzzFull hunspell lcms2 + libcdr + libfreehand libjpeg + libjxl + libpagemaker + libqxp + librevenge + libsysprof-capture libtiff + libvisio + libwpg libxml2 + libzmf pixman podofo_0_10 poppler poppler_data pythonEnv - qt5.qtbase - qt5.qtimageformats - qt5.qttools + qt6.qt5compat + qt6.qtbase + qt6.qtdeclarative + qt6.qtimageformats + qt6.qtsvg + qt6.qttools + ] ++ lib.optionals libmspub.meta.available [ libmspub ]; + + cmakeFlags = [ (lib.cmakeBool "WANT_GRAPHICSMAGICK" true) ]; + + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_qt_6.9.0.patch?h=scribus-unstable"; + hash = "sha256-hzd9XpoVVqbwvZ40QPGBqqWkIFXug/tSojf/Ikc4nn4="; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_poppler_25.02.0.patch?h=scribus-unstable"; + hash = "sha256-t9xJA6KGMGAdUFyjI8OlTNilewyMr1FFM7vjHOM15Xg="; + }) ]; - meta = with lib; { - maintainers = with maintainers; [ - arthsmn - ]; + meta = { + maintainers = with lib.maintainers; [ arthsmn ]; description = "Desktop Publishing (DTP) and Layout program"; mainProgram = "scribus"; homepage = "https://www.scribus.net"; # There are a lot of licenses... # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 - license = with licenses; [ + license = with lib.licenses; [ bsd3 gpl2Plus mit publicDomain ]; + platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index eae9f1e5d063..aef55bfa170f 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { unittest-xml-reporting ]; - pytestFlagsArray = [ + enabledTestPaths = [ "test" ]; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 962b8955c2ee..f57cfd6ee054 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.49.0"; + version = "2.50.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI @@ -89,11 +89,12 @@ stdenv.mkDerivation (finalAttrs: { }.tar.xz" else "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-YYGQz1kLfp9sEfkfI7HSZ82Yw6szuFBBbYdY+LWoVig="; + hash = "sha256-3/PAAOQArOOmO4pvizt2uI7P3/1FBKBKukJINyzewEU="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; separateDebugInfo = true; + __structuredAttrs = true; hardeningDisable = [ "format" ]; @@ -116,7 +117,8 @@ stdenv.mkDerivation (finalAttrs: { # Fix references to gettext introduced by ./git-sh-i18n.patch substituteInPlace git-sh-i18n.sh \ --subst-var-by gettext ${gettext} - + '' + + lib.optionalString doInstallCheck '' # ensure we are using the correct shell when executing the test scripts patchShebangs t/*.sh '' @@ -165,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # required to support pthread_cancel() - NIX_LDFLAGS = + env.NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" + lib.optionalString (stdenv.hostPlatform.isFreeBSD) "-lthr"; @@ -282,10 +284,6 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' - notSupported() { - unlink $1 || true - } - # Set up the flags array for make in the same way as for the main install # phase from stdenv. local flagsArray=( @@ -303,7 +301,6 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/git cp -a contrib $out/share/git/ mkdir -p $out/share/bash-completion/completions - ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/ # only readme, developed in another repo rm -r contrib/hooks/multimail @@ -382,8 +379,7 @@ stdenv.mkDerivation (finalAttrs: { '' else '' - # replace git-svn by notification script - notSupported $out/libexec/git-core/git-svn + rm $out/libexec/git-core/git-svn '' ) @@ -396,14 +392,13 @@ stdenv.mkDerivation (finalAttrs: { '' else '' - # replace git-send-email by notification script - notSupported $out/libexec/git-core/git-send-email + rm $out/libexec/git-core/git-send-email '' ) + lib.optionalString withManual '' # Install man pages - make "''${flagsArray[@]}" cmd-list.made install install-html \ + make "''${flagsArray[@]}" install install-html \ -C Documentation '' @@ -420,9 +415,8 @@ stdenv.mkDerivation (finalAttrs: { '' else '' - # Don't wrap Tcl/Tk, replace them by notification scripts for prog in bin/gitk libexec/git-core/git-gui; do - notSupported "$out/$prog" + rm "$out/$prog" done '' ) @@ -573,6 +567,8 @@ stdenv.mkDerivation (finalAttrs: { wmertens globin kashw2 + me-and + philiptaron ]; mainProgram = "git"; }; diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix index 8cee576a5792..8c6f00240c19 100644 --- a/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -8,13 +8,13 @@ buildLua rec { pname = "mpv-quality-menu"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "christoph-heinrich"; repo = "mpv-quality-menu"; rev = "v${version}"; - hash = "sha256-uaU4W72P7zhHzxmfr59icCAl1mJ3ycLGzkGcYasHllI="; + hash = "sha256-W+6OYjh0S7nYrNC/P9sF7t6p1Rt/awOtO865cr6qtR0="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0260e5fe96fd..4724364e6786 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -144,11 +144,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "10.0.0"; + version = "10.0.2"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-IsB1YB/c+MeyZxqDnr3O8dTylz62c1JU/S4b0PMLOJY="; + hash = "sha256-73hvI5jLUYRgD2mu9NXWke/URXajz/QSbTjUxv7Id1k="; }; depsBuildBuild = diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index b36afd4bdc7f..1dc5effb7044 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -35,7 +35,7 @@ alsa-lib, curl, libvpx, - nettools, + net-tools, dbus, replaceVars, gsoap, @@ -263,7 +263,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ + sed -i -e 's|/sbin/ifconfig|${net-tools}/bin/ifconfig|' \ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp ''; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2e60bcf41e68..c2ac127b6841 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -20,7 +20,7 @@ gobject-introspection, which, dbus, - nettools, + net-tools, git, doxygen, xmlto, @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { libstartup_notification libxdg_basedir lua - nettools + net-tools pango xcb-util-cursor xorg.libXau diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 76606716d808..f2fdf36f79e5 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -9,8 +9,8 @@ use JSON::PP; STDOUT->autoflush(1); -$SIG{__WARN__} = sub { warn "warning: ", @_ }; -$SIG{__DIE__} = sub { die "error: ", @_ }; +$SIG{__WARN__} = sub { warn "pkgs.buildEnv warning: ", @_ }; +$SIG{__DIE__} = sub { die "pkgs.buildEnv error: ", @_ }; my $out = $ENV{"out"}; my $extraPrefix = $ENV{"extraPrefix"}; @@ -109,7 +109,7 @@ sub findFiles($relName, $target, $baseName, $ignoreCollisions, $checkCollisionCo # The store path must not be a file when not ignoreSingleFileOutputs if (-f $target && isStorePath $target) { if ($ignoreSingleFileOutputs) { - warn "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv"; + warn "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv, ignoring it"; return; } else { die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!"; @@ -173,12 +173,12 @@ sub findFiles($relName, $target, $baseName, $ignoreCollisions, $checkCollisionCo my $oldTargetRef = prependDangling($oldTarget); if ($ignoreCollisions) { - warn "collision between $targetRef and $oldTargetRef\n" if $ignoreCollisions == 1; + warn "colliding subpath (ignored): $targetRef and $oldTargetRef\n" if $ignoreCollisions == 1; return; } elsif ($checkCollisionContents && checkCollision($oldTarget, $target)) { return; } else { - die "collision between $targetRef and $oldTargetRef\n"; + die "two given paths contain a conflicting subpath:\n $targetRef and\n $oldTargetRef\nhint: this may be caused by two different versions of the same package in buildEnv's `paths` parameter\nhint: `pkgs.nix-diff` can be used to compare derivations\n"; } } diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 2dcf1516d2de..319225a6ed87 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -18,21 +18,6 @@ if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then hardeningEnableMap["fortify"]=1 fi -# Remove unsupported flags. -for flag in @hardening_unsupported_flags@; do - unset -v "hardeningEnableMap[$flag]" - # fortify being unsupported implies fortify3 is unsupported - if [[ "$flag" = 'fortify' ]] ; then - unset -v "hardeningEnableMap['fortify3']" - fi -done - -# now make fortify and fortify3 mutually exclusive -if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then - unset -v "hardeningEnableMap['fortify']" -fi - - # strictflexarrays3 implies strictflexarrays1 enablement - make explicit before # we filter unsupported flags because unsupporting strictflexarrays3 # doesn't mean we should unsupport strictflexarrays1 too @@ -40,15 +25,26 @@ if [[ -n "${hardeningEnableMap[strictflexarrays3]-}" ]]; then hardeningEnableMap["strictflexarrays1"]=1 fi + # Remove unsupported flags. for flag in @hardening_unsupported_flags@; do unset -v "hardeningEnableMap[$flag]" + # fortify being unsupported implies fortify3 is unsupported + if [[ "$flag" = 'fortify' ]] ; then + unset -v "hardeningEnableMap['fortify3']" + fi # strictflexarrays1 being unsupported implies strictflexarrays3 is unsupported if [[ "$flag" = 'strictflexarrays1' ]] ; then unset -v "hardeningEnableMap['strictflexarrays3']" fi done + +# now make fortify and fortify3 mutually exclusive +if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then + unset -v "hardeningEnableMap['fortify']" +fi + # now make strictflexarrays1 and strictflexarrays3 mutually exclusive if [[ -n "${hardeningEnableMap[strictflexarrays3]-}" ]]; then unset -v "hardeningEnableMap['strictflexarrays1']" diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index a4b4573082f4..eecaacbd6fea 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -726,6 +726,15 @@ stdenvNoCC.mkDerivation { echo "-isystem ${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags '' + # GCC NG friendly libc++ + + optionalString (libcxx != null && libcxx.isGNU or false) '' + for dir in ${getDev libcxx}/include/c++/*; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + for dir in ${getDev libcxx}/include/c++/*/${targetPlatform.config}; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + '' ## ## Initial CFLAGS diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 731ad0104206..7e51efed66ac 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -69,12 +69,6 @@ gnome = [ # This one redirects to some mirror closeby, so it should be all you need "https://download.gnome.org/" - - "https://fr2.rpmfind.net/linux/gnome.org/" - "https://ftp.acc.umu.se/pub/GNOME/" - "https://ftp.belnet.be/mirror/ftp.gnome.org/" - "ftp://ftp.cse.buffalo.edu/pub/Gnome/" - "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/" ]; # GNU (https://www.gnu.org/prep/ftp.html) diff --git a/pkgs/build-support/node/fetch-yarn-deps/common.js b/pkgs/build-support/node/fetch-yarn-deps/common.js index 95dab609a855..7f56ec26f491 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/common.js +++ b/pkgs/build-support/node/fetch-yarn-deps/common.js @@ -3,17 +3,17 @@ const path = require('path') // This has to match the logic in pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js // so that fixup_yarn_lock produces the same paths const urlToName = url => { - const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') + const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') - if (url.startsWith('file:')) { - return url - } else if (url.startsWith('git+') || isCodeloadGitTarballUrl) { - return path.basename(url) - } else { - return url - .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names - .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore - } + if (url.startsWith('file:')) { + return url + } else if (url.startsWith('git+') || isCodeloadGitTarballUrl) { + return path.basename(url) + } else { + return url + .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names + .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore + } } module.exports = { urlToName }; diff --git a/pkgs/build-support/node/fetch-yarn-deps/fixup.js b/pkgs/build-support/node/fetch-yarn-deps/fixup.js index 0b87393b1fff..b9c8c90b6169 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/fixup.js +++ b/pkgs/build-support/node/fetch-yarn-deps/fixup.js @@ -7,79 +7,79 @@ const lockfile = require('./yarnpkg-lockfile.js') const { urlToName } = require('./common.js') const fixupYarnLock = async (lockContents, verbose) => { - const lockData = lockfile.parse(lockContents) + const lockData = lockfile.parse(lockContents) - const fixedData = Object.fromEntries( - Object.entries(lockData.object) - .map(([dep, pkg]) => { - if (pkg.resolved === undefined) { - console.warn(`no resolved URL for package ${dep}`) - var maybeFile = dep.split("@", 2)[1] - if (maybeFile.startsWith("file:")) { - console.log(`Rewriting URL for local file dependency ${dep}`) - pkg.resolved = maybeFile - } - return [dep, pkg] - } - const [ url, hash ] = pkg.resolved.split("#", 2) + const fixedData = Object.fromEntries( + Object.entries(lockData.object) + .map(([dep, pkg]) => { + if (pkg.resolved === undefined) { + console.warn(`no resolved URL for package ${dep}`) + var maybeFile = dep.split("@", 2)[1] + if (maybeFile.startsWith("file:")) { + console.log(`Rewriting URL for local file dependency ${dep}`) + pkg.resolved = maybeFile + } + return [dep, pkg] + } + const [ url, hash ] = pkg.resolved.split("#", 2) - if (hash || url.startsWith("https://codeload.github.com/")) { - if (verbose) console.log(`Removing integrity for git dependency ${dep}`) - delete pkg.integrity - } + if (hash || url.startsWith("https://codeload.github.com/")) { + if (verbose) console.log(`Removing integrity for git dependency ${dep}`) + delete pkg.integrity + } - if (verbose) console.log(`Rewriting URL ${url} for dependency ${dep}`) - pkg.resolved = urlToName(url) - if (hash) - pkg.resolved += `#${hash}` + if (verbose) console.log(`Rewriting URL ${url} for dependency ${dep}`) + pkg.resolved = urlToName(url) + if (hash) + pkg.resolved += `#${hash}` - return [dep, pkg] - }) - ) + return [dep, pkg] + }) + ) - if (verbose) console.log('Done') + if (verbose) console.log('Done') - return fixedData + return fixedData } const showUsage = async () => { - process.stderr.write(` + process.stderr.write(` syntax: fixup-yarn-lock [path to yarn.lock] [options] Options: -h --help Show this help -v --verbose Verbose output `) - process.exit(1) + process.exit(1) } const main = async () => { - const args = process.argv.slice(2) - let next, lockFile, verbose - while (next = args.shift()) { - if (next == '--verbose' || next == '-v') { - verbose = true - } else if (next == '--help' || next == '-h') { - showUsage() - } else if (!lockFile) { - lockFile = next - } else { - showUsage() - } - } - let lockContents - try { - lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8') - } catch { - showUsage() - } + const args = process.argv.slice(2) + let next, lockFile, verbose + while (next = args.shift()) { + if (next == '--verbose' || next == '-v') { + verbose = true + } else if (next == '--help' || next == '-h') { + showUsage() + } else if (!lockFile) { + lockFile = next + } else { + showUsage() + } + } + let lockContents + try { + lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8') + } catch { + showUsage() + } - const fixedData = await fixupYarnLock(lockContents, verbose) - await fs.promises.writeFile(lockFile || 'yarn.lock', lockfile.stringify(fixedData)) + const fixedData = await fixupYarnLock(lockContents, verbose) + await fs.promises.writeFile(lockFile || 'yarn.lock', lockfile.stringify(fixedData)) } main() - .catch(e => { - console.error(e) - process.exit(1) - }) + .catch(e => { + console.error(e) + process.exit(1) + }) diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js index c961365becf1..ea2f4a73ca12 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -15,155 +15,155 @@ const { urlToName } = require('./common.js') const execFile = promisify(child_process.execFile) const exec = async (...args) => { - const res = await execFile(...args) - if (res.error) throw new Error(res.stderr) - return res + const res = await execFile(...args) + if (res.error) throw new Error(res.stderr) + return res } const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => { - return new Promise((resolve, reject) => { - const get = (url, redirects = 0) => https.get(url, (res) => { - if(redirects > 10) { - reject('Too many redirects!'); - return; - } - if(res.statusCode === 301 || res.statusCode === 302) { - return get(res.headers.location, redirects + 1) - } - const file = fs.createWriteStream(fileName) - const hash = crypto.createHash(hashType) - res.pipe(file) - res.pipe(hash).setEncoding('hex') - res.on('end', () => { - file.close() - const h = hash.read() - if (expectedHash === undefined){ - console.log(`Warning: lockfile url ${url} doesn't end in "#" to validate against. Downloaded file had hash ${h}.`); - } else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`)) - resolve() - }) - res.on('error', e => reject(e)) - }) - get(url) - }) + return new Promise((resolve, reject) => { + const get = (url, redirects = 0) => https.get(url, (res) => { + if(redirects > 10) { + reject('Too many redirects!'); + return; + } + if(res.statusCode === 301 || res.statusCode === 302) { + return get(res.headers.location, redirects + 1) + } + const file = fs.createWriteStream(fileName) + const hash = crypto.createHash(hashType) + res.pipe(file) + res.pipe(hash).setEncoding('hex') + res.on('end', () => { + file.close() + const h = hash.read() + if (expectedHash === undefined){ + console.log(`Warning: lockfile url ${url} doesn't end in "#" to validate against. Downloaded file had hash ${h}.`); + } else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`)) + resolve() + }) + res.on('error', e => reject(e)) + }) + get(url) + }) } const downloadGit = async (fileName, url, rev) => { - await exec('nix-prefetch-git', [ - '--out', fileName + '.tmp', - '--url', url, - '--rev', rev, - '--builder' - ]) + await exec('nix-prefetch-git', [ + '--out', fileName + '.tmp', + '--url', url, + '--rev', rev, + '--builder' + ]) - await exec('tar', [ - // hopefully make it reproducible across runs and systems - '--owner=0', '--group=0', '--numeric-owner', '--format=gnu', '--sort=name', '--mtime=@1', + await exec('tar', [ + // hopefully make it reproducible across runs and systems + '--owner=0', '--group=0', '--numeric-owner', '--format=gnu', '--sort=name', '--mtime=@1', - // Set u+w because tar-fs can't unpack archives with read-only dirs: https://github.com/mafintosh/tar-fs/issues/79 - '--mode', 'u+w', + // Set u+w because tar-fs can't unpack archives with read-only dirs: https://github.com/mafintosh/tar-fs/issues/79 + '--mode', 'u+w', - '-C', fileName + '.tmp', - '-cf', fileName, '.' - ]) + '-C', fileName + '.tmp', + '-cf', fileName, '.' + ]) - await exec('rm', [ '-rf', fileName + '.tmp', ]) + await exec('rm', [ '-rf', fileName + '.tmp', ]) } const isGitUrl = pattern => { - // https://github.com/yarnpkg/yarn/blob/3119382885ea373d3c13d6a846de743eca8c914b/src/resolvers/exotics/git-resolver.js#L15-L47 - const GIT_HOSTS = ['github.com', 'gitlab.com', 'bitbucket.com', 'bitbucket.org'] - const GIT_PATTERN_MATCHERS = [/^git:/, /^git\+.+:/, /^ssh:/, /^https?:.+\.git$/, /^https?:.+\.git#.+/] + // https://github.com/yarnpkg/yarn/blob/3119382885ea373d3c13d6a846de743eca8c914b/src/resolvers/exotics/git-resolver.js#L15-L47 + const GIT_HOSTS = ['github.com', 'gitlab.com', 'bitbucket.com', 'bitbucket.org'] + const GIT_PATTERN_MATCHERS = [/^git:/, /^git\+.+:/, /^ssh:/, /^https?:.+\.git$/, /^https?:.+\.git#.+/] - for (const matcher of GIT_PATTERN_MATCHERS) if (matcher.test(pattern)) return true + for (const matcher of GIT_PATTERN_MATCHERS) if (matcher.test(pattern)) return true - const {hostname, path} = url.parse(pattern) - if (hostname && path && GIT_HOSTS.indexOf(hostname) >= 0 - // only if dependency is pointing to a git repo, - // e.g. facebook/flow and not file in a git repo facebook/flow/archive/v1.0.0.tar.gz - && path.split('/').filter(p => !!p).length === 2 - ) return true + const {hostname, path} = url.parse(pattern) + if (hostname && path && GIT_HOSTS.indexOf(hostname) >= 0 + // only if dependency is pointing to a git repo, + // e.g. facebook/flow and not file in a git repo facebook/flow/archive/v1.0.0.tar.gz + && path.split('/').filter(p => !!p).length === 2 + ) return true - return false + return false } const downloadPkg = (pkg, verbose) => { - for (let marker of ['@file:', '@link:']) { - const split = pkg.key.split(marker) - if (split.length == 2) { - console.info(`ignoring lockfile entry "${split[0]}" which points at path "${split[1]}"`) - return - } else if (split.length > 2) { - throw new Error(`The lockfile entry key "${pkg.key}" contains "${marker}" more than once. Processing is not implemented.`) - } - } + for (let marker of ['@file:', '@link:']) { + const split = pkg.key.split(marker) + if (split.length == 2) { + console.info(`ignoring lockfile entry "${split[0]}" which points at path "${split[1]}"`) + return + } else if (split.length > 2) { + throw new Error(`The lockfile entry key "${pkg.key}" contains "${marker}" more than once. Processing is not implemented.`) + } + } - if (pkg.resolved === undefined) { - throw new Error(`The lockfile entry with key "${pkg.key}" cannot be downloaded because it is missing the "resolved" attribute, which should contain the URL to download from. The lockfile might be invalid.`) - } + if (pkg.resolved === undefined) { + throw new Error(`The lockfile entry with key "${pkg.key}" cannot be downloaded because it is missing the "resolved" attribute, which should contain the URL to download from. The lockfile might be invalid.`) + } - const [ url, hash ] = pkg.resolved.split('#') - if (verbose) console.log('downloading ' + url) - const fileName = urlToName(url) - const s = url.split('/') - if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) { - return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1]) - } else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz') && - ( - s.length <= 5 || // https://github.com/owner/repo.tgz#feedface... - s[5] == "archive" // https://github.com/owner/repo/archive/refs/tags/v0.220.1.tar.gz - )) { - return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1].replace(/.tar.gz$/, '')) - } else if (isGitUrl(url)) { - return downloadGit(fileName, url.replace(/^git\+/, ''), hash) - } else if (url.startsWith('https://')) { - if (typeof pkg.integrity === 'string' || pkg.integrity instanceof String) { - const [ type, checksum ] = pkg.integrity.split('-') - return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), type) - } - return downloadFileHttps(fileName, url, hash) - } else if (url.startsWith('file:')) { - console.warn(`ignoring unsupported file:path url "${url}"`) - } else { - throw new Error('don\'t know how to download "' + url + '"') - } + const [ url, hash ] = pkg.resolved.split('#') + if (verbose) console.log('downloading ' + url) + const fileName = urlToName(url) + const s = url.split('/') + if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) { + return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1]) + } else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz') && + ( + s.length <= 5 || // https://github.com/owner/repo.tgz#feedface... + s[5] == "archive" // https://github.com/owner/repo/archive/refs/tags/v0.220.1.tar.gz + )) { + return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1].replace(/.tar.gz$/, '')) + } else if (isGitUrl(url)) { + return downloadGit(fileName, url.replace(/^git\+/, ''), hash) + } else if (url.startsWith('https://')) { + if (typeof pkg.integrity === 'string' || pkg.integrity instanceof String) { + const [ type, checksum ] = pkg.integrity.split('-') + return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), type) + } + return downloadFileHttps(fileName, url, hash) + } else if (url.startsWith('file:')) { + console.warn(`ignoring unsupported file:path url "${url}"`) + } else { + throw new Error('don\'t know how to download "' + url + '"') + } } const performParallel = tasks => { - const worker = async () => { - while (tasks.length > 0) await tasks.shift()() - } + const worker = async () => { + while (tasks.length > 0) await tasks.shift()() + } - const workers = [] - for (let i = 0; i < 4; i++) { - workers.push(worker()) - } + const workers = [] + for (let i = 0; i < 4; i++) { + workers.push(worker()) + } - return Promise.all(workers) + return Promise.all(workers) } // This could be implemented using [`Map.groupBy`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/groupBy), // but that method is only supported starting with Node 21 const uniqueBy = (arr, callback) => { - const map = new Map() - for (const elem of arr) { - map.set(callback(elem), elem) - } - return [...map.values()] + const map = new Map() + for (const elem of arr) { + map.set(callback(elem), elem) + } + return [...map.values()] } const prefetchYarnDeps = async (lockContents, verbose) => { - const lockData = lockfile.parse(lockContents) - await performParallel( - uniqueBy(Object.entries(lockData.object), ([_, value]) => value.resolved) - .map(([key, value]) => () => downloadPkg({ key, ...value }, verbose)) - ) - await fs.promises.writeFile('yarn.lock', lockContents) - if (verbose) console.log('Done') + const lockData = lockfile.parse(lockContents) + await performParallel( + uniqueBy(Object.entries(lockData.object), ([_, value]) => value.resolved) + .map(([key, value]) => () => downloadPkg({ key, ...value }, verbose)) + ) + await fs.promises.writeFile('yarn.lock', lockContents) + if (verbose) console.log('Done') } const showUsage = async () => { - process.stderr.write(` + process.stderr.write(` syntax: prefetch-yarn-deps [path to yarn.lock] [options] Options: @@ -171,50 +171,50 @@ Options: -v --verbose Verbose output --builder Only perform the download to current directory, then exit `) - process.exit(1) + process.exit(1) } const main = async () => { - const args = process.argv.slice(2) - let next, lockFile, verbose, isBuilder - while (next = args.shift()) { - if (next == '--builder') { - isBuilder = true - } else if (next == '--verbose' || next == '-v') { - verbose = true - } else if (next == '--help' || next == '-h') { - showUsage() - } else if (!lockFile) { - lockFile = next - } else { - showUsage() - } - } - let lockContents - try { - lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8') - } catch { - showUsage() - } + const args = process.argv.slice(2) + let next, lockFile, verbose, isBuilder + while (next = args.shift()) { + if (next == '--builder') { + isBuilder = true + } else if (next == '--verbose' || next == '-v') { + verbose = true + } else if (next == '--help' || next == '-h') { + showUsage() + } else if (!lockFile) { + lockFile = next + } else { + showUsage() + } + } + let lockContents + try { + lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8') + } catch { + showUsage() + } - if (isBuilder) { - await prefetchYarnDeps(lockContents, verbose) - } else { - const { stdout: tmpDir } = await exec('mktemp', [ '-d' ]) + if (isBuilder) { + await prefetchYarnDeps(lockContents, verbose) + } else { + const { stdout: tmpDir } = await exec('mktemp', [ '-d' ]) - try { - process.chdir(tmpDir.trim()) - await prefetchYarnDeps(lockContents, verbose) - const { stdout: hash } = await exec('nix-hash', [ '--type', 'sha256', '--base32', tmpDir.trim() ]) - console.log(hash) - } finally { - await exec('rm', [ '-rf', tmpDir.trim() ]) - } - } + try { + process.chdir(tmpDir.trim()) + await prefetchYarnDeps(lockContents, verbose) + const { stdout: hash } = await exec('nix-hash', [ '--type', 'sha256', '--base32', tmpDir.trim() ]) + console.log(hash) + } finally { + await exec('rm', [ '-rf', tmpDir.trim() ]) + } + } } main() - .catch(e => { - console.error(e) - process.exit(1) - }) + .catch(e => { + console.error(e) + process.exit(1) + }) diff --git a/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js b/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js index 79e247eb4acb..b045e4e0918c 100644 --- a/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js +++ b/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js @@ -69,19 +69,17 @@ async function main() { // Don't unlink this file, we just wrote it. managed.delete(file); - // Link to a temporary dummy path and rename. - // This is to get some degree of atomicity. + // Link file try { - await fs.promises.symlink(sourcePath, targetPath + "-nix-hook-temp"); + await fs.promises.symlink(sourcePath, targetPath); } catch (err) { + // If the target file already exists remove it and try again if (err.code !== "EEXIST") { throw err; } - - await fs.promises.unlink(targetPath + "-nix-hook-temp"); - await fs.promises.symlink(sourcePath, targetPath + "-nix-hook-temp"); + await fs.promises.unlink(targetPath); + await fs.promises.symlink(sourcePath, targetPath); } - await fs.promises.rename(targetPath + "-nix-hook-temp", targetPath); }) ); diff --git a/pkgs/build-support/php/build-pecl.nix b/pkgs/build-support/php/build-pecl.nix index 79faa2c7700a..be02be6c76ed 100644 --- a/pkgs/build-support/php/build-pecl.nix +++ b/pkgs/build-support/php/build-pecl.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation ( # PHP extensions correctly. # See the corresponding PR: https://github.com/Mic92/nix-update/pull/123 isPhpExtension = true; - updateScript = nix-update-script { }; + updateScript = passthru.updateScript or (nix-update-script { }); }; } ) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 91cffcb3fb5f..9a139a7e2c73 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -22,6 +22,7 @@ lib.extendMkDerivation { "depsExtraArgs" "cargoUpdateHook" "cargoLock" + "useFetchCargoVendor" ]; extendDrvArgs = diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 1499380e728b..9f27a44480a9 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -91,13 +91,21 @@ lib.optionalString (stdenv.hostPlatform.config != stdenv.targetPlatform.config) '' [target."${stdenv.targetPlatform.rust.rustcTarget}"] "linker" = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" - "rustflags" = [ "-C", "target-feature=${ - if pkgsTargetTarget.stdenv.targetPlatform.isStatic then "+" else "-" - }crt-static" ] + "rustflags" = [ ${ + lib.concatStringsSep ", " ( + [ + ''"-Ctarget-feature=${if stdenv.targetPlatform.isStatic then "+" else "-"}crt-static"'' + ] + ++ lib.optional (!stdenv.targetPlatform.isx86_32) ''"-Cforce-frame-pointers=yes"'' + ) + } ] '' + '' [target."${stdenv.hostPlatform.rust.rustcTarget}"] "linker" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "rustflags" = [ ${ + lib.optionalString (!stdenv.hostPlatform.isx86_32) ''"-Cforce-frame-pointers=yes"'' + } ] ''; }; diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh index 780f38bc1624..25fe203f813b 100644 --- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh +++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh @@ -15,27 +15,54 @@ auditTmpdir() { echo "checking for references to $TMPDIR/ in $dir..." - _processFile() { - local file="$1" - if isELF "$file"; then - if { printf :; patchelf --print-rpath "$file"; } | grep -q -F ":$TMPDIR/"; then - echo "RPATH of binary $file contains a forbidden reference to $TMPDIR/" - exit 1 - fi - elif isScript "$file"; then - filename=${i##*/} - dir=${i%/*} - if [ -e "$dir/.$filename-wrapped" ]; then - if grep -q -F "$TMPDIR/" "$file"; then - echo "wrapper script $file contains a forbidden reference to $TMPDIR/" - exit 1 + local tmpdir elf_fifo script_fifo + tmpdir="$(mktemp -d)" + elf_fifo="$tmpdir/elf" + script_fifo="$tmpdir/script" + mkfifo "$elf_fifo" "$script_fifo" + + # Classifier: identify ELF and script files + ( + find "$dir" -type f -not -path '*/.build-id/*' -print0 \ + | while IFS= read -r -d $'\0' file; do + if isELF "$file"; then + printf '%s\0' "$file" >&3 + elif isScript "$file"; then + filename=${file##*/} + dir=${file%/*} + if [ -e "$dir/.$filename-wrapped" ]; then + printf '%s\0' "$file" >&4 fi fi - fi - } + done + exec 3>&- 4>&- + ) 3> "$elf_fifo" 4> "$script_fifo" & - find "$dir" -type f -not -path '*/.build-id/*' -print0 \ - | parallelMap _processFile + # Handler: check RPATHs concurrently + ( + xargs -0 -r -P "$NIX_BUILD_CORES" -n 1 sh -c ' + if { printf :; patchelf --print-rpath "$1"; } | grep -q -F ":$TMPDIR/"; then + echo "RPATH of binary $1 contains a forbidden reference to $TMPDIR/" + exit 1 + fi + ' _ < "$elf_fifo" + ) & + local pid_elf=$! - unset -f _processFile + # Handler: check wrapper scripts concurrently + local pid_script + ( + xargs -0 -r -P "$NIX_BUILD_CORES" -n 1 sh -c ' + if grep -q -F "$TMPDIR/" "$1"; then + echo "wrapper script $1 contains a forbidden reference to $TMPDIR/" + exit 1 + fi + ' _ < "$script_fifo" + ) & + local pid_script=$! + + wait "$pid_elf" || { echo "Some binaries contain forbidden references to $TMPDIR/. Check the error above!"; exit 1; } + wait "$pid_script" || { echo "Some scripts contain forbidden references to $TMPDIR/. Check the error above!"; exit 1; } + + rm -r "$tmpdir" } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 541b7fc694d0..9f195ceead82 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -95,6 +95,7 @@ autoPatchelfPostFixup() { if [[ -z "${dontAutoPatchelf-}" ]]; then autoPatchelf -- $(for output in $(getAllOutputNames); do [ -e "${!output}" ] || continue + [ "${output}" = debug ] && continue echo "${!output}" done) fi diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index c51e4ae22ce2..c4f19d0590ca 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -51,6 +51,12 @@ noBrokenSymlinks() { symlinkTarget="$(realpath --no-symlinks --canonicalize-missing "$pathParent/$symlinkTarget")" fi + # use $TMPDIR like audit-tmpdir.sh + if [[ $symlinkTarget = "$TMPDIR"/* ]]; then + nixErrorLog "the symlink $path points to $TMPDIR directory: $symlinkTarget" + numDanglingSymlinks+=1 + continue + fi if [[ $symlinkTarget != "$NIX_STORE"/* ]]; then nixInfoLog "symlink $path points outside the Nix store; ignoring" continue diff --git a/pkgs/build-support/setup-hooks/parallel.sh b/pkgs/build-support/setup-hooks/parallel.sh deleted file mode 100644 index a7c8330a0de1..000000000000 --- a/pkgs/build-support/setup-hooks/parallel.sh +++ /dev/null @@ -1,89 +0,0 @@ -# Parallel execution utilities -# These functions provide a framework for parallel processing of jobs from stdin - -# parallelRun - Execute a command in parallel across multiple cores -# -# Reads null-delimited jobs from stdin and distributes them across NIX_BUILD_CORES -# worker processes. Each worker executes the provided command, receiving jobs -# via stdin in null-delimited format. -# -# Usage: some_producer | parallelRun command [args...] -# -# The command receives jobs one at a time via stdin (null-delimited). -# -# Example: -# find . -name '*.log' -print0 | parallelRun sh -c ' -# while read -r -d "" file; do gzip "$file"; done -# ' -parallelRun() { - local pids - local lock - pids=() - lock=$(mktemp -u) - mkfifo "$lock" - for ((i=0; i"$lock" # fd-4 = write side of lock (push token back) - local job - - while :; do - # Acquire the lock: blocks until a token can be read - read -r -n1 >/dev/null <&3 - - # read one job from stdin - # This is guarded by the lock above in order to prevent - # multiple workers from reading from stdin simultaneously. - if ! IFS= read -r -d '' job; then - # If stdin is closed, release lock and exit - printf 'x' >&4 - break - fi - - # Release the lock: write a token back to the lock FIFO - printf 'y' >&4 - - # Forward job to the worker process' stdin - printf '%s\0' "$job" - - done \ - | "$@" # launch the worker process - } & - pids[$i]=$! - done - # launch the workers by writing a token to the lock FIFO - printf 'a' >"$lock" & - # Wait for all workers to finish - for pid in "${pids[@]}"; do - if ! wait "$pid"; then - echo "A parallel job failed with exit code $? (check for errors above)" >&2 - echo -e "Failing Command:\n $@" >&2 - exit 1 - fi - done - rm "$lock" -} - -# parallelMap - Apply a shell function to each job in parallel -# -# A higher-level wrapper around parallelRun that applies a shell function to each -# null-delimited job from stdin. The shell function receives each job as its first -# argument. -# -# Usage: some_producer | parallelMap shell_function [additional_args...] -# -# The shell function is called as: shell_function job [additional_args...] -# for each job read from stdin. -# -# Example: -# compress() { gzip "$1" } -# find . -name '*.log' -print0 | parallelMap compress -parallelMap() { - _wrapper() { - while IFS= read -r -d '' job; do - "$@" "$job" - done - } - parallelRun _wrapper "$@" - unset -f _wrapper -} diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index a7b2b110f23f..7fb6dc86c87a 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -68,6 +68,31 @@ patchShebangs() { return 0 fi + # like sponge from moreutils but in pure bash + _sponge() { + local content + local target + local restoreReadOnly + content="" + target="$1" + + # Make file writable if it is read-only + if [[ ! -w "$target" ]]; then + chmod +w "$target" + restoreReadOnly=true + fi + + while IFS= read -r line || [[ -n "$line" ]]; do + content+="$line"$'\n' + done + printf '%s' "$content" > "$target" + + # Restore read-only if it was read-only before + if [[ -n "${restoreReadOnly:-}" ]]; then + chmod -w "$target" + fi + } + local f while IFS= read -r -d $'\0' f; do isScript "$f" || continue @@ -126,11 +151,14 @@ patchShebangs() { # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281 timestamp=$(stat --printf "%y" "$f") - sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" + sed -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" | _sponge "$f" + touch --date "$timestamp" "$f" fi fi done < <(find "$@" -type f -perm -0100 -print0) + + unset -f _sponge } patchShebangsAuto () { diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 4208aa481d0d..32c9b1a2cba6 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -3,18 +3,47 @@ export NIX_LDFLAGS+=" --compress-debug-sections=zlib" export NIX_CFLAGS_COMPILE+=" -ggdb -Wa,--compress-debug-sections" export NIX_RUSTFLAGS+=" -g -C strip=none" +cksumAlgo=sha256 + fixupOutputHooks+=(_separateDebugInfo) +postUnpackHooks+=(_recordPristineSourceHashes) + +_recordPristineSourceHashes() { + # shellcheck disable=2154 + [ -e "$sourceRoot" ] || return 0 + + local checksumFileName=__nix_source_checksums + echo "separate-debug-info: recording checksum of source files for debug support..." + find "$sourceRoot" -type f -exec cksum -a "$cksumAlgo" '{}' \+ > "$checksumFileName" + recordedSourceChecksumsFileName="$(readlink -f "$checksumFileName")" +} _separateDebugInfo() { + # shellcheck disable=2154 [ -e "$prefix" ] || return 0 - local dst="${debug:-$out}" - if [ "$prefix" = "$dst" ]; then return 0; fi + local debugOutput="${debug:-$out}" + if [ "$prefix" = "$debugOutput" ]; then return 0; fi # in case there is nothing to strip, don't fail the build - mkdir -p "$dst" + mkdir -p "$debugOutput" - dst="$dst/lib/debug/.build-id" + local dst="$debugOutput/lib/debug/.build-id" + + local source + local sourceOverlay + # shellcheck disable=2154 + if [ -e "$src" ]; then + source="$src" + if [ -n "${recordedSourceChecksumsFileName:-}" ]; then + sourceOverlay="$debugOutput/src/overlay" + else + sourceOverlay="" + fi + else + source="" + sourceOverlay="" + fi # Find executables and dynamic libraries. local i @@ -25,30 +54,64 @@ _separateDebugInfo() { [ -z "${OBJCOPY:-}" ] && echo "_separateDebugInfo: '\$OBJCOPY' variable is empty, skipping." 1>&2 && break # Extract the Build ID. FIXME: there's probably a cleaner way. - local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" + local id + id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" if [ "${#id}" != 40 ]; then echo "could not find build ID of $i, skipping" >&2 continue fi + # Extract the debug info. echo "separating debug info from $i (build ID $id)" - destDir=$dst/${id:0:2} - destFile=$dst/${id:0:2}/${id:2}.debug + local debuginfoDir="$dst/${id:0:2}" + local buildIdPrefix="$debuginfoDir/${id:2}" + local debuginfoFile="$buildIdPrefix.debug" + local executableSymlink="$buildIdPrefix.executable" + local sourceSymlink="$buildIdPrefix.source" + local sourceOverlaySymlink="$buildIdPrefix.sourceoverlay" - mkdir -p "$destDir" + mkdir -p "$debuginfoDir" - if [ -f "$destFile" ]; then + if [ -f "$debuginfoFile" ]; then echo "separate-debug-info: warning: multiple files with build id $id found, overwriting" fi # This may fail, e.g. if the binary is for a different # architecture than we're building for. (This happens with # firmware blobs in QEMU.) - if $OBJCOPY --only-keep-debug "$i" "$destFile"; then + if $OBJCOPY --only-keep-debug "$i" "$debuginfoFile"; then # If we succeeded, also a create a symlink .debug. - ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" + ln -sfn "$debuginfoFile" "$dst/../$(basename "$i")" + # also create a symlink mapping the build-id to the original elf file and the source + # debuginfod protocol relies on it + ln -sfn "$i" "$executableSymlink" + if [ -n "$source" ]; then + ln -sfn "$source" "$sourceSymlink" + fi + if [ -n "$sourceOverlay" ]; then + # create it lazily + if [ ! -d "$sourceOverlay" ]; then + echo "separate-debug-info: copying patched source files to $sourceOverlay..." + mkdir -p "$sourceOverlay" + pushd "$(dirname "$recordedSourceChecksumsFileName")" || { echo "separate-debug-info: failed to cd parent directory of $recordedSourceChecksumsFileName"; return 1; } + while IFS= read -r -d $'\0' modifiedSourceFile; do + if [ -z "$modifiedSourceFile" ]; then + continue + fi + # this can happen with files with '\n' in their name + if [ ! -f "$modifiedSourceFile" ]; then + echo "separate-debug-info: cannot save modified source file $modifiedSourceFile: does not exist. ignoring" + continue + fi + mkdir -p "$sourceOverlay/$(dirname "$modifiedSourceFile")" + cp -v "$modifiedSourceFile" "$sourceOverlay/$modifiedSourceFile" + done < <(LANG=C cksum -a "$cksumAlgo" --check --ignore-missing --quiet "$recordedSourceChecksumsFileName" 2>&1 | sed -n -e 's/: FAILED$/\x00/p' | sed -z -e 's/^\n//') + popd || { echo "separate-debug-info: failed to popd" ; return 1; } + fi + ln -sfn "$sourceOverlay" "$sourceOverlaySymlink" + fi else # If we failed, try to clean up unnecessary directories rmdir -p "$dst/${id:0:2}" --ignore-fail-on-non-empty diff --git a/pkgs/build-support/setup-hooks/tests/default.nix b/pkgs/build-support/setup-hooks/tests/default.nix deleted file mode 100644 index 36cd73a1a9ee..000000000000 --- a/pkgs/build-support/setup-hooks/tests/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - stdenv, -}: -{ - # test based on bootstrap tools to prevent rebuilding stdenv on each change - parallel = - (derivation { - name = "test-parallel-hook"; - system = stdenv.system; - builder = "${stdenv.bootstrapTools}/bin/bash"; - PATH = "${stdenv.bootstrapTools}/bin"; - args = [ - "-c" - '' - . ${../parallel.sh} - . ${./test-parallel.sh} - '' - ]; - }) - // { - meta = { }; - }; -} diff --git a/pkgs/build-support/setup-hooks/tests/test-parallel.sh b/pkgs/build-support/setup-hooks/tests/test-parallel.sh deleted file mode 100644 index 94e0fc6e8b73..000000000000 --- a/pkgs/build-support/setup-hooks/tests/test-parallel.sh +++ /dev/null @@ -1,146 +0,0 @@ -export NIX_BUILD_CORES=4 - -echo "Testing worker distribution..." - -# Generate 100 jobs to ensure all workers get some -for i in {1..100}; do - printf "job%d\0" $i -done | parallelRun sh -c ' - while IFS= read -r -d "" job; do - sleep 0.05 # Simulate some work - echo "Worker $$ processed $job" >> /tmp/worker-output - done -' - -# Check that all 4 workers were actually utilized -worker_count=$(sort /tmp/worker-output | cut -d" " -f2 | sort -u | wc -l) -if [ "$worker_count" -ne 4 ]; then - echo "ERROR: Expected exactly 4 workers, got $worker_count" - cat /tmp/worker-output - exit 1 -fi -echo "SUCCESS: All 4 workers participated" -rm -f /tmp/worker-output - -echo "Testing error propagation..." - -# Test that errors from workers are propagated -if printf "job1\0job2\0job3\0" | parallelRun sh -c ' - while IFS= read -r -d "" job; do - if [ "$job" = "job2" ]; then - echo "Worker failing on $job" >&2 - exit 1 - fi - echo "Worker processed $job" - done -' 2>/dev/null; then - echo "ERROR: Expected command to fail but it succeeded" - exit 1 -else - echo "SUCCESS: Error was properly propagated" -fi - -echo "Testing error message..." - -error_output=$(printf "job1\0job2\0job3\0" | parallelRun sh -c ' - while IFS= read -r -d "" job; do - if [ "$job" = "job2" ]; then - echo "Worker failing on $job" >&2 - exit 1 - fi - echo "Worker processed $job" - done -' 2>&1 || true) - -if [[ "$error_output" != *"job failed"* ]]; then - echo "ERROR: Expected 'job failed' in error message, got: $error_output" - exit 1 -fi -echo "SUCCESS: Error message was displayed" - -echo "Testing Verify all jobs are processed when no errors occur..." - -# Generate jobs and count processed ones -for i in {1..10}; do - printf "job%d\0" $i -done | parallelRun sh -c ' - while IFS= read -r -d "" job; do - echo "$job" >> /tmp/processed-jobs - done -' - -processed_count=$(wc -l < /tmp/processed-jobs) -if [ "$processed_count" -ne 10 ]; then - echo "ERROR: Expected 10 jobs processed, got $processed_count" - exit 1 -fi -echo "SUCCESS: All 10 jobs were processed" -rm -f /tmp/processed-jobs - -echo "All parallelRun tests passed!" - -# --------------------------------------------------------------------- - -echo "Testing parallelMap basic functionality..." - -# Define a test function -testFunc() { - echo "Processing: $1" >> /tmp/map-output -} - -# Test that parallelMap calls the function with each job -for i in {1..5}; do - printf "item%d\0" $i -done | parallelMap testFunc - -# Check all jobs were processed -processed_map_count=$(wc -l < /tmp/map-output) -if [ "$processed_map_count" -ne 5 ]; then - echo "ERROR: Expected 5 items processed by parallelMap, got $processed_map_count" - exit 1 -fi -echo "SUCCESS: parallelMap processed all 5 items" -rm -f /tmp/map-output - -echo "Testing parallelMap error propagation..." - -# Define a function that fails on specific input -failFunc() { - if [ "$1" = "item2" ]; then - echo "Function failing on $1" >&2 - exit 1 - fi - echo "Function processed $1" -} - -# Test that errors are propagated -if printf "item1\0item2\0item3\0" | parallelMap failFunc 2>/dev/null; then - echo "ERROR: Expected parallelMap to fail but it succeeded" - exit 1 -else - echo "SUCCESS: parallelMap error was properly propagated" -fi - -echo "Testing parallelMap with additional arguments..." - -# Define a function that uses additional arguments -argFunc() { - echo "$1: $2" >> /tmp/map-args-output -} - -# Test with additional arguments -for i in {1..3}; do - printf "value%d\0" $i -done | parallelMap argFunc "PREFIX" - -# Check output contains the prefix -if ! grep -q "PREFIX: value1" /tmp/map-args-output; then - echo "ERROR: parallelMap did not pass additional arguments correctly" - cat /tmp/map-args-output - exit 1 -fi -echo "SUCCESS: parallelMap passed additional arguments correctly" -rm -f /tmp/map-args-output - -echo "All parallelRun and parallelMap tests passed!" -touch $out diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 05c6cbecc6b5..809dc8e93555 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -671,8 +671,8 @@ rec { throw "linkFarm entries must be either attrs or a list!"; linkCommands = lib.mapAttrsToList (name: path: '' - mkdir -p "$(dirname ${lib.escapeShellArg "${name}"})" - ln -s ${lib.escapeShellArg "${path}"} ${lib.escapeShellArg "${name}"} + mkdir -p -- "$(dirname -- ${lib.escapeShellArg "${name}"})" + ln -s -- ${lib.escapeShellArg "${path}"} ${lib.escapeShellArg "${name}"} '') entries'; in runCommand name diff --git a/pkgs/build-support/trivial-builders/test/link-farm.nix b/pkgs/build-support/trivial-builders/test/link-farm.nix index f74aaa6667fd..b9b669741b9b 100644 --- a/pkgs/build-support/trivial-builders/test/link-farm.nix +++ b/pkgs/build-support/trivial-builders/test/link-farm.nix @@ -39,6 +39,11 @@ let linkFarmFromAttrs = linkFarm "linkFarmFromAttrs" { inherit foo hello; }; + + linkFarmDelimitOptionList = linkFarm "linkFarmDelimitOptionList" { + "-foo" = foo; + "-hello" = hello; + }; in runCommand "test-linkFarm" { } '' function assertPathEquals() { @@ -61,5 +66,9 @@ runCommand "test-linkFarm" { } '' assertPathEquals "${linkFarmFromAttrs}/foo" "${foo}" assertPathEquals "${linkFarmFromAttrs}/hello" "${hello}" + + assertPathEquals "${linkFarmDelimitOptionList}/-foo" "${foo}" + assertPathEquals "${linkFarmDelimitOptionList}/-hello" "${hello}" + touch $out '' diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index 0be8e12228e0..6a49d1a9525d 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "1oom"; - version = "1.11.6"; + version = "1.11.7"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "1oom-fork"; repo = "1oom"; tag = "v${finalAttrs.version}"; - hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA="; + hash = "sha256-pOEs3HQSxER0wUhasxQUyrktka8cRZCtNER0F01BRvk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix index dd3ad3086870..db9ebd426a55 100644 --- a/pkgs/by-name/ab/abctl/package.nix +++ b/pkgs/by-name/ab/abctl/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "abctl"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "airbytehq"; repo = "abctl"; tag = "v${version}"; - hash = "sha256-h2QojJH9pvFUv64hJimUhknurp3pStEZbZYrgqkfH68="; + hash = "sha256-tb0KBATOitgFN49gJVrctxPKjrFY7w6AdBa2AN+scBU="; }; checkFlags = @@ -33,7 +33,7 @@ buildGoModule rec { in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-CKku+zfU25LPQRuqsAQos3PX2bXUHEDQrD7sGeFnRKg="; + vendorHash = "sha256-ZJbZDfVB6gxToinuUNLsjBEB+7+OgC19Cc2Q8Ej7kfo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ab/ablog/package.nix b/pkgs/by-name/ab/ablog/package.nix index 10b604b697df..624519d60a04 100644 --- a/pkgs/by-name/ab/ablog/package.nix +++ b/pkgs/by-name/ab/ablog/package.nix @@ -39,13 +39,10 @@ python3Packages.buildPythonApplication rec { defusedxml ]; - pytestFlagsArray = [ - "-W" - "ignore::sphinx.deprecation.RemovedInSphinx90Warning" - "--rootdir" - "src/ablog" - "-W" - "ignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError + pytestFlags = [ + "-Wignore::sphinx.deprecation.RemovedInSphinx90Warning" + "--rootdir=src/ablog" + "-Wignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError ]; # assert "post 1" not in html diff --git a/pkgs/by-name/ab/abseil-cpp_202501/package.nix b/pkgs/by-name/ab/abseil-cpp_202501/package.nix index 0e7be335f957..5ab286f3d012 100644 --- a/pkgs/by-name/ab/abseil-cpp_202501/package.nix +++ b/pkgs/by-name/ab/abseil-cpp_202501/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abseil-cpp"; - version = "20250127.1"; + version = "20250512.1"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; tag = finalAttrs.version; - hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ="; + hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk="; }; cmakeFlags = diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index 9bee2fc45d33..f8fc46ad7551 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; tag = "v${version}"; - hash = "sha256-tC7Hpf9xCysraTtVC+mYE/DVNrG02lwLAlDiTeaWpY4="; + hash = "sha256-gXeQYNuhrlCEvvDQtQ07+nE/9gGzzEYPnEKMxWryLRI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix index 70a6eaa513aa..cdaf7a797c97 100644 --- a/pkgs/by-name/ad/adios2/package.nix +++ b/pkgs/by-name/ad/adios2/package.nix @@ -177,6 +177,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelChecking = false; + enabledTestPaths = [ + "../testing/adios2/python/Test*.py" + ]; + __darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck && mpiSupport; nativeCheckInputs = [ diff --git a/pkgs/by-name/ae/aemu/package.nix b/pkgs/by-name/ae/aemu/package.nix index 969ec27581df..910e5acae139 100644 --- a/pkgs/by-name/ae/aemu/package.nix +++ b/pkgs/by-name/ae/aemu/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "aemu"; version = "0.1.2"; src = fetchFromGitiles { url = "https://android.googlesource.com/platform/hardware/google/aemu"; - rev = "07ccc3ded3357e67e39104f18f35feaf8b3b6a0e"; - hash = "sha256-H3IU9aTFSzUAqYgrtHd4F18hbhZsbOJGC4K5JwMQOOw="; + rev = "v${finalAttrs.version}-aemu-release"; + hash = "sha256-8UMm2dXdvmX6rUn4wQWuqI8bamwgf0x/5BQT+7atzjY="; }; patches = [ @@ -48,4 +48,4 @@ stdenv.mkDerivation { "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/by-name/al/alsa-lib/package.nix b/pkgs/by-name/al/alsa-lib/package.nix index aa7fa40daba8..9615879f81f3 100644 --- a/pkgs/by-name/al/alsa-lib/package.nix +++ b/pkgs/by-name/al/alsa-lib/package.nix @@ -9,31 +9,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "alsa-lib"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { url = "mirror://alsa/lib/alsa-lib-${finalAttrs.version}.tar.bz2"; - hash = "sha256-jE/zdVPL6JYY4Yfkx3n3GpuyqLJ7kfh+1AmHzJIz2PY="; + hash = "sha256-vpyIoLNgQ2fddBZ6K3VKNeFC9nApKuR6L97yei7pejI="; }; - patches = - [ - # Add a "libs" field to the syntax recognized in the /etc/asound.conf file. - # The nixos modules for pulseaudio, jack, and pipewire are leveraging this - # "libs" field to declare locations for both native and 32bit plugins, in - # order to support apps with 32bit sound running on x86_64 architecture. - ./alsa-plugin-conf-multilib.patch - ] - ++ lib.optional (stdenv.hostPlatform.useLLVM or false) - # Fixes version script under LLVM, should be fixed in the next update. - # Check if "pkgsLLVM.alsa-lib" builds on next version bump and remove this - # if it succeeds. - ( - fetchurl { - url = "https://github.com/alsa-project/alsa-lib/commit/76edab4e595bd5f3f4c636cccc8d7976d3c519d6.patch"; - hash = "sha256-WCOXfe0/PPZRMXdNa29Jn28S2r0PQ7iTsabsxZVSwnk="; - } - ); + patches = [ + # Add a "libs" field to the syntax recognized in the /etc/asound.conf file. + # The nixos modules for pulseaudio, jack, and pipewire are leveraging this + # "libs" field to declare locations for both native and 32bit plugins, in + # order to support apps with 32bit sound running on x86_64 architecture. + ./alsa-plugin-conf-multilib.patch + ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 6bf362ef3e1f..8266e3596036 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -6,7 +6,7 @@ darwin, fetchFromGitHub, coreutils, - nettools, + net-tools, util-linux, stdenv, dmidecode, @@ -92,7 +92,7 @@ buildGoModule rec { substituteInPlace agent/platform/platform_unix.go \ --replace-fail "/usr/bin/uname" "${coreutils}/bin/uname" \ - --replace-fail '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ + --replace-fail '"/bin", "hostname"' '"${net-tools}/bin/hostname"' \ --replace-fail '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' substituteInPlace agent/session/shell/shell_unix.go \ diff --git a/pkgs/by-name/am/amf-headers/package.nix b/pkgs/by-name/am/amf-headers/package.nix index f7d25bd478f7..29d5dc1bf9ef 100644 --- a/pkgs/by-name/am/amf-headers/package.nix +++ b/pkgs/by-name/am/amf-headers/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; tag = "v${version}"; - sha256 = "sha256-u6gvdc1acemd01TO5EbuF3H7HkEJX4GUx73xCo71yPY="; + sha256 = "sha256-0PgWEq+329/EhI0/CgPsCkJ4CiTsFe56w2O+AcjVUdc="; }; installPhase = '' diff --git a/pkgs/by-name/ao/aonsoku/package.nix b/pkgs/by-name/ao/aonsoku/package.nix index 03fa9cc13a3d..b58573ad4aee 100644 --- a/pkgs/by-name/ao/aonsoku/package.nix +++ b/pkgs/by-name/ao/aonsoku/package.nix @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_8.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-h1rcM+H2c0lk7bpGeQT5ue9bQIggrCFHkj4o7KxnH08="; + fetcherVersion = 1; }; cargoRoot = "src-tauri"; diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index b4f9f5bb0f71..3dcf950f02c5 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -290,7 +290,7 @@ buildPythonPackage rec { airflow db reset -y ''; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/core/test_core.py" ]; diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix index efa453863614..5e657cf8f680 100644 --- a/pkgs/by-name/ap/apache-answer/package.nix +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -29,6 +29,7 @@ buildGoModule rec { inherit src version pname; sourceRoot = "${src.name}/ui"; hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index ada9a015e6c2..1ed8cfd79d64 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "0.29.2"; + version = "0.29.3"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-szUOl5nKrra7Vvyfcd60/Oy/QFiXZpGJR2gtw3lriKE="; + hash = "sha256-3BmWxHhpdkJ7Zyd+K+YS/u4cIiwPsNGaYNvb6ZrIaeQ="; # 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; @@ -79,7 +79,7 @@ buildGoModule (finalAttrs: { --zsh <(${apko}/bin/apko completion zsh) ''; - nativeCheckInstallInputs = [ versionCheckHook ]; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgramArg = "version"; diff --git a/pkgs/by-name/ap/aporetic-bin/package.nix b/pkgs/by-name/ap/aporetic-bin/package.nix index fe9d0b1753d2..a0b62ae3f690 100644 --- a/pkgs/by-name/ap/aporetic-bin/package.nix +++ b/pkgs/by-name/ap/aporetic-bin/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aporetic-bin"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "protesilaos"; repo = "aporetic"; tag = finalAttrs.version; - hash = "sha256-5lPViAo9SztOdds6HEmKJpT17tgcxmU/voXDffxTMDI="; + hash = "sha256-1BbuC/mWEcXJxzDppvsukhNtdOLz0QosD6QqI/93Khc="; }; installPhase = '' diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix index e21a2c7007ef..9c05714c594a 100644 --- a/pkgs/by-name/ap/aporetic/package.nix +++ b/pkgs/by-name/ap/aporetic/package.nix @@ -14,12 +14,12 @@ let "serif" ]; pname = "aporetic"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "protesilaos"; repo = "aporetic"; tag = version; - hash = "sha256-5lPViAo9SztOdds6HEmKJpT17tgcxmU/voXDffxTMDI="; + hash = "sha256-1BbuC/mWEcXJxzDppvsukhNtdOLz0QosD6QqI/93Khc="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; makeIosevkaFont = @@ -40,11 +40,11 @@ let src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; - tag = "v32.5.0"; - hash = "sha256-MzsAkq5l4TP19UJNPW/8hvIqsJd94pADrrv8wLG6NMQ="; + tag = "v33.2.2"; + hash = "sha256-dhMTcceHru/uLHRY4eWzFV+73ckCBBnDlizP3iY5w5w="; }; - npmDepsHash = "sha256-HeqwpZyHLHdMhd/UfXVBonMu+PhStrLCxAMuP/KuTT8="; + npmDepsHash = "sha256-5DcMV9N16pyQxRaK6RCoeghZqAvM5EY1jftceT/bP+o="; } ); }); diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index f3b884aa9b10..2199423a37be 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -59,9 +59,15 @@ 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 && !stdenv.hostPlatform.isMusl; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkInputs = [ bashInteractive perl diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index 47f6f512dd8a..acff817af09b 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -53,7 +53,8 @@ useStaticLibuvc ? true, useStaticOpenAL ? true, useStaticSqlite ? true, - useTracy ? true, + # For debugging only, disabled by upstream + useTracy ? false, # Configurable options sources ? callPackage ./sources.nix { }, }: diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix index 3d36652a968a..34961c75eb1b 100644 --- a/pkgs/by-name/ar/argo-workflows/package.nix +++ b/pkgs/by-name/ar/argo-workflows/package.nix @@ -7,35 +7,6 @@ pkgsBuildBuild, }: -let - # Argo can package a static server in the CLI using the `staticfiles` go module. - # We build the CLI without the static server for simplicity, but the tool is still required for - # compilation to succeed. - # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117 - staticfiles = pkgsBuildBuild.buildGoModule { - name = "staticfiles"; - - src = fetchFromGitHub { - owner = "bouk"; - repo = "staticfiles"; - rev = "827d7f6389cd410d0aa3f3d472a4838557bf53dd"; - hash = "sha256-wchj5KjhTmhc4XVW0sRFCcyx5W9am8TNAIhej3WFWXU="; - }; - - vendorHash = null; - - excludedPackages = [ "./example" ]; - - preBuild = '' - cp ${./staticfiles.go.mod} go.mod - ''; - - ldflags = [ - "-s" - "-w" - ]; - }; -in buildGoModule rec { pname = "argo-workflows"; version = "3.6.10"; @@ -59,13 +30,6 @@ buildGoModule rec { installShellFiles ]; - preBuild = '' - mkdir -p ui/dist/app - echo "Built without static files" > ui/dist/app/index.html - - ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app - ''; - ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix index e172edac1b11..64c9a3f1fcc9 100644 --- a/pkgs/by-name/ar/arouteserver/package.nix +++ b/pkgs/by-name/ar/arouteserver/package.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonPackage rec { "pierky.arouteserver" ]; - pytestFlagsArray = [ "tests/static" ]; + enabledTestPaths = [ "tests/static" ]; disabledTests = [ # disable copyright year check of files diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix index 4c1507a9f793..d0d94f2afa1c 100644 --- a/pkgs/by-name/ar/artalk/package.nix +++ b/pkgs/by-name/ar/artalk/package.nix @@ -34,6 +34,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-QIfadS2gNPtH006O86EndY/Hx2ml2FoKfUXJF5qoluw="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 4f96e607fc1b..c1d467284a0e 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { prePnpmInstall ; hash = "sha256-tlpk+wbLjJqt37lu67p2A2RZAR1ZfnZFiYoqIQwvWPQ="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 261e63193d29..b9f1d8300afd 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2025-07-08"; + version = "0-unstable-2025-07-11"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "07147da79388468ff85c2a650500d11ca0edd12e"; - hash = "sha256-pHsHcWQWGyzDh48YHnSw9YVKEnQ95QWnmHNFtvo7iu0="; + rev = "24fad0622fc9404c69e83bab7738359c5be4988e"; + hash = "sha256-5TomR72rn4q+5poQcN6EnanxeXKqJSqWVAoDAFN0lUc="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { buildInputs = lib.optional needNixInclude nix ++ [ boost ]; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; - cargoHash = "sha256-I5GS32dOCECYKSNMi2Xs2rBRxPLcvLEWHlIIWP/bMBU="; + cargoHash = "sha256-NdzwYnD0yMEI2RZwwXl/evYx9zdBVMOUee+V7uq1cf0="; useFetchCargoVendor = true; env = { diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 4af825176f8c..0b924019b56b 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "f3f5f3b9bd540d311a6ab0a99b9317a5142755ea", - "hash": "sha256-tymJLs0gucJX0n0helxAkCrifG4uWcxaEBpgK7uVG2c=", - "version": "2.25.1", - "depsHash": "sha256-JFoE4jNyIfdk/uhhbdP3flcNRus8FvwRNrs+hf4YJ5E=", - "clientDepsHash": "sha256-s8fybUu3hJozX57RfsxBSy09QjOiVGO4vg7woOEqMi4=" + "rev": "264ae928a9c1af620487488110eec816b14e23ec", + "hash": "sha256-QNzQY5+tHzMopvJJw3ihb+x203wNnvIRbyyFNESN0Bk=", + "version": "2.26.0", + "depsHash": "sha256-rbe0EAGK2t3KkTaNie9psiFcA4EVooPDQzQclgW9R6k=", + "clientDepsHash": "sha256-yrTkVDFsf8o3QVtRAiy6rS3UZO2vxvBIoh2RsAmVp18=" } diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index 0ad9ac9f055a..62732842d66a 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoreconfHook, bash, buildPackages, @@ -9,23 +10,44 @@ python3, swig, pkgsCross, + libcap_ng, # 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, + nix-update-script, + testers, }: stdenv.mkDerivation (finalAttrs: { pname = "audit"; - version = "4.0.3"; + version = "4.0.5"; src = fetchFromGitHub { owner = "linux-audit"; repo = "audit-userspace"; tag = "v${finalAttrs.version}"; - hash = "sha256-+M5Nai/ruK16udsHcMwv1YoVQbCLKNuz/4FCXaLbiCw="; + hash = "sha256-SgMt1MmcH7r7O6bmJCetRg3IdoZXAXjVJyeu0HRfyf8="; }; + patches = [ + # nix configures most stuff by symlinks, e.g. in /etc + # thus, for plugins to be picked up, symlinks must be allowed + # https://github.com/linux-audit/audit-userspace/pull/467 + (fetchpatch { + url = "https://github.com/linux-audit/audit-userspace/pull/467/commits/dbefc642b3bd0cafe599fcd18c6c88cb672397ee.patch?full_index=1"; + hash = "sha256-Ksn/qKBQYFAjvs1OVuWhgWCdf4Bdp9/a+MrhyJAT+Bw="; + }) + (fetchpatch { + url = "https://github.com/linux-audit/audit-userspace/pull/467/commits/50094f56fefc0b9033ef65e8c4f108ed52ef5de5.patch?full_index=1"; + hash = "sha256-CJKDLdlpsCd+bG6j5agcnxY1+vMCImHwHGN6BXURa4c="; + }) + (fetchpatch { + url = "https://github.com/linux-audit/audit-userspace/pull/467/commits/5e75091abd297807b71b3cfe54345c2ef223939a.patch?full_index=1"; + hash = "sha256-LPpO4PH/3MyCJq2xhmhhcnFeK3yh7LK6Mjypuvhacu4="; + }) + ]; + postPatch = '' substituteInPlace bindings/swig/src/auditswig.i \ --replace-fail "/usr/include/linux/audit.h" \ @@ -57,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bash + libcap_ng ]; configureFlags = [ @@ -65,13 +88,20 @@ stdenv.mkDerivation (finalAttrs: { "--disable-zos-remote" "--with-arm" "--with-aarch64" + # 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") ]; enableParallelBuilding = true; - passthru.tests = { - musl = pkgsCross.musl64.audit; + passthru = { + updateScript = nix-update-script { }; + tests = { + musl = pkgsCross.musl64.audit; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; }; meta = { @@ -79,7 +109,11 @@ stdenv.mkDerivation (finalAttrs: { description = "Audit Library"; changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ grimmauld ]; + pkgConfigModules = [ + "audit" + "auparse" + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py index 3426752fa55a..bf8882818dd9 100644 --- a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py +++ b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py @@ -42,6 +42,13 @@ def is_dynamic_executable(elf: ELFFile) -> bool: # section but their ELF type is DYN. return bool(elf.get_section_by_name(".interp")) +def is_separate_debug_object(elf: ELFFile) -> bool: + # objects created by separateDebugInfo = true have all the section headers + # of the unstripped objects but those that normal `strip` would have kept + # are NOBITS + text_section = elf.get_section_by_name(".text") + return elf.has_dwarf_info() and bool(text_section) and text_section.header['sh_type'] == "SHT_NOBITS" + def get_dependencies(elf: ELFFile) -> list[list[Path]]: dependencies = [] @@ -174,6 +181,10 @@ def populate_cache(initial: list[Path], recursive: bool =False) -> None: try: with open_elf(path) as elf: + if is_separate_debug_object(elf): + print(f"skipping {path} because it looks like a separate debug object") + continue + osabi = get_osabi(elf) arch = get_arch(elf) rpath = [Path(p) for p in get_rpath(elf) diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index ba8eeade0a0f..b545937a1ddc 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -41,6 +41,7 @@ let sourceRoot ; hash = "sha256-TbdRJqLdNI7wchUsx2Kw1LlDyv50XlCiKyn6rhZyN1U="; + fetcherVersion = 1; }; postBuild = '' diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix index 3713dd359c3d..31662f322b7e 100644 --- a/pkgs/by-name/au/autoprefixer/package.nix +++ b/pkgs/by-name/au/autoprefixer/package.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-zb/BwL//i0oly5HEXN20E3RzZXdaOn+G2yIWRas3PB4="; + fetcherVersion = 1; }; installPhase = '' diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix index b095f7d06174..f4e979b04bd5 100644 --- a/pkgs/by-name/au/autotiling-rs/package.nix +++ b/pkgs/by-name/au/autotiling-rs/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "autotiling-rs"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "ammgws"; repo = "autotiling-rs"; rev = "v${version}"; - sha256 = "sha256-rihNlKaESxIEQ61FP6PzIg82yuwQ/R4GX5BA0Ss+I5w="; + sha256 = "sha256-S/6LRQTHdPGZkmbTAb0ufNoXE1nD+rIQ2ASJ8jjFS3E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mXuI+kA8J2Bhli6HiX9h72i61cRbByKJQtUHHjCUza8="; + cargoHash = "sha256-riQ1nOs4fBj9y/jK0nS7Y85vMejLrKrEJzNnsQKkoeg="; meta = with lib; { description = "Autotiling for sway (and possibly i3)"; diff --git a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix index 675645240b43..fd486d0344d4 100644 --- a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix @@ -60,9 +60,8 @@ localPython.pkgs.buildPythonApplication rec { ]; # Upstream did not adapt to pytest 8 yet. - pytestFlagsArray = [ - "-W" - "ignore::pytest.PytestRemovedIn8Warning" + pytestFlags = [ + "-Wignore::pytest.PytestRemovedIn8Warning" ]; passthru = { diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 3dffaa6bd48b..18473f29f191 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -145,7 +145,7 @@ py.pkgs.buildPythonApplication rec { # tests/unit/customizations/sso/test_utils.py uses sockets __darwinAllowLocalNetworking = true; - pytestFlagsArray = [ + pytestFlags = [ "-Wignore::DeprecationWarning" ]; diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 59f5df5813a0..cd036c790fa6 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -25,14 +25,14 @@ in python.pkgs.buildPythonApplication rec { pname = "awsebcli"; - version = "3.24.1"; + version = "3.25"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; tag = version; - hash = "sha256-t6dqiC9zY3Apcc4F/x5c/QhsNKGBZxIY20a50wCEER8="; + hash = "sha256-RqUVG4aIZDAVuKcT41ODKkyEidmschcFaY24P1CjosU="; }; pythonRelaxDeps = [ @@ -70,7 +70,7 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/unit" ]; diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 760cd77ed852..55f1a97532d8 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -34,6 +34,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-q7VMQb/FRT953yT2cyGMxUPp8p8XkA9mvqGI7S7Eifg="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 7257b7a1f881..2cd18243b106 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,13 +16,13 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.29.5"; + version = "1.30.1"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-fD7A37G1kr7sWfwI8GXOm1cOlpnTSE9tN/WzotM8BeQ="; + hash = "sha256-YPjeiRg7vIpb9k32og6byWMk+EfhDS9MwfJveAndbQQ="; }; npmDepsHash = "sha256-aJte4ApeXJQ9EYn87Uo+Xx7s+wi80I1JsZHeqklHGs4="; diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index 49e85c9f6661..f03d0195e32c 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces ; hash = "sha256-NvyqPv5OKgZi3hW98Da8LhsYatmrzrPX8kLOfLr+BrI="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bc/bcal/package.nix b/pkgs/by-name/bc/bcal/package.nix index 20e29c252b8c..d832900dde35 100644 --- a/pkgs/by-name/bc/bcal/package.nix +++ b/pkgs/by-name/bc/bcal/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { python3Packages.pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; meta = with lib; { description = "Storage conversion and expression calculator"; diff --git a/pkgs/by-name/bf/bfscripts/package.nix b/pkgs/by-name/bf/bfscripts/package.nix index 65be3bf4cdb6..80bc09cc4a38 100644 --- a/pkgs/by-name/bf/bfscripts/package.nix +++ b/pkgs/by-name/bf/bfscripts/package.nix @@ -1,8 +1,10 @@ { - stdenv, fetchFromGitHub, + git, lib, python3, + rpm, + stdenv, }: let @@ -36,19 +38,24 @@ let in stdenv.mkDerivation { pname = "bfscripts"; - version = "unstable-2023-05-15"; + version = "unstable-2025-06-27"; src = fetchFromGitHub { owner = "Mellanox"; repo = "bfscripts"; - rev = "1da79f3ece7cdf99b2571c00e8b14d2e112504a4"; - hash = "sha256-pTubrnZKEFmtAj/omycFYeYwrCog39zBDEszoCrsQNQ="; + rev = "ed8ede79fa002a2d83719a1bef6fbe0f7dcf37a4"; + hash = "sha256-x+hpH6D5HTl39zD0vYj6wRFw881M4AcfM+ePcgXMst8="; }; buildInputs = [ python3 ]; + nativeBuildInputs = [ + git + rpm + ]; + installPhase = '' ${lib.concatStringsSep "\n" (map (b: "install -D ${b} $out/bin/${b}") binaries)} ''; @@ -58,6 +65,9 @@ stdenv.mkDerivation { homepage = "https://github.com/Mellanox/bfscripts"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ nikstur ]; + maintainers = with maintainers; [ + nikstur + thillux + ]; }; } diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix index 0eacc0f08141..82fb412451be 100644 --- a/pkgs/by-name/bl/bluez/package.nix +++ b/pkgs/by-name/bl/bluez/package.nix @@ -13,7 +13,6 @@ pkg-config, python3Packages, readline, - systemdMinimal, udev, # Test gobject-introspection instead of pygobject because the latter # causes an infinite recursion. @@ -28,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bluez"; - version = "5.80"; + version = "5.83"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz"; - hash = "sha256-pNC8oymWkfBtW9l3O4VGOCBKUaUCbEKwrX8cbPFrRZo="; + hash = "sha256-EIUi2QnSIFgTmb/sk9qrYgNVOc7vPdo+eZcHhcY70kw="; }; buildInputs = [ @@ -63,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace tools/hid2hci.rules \ - --replace-fail /sbin/udevadm ${systemdMinimal}/bin/udevadm \ + --replace-fail /sbin/udevadm ${udev}/bin/udevadm \ --replace-fail "hid2hci " "$out/lib/udev/hid2hci " '' + diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 6312e990bb95..d84d16e05577 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20250308"; + version = "20250528"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-I4jZ+xhldmM6pyX/FjVSpdunpqN1qMuakBSrV+59maI="; + hash = "sha256-DcOJpeApiqWFNTtgeW1dYy3mYNreWNAKzWCtcihGyaM="; }; patches = [ diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix index afcc6d71902d..aa301a94b4c5 100644 --- a/pkgs/by-name/bo/borgbackup/package.nix +++ b/pkgs/by-name/bo/borgbackup/package.nix @@ -101,7 +101,7 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook ]; - pytestFlagsArray = [ + pytestFlags = [ "--benchmark-skip" "--pyargs" "borg.testsuite" diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix index 107f83f60bed..a9683c07e1b9 100644 --- a/pkgs/by-name/bo/boxflat/package.nix +++ b/pkgs/by-name/bo/boxflat/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonPackage rec { pname = "boxflat"; - version = "1.32.1"; + version = "1.33.0"; pyproject = true; src = fetchFromGitHub { owner = "Lawstorant"; repo = "boxflat"; tag = "v${version}"; - hash = "sha256-G+jLVFyBTy5DiWe8RM80eWnmnEunfHC+awduJjmGop0="; + hash = "sha256-efEEp2FDXrMrNFalwqNiOhSgQq3uFHNJEA+o34yiS5E="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/br/browsr/package.nix b/pkgs/by-name/br/browsr/package.nix index f5044812fd43..7cef53974cd7 100644 --- a/pkgs/by-name/br/browsr/package.nix +++ b/pkgs/by-name/br/browsr/package.nix @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication rec { "browsr" ]; - pytestFlagsArray = [ + pytestFlags = [ "--snapshot-update" ]; diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix index 5d2fa7757192..d53271a7d9d2 100644 --- a/pkgs/by-name/bt/btrfs-progs/package.nix +++ b/pkgs/by-name/bt/btrfs-progs/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.14"; + version = "6.15"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-31q4BPyzbikcQq2DYfgBrR4QJBtDvTBP5Qzj355+PaE="; + hash = "sha256-V9pCjdIZn9iNg+zxytBWeM54ZA735S12M76Yh872dLs="; }; nativeBuildInputs = diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index b5bf7fd05713..0ca381100788 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -90,7 +90,6 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ jk lrewega - aaronjheng ]; mainProgram = "buf"; }; diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index b557e8f14eb8..3b05d5a65df2 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-duxpym1DlJM4q5j0wmrubYiAHQ3cDEFfeD9Gyic6mbI="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix index 866d548412f7..0ff9953cdc89 100644 --- a/pkgs/by-name/ca/cacert/package.nix +++ b/pkgs/by-name/ca/cacert/package.nix @@ -23,7 +23,7 @@ let lib.concatStringsSep "\n\n" extraCertificateStrings ); - srcVersion = "3.111"; + srcVersion = "3.113.1"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -47,7 +47,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM"; - hash = "sha256-GFtoSvLF5nAwBIiMa9CeEl5geAOK60gG2tjuQFubgYs="; + hash = "sha256-Yfs9Hh98ASJe1D4qyQEXaTC2xjeDI2Cdxp5Xgy0rYdQ="; }; dontBuild = true; diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix index 1d96951ac59c..5fc6bd6f0319 100644 --- a/pkgs/by-name/ca/cairo/package.nix +++ b/pkgs/by-name/ca/cairo/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - fetchpatch, + lzo, gtk-doc, meson, ninja, @@ -34,13 +34,13 @@ stdenv.mkDerivation ( in { pname = "cairo"; - version = "1.18.2"; + version = "1.18.4"; src = fetchurl { url = "https://cairographics.org/${ if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots" }/${pname}-${version}.tar.xz"; - hash = "sha256-piubtCQl6ETMPW3d4EP/Odur7dFULrpXout5+FiJ1Fo="; + hash = "sha256-RF7YIIpuSCPeEianTKMZ02AOg/Y2n5mxQmUAZZnDLMs="; }; outputs = [ @@ -61,16 +61,7 @@ stdenv.mkDerivation ( buildInputs = [ docbook_xsl - ]; - - patches = [ - # Pull upstream fix to fix "out of memory" errors: - # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/595 - (fetchpatch { - name = "fix-oom.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/b9eed915f9a67380e7ef9d8746656455c43f67e2.patch"; - hash = "sha256-iWYxMVeNpseClSTf7BfU9GBe+tJWc+DUJWTWE5MnGh4="; - }) + lzo ]; propagatedBuildInputs = diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix index 646df7c9a87b..193f1dccee04 100644 --- a/pkgs/by-name/ca/capnproto/package.nix +++ b/pkgs/by-name/ca/capnproto/package.nix @@ -30,14 +30,14 @@ in # See: https://gerrit.lix.systems/c/lix/+/1874 clangStdenv.mkDerivation rec { pname = "capnproto"; - version = "1.1.0"; + version = "1.2.0"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - hash = "sha256-gxkko7LFyJNlxpTS+CWOd/p9x/778/kNIXfpDGiKM2A="; + hash = "sha256-aDcn4bLZGq8915/NPPQsN5Jv8FRWd8cAspkG3078psc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index 5db84ae41b5e..e23b255a9921 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/pkgs/by-name/ca/cargo-deb/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "kornelski"; repo = "cargo-deb"; rev = "v${version}"; - hash = "sha256-2HHxGpp/N8QDytOsiWh8nkYNbWhThjisjnyI3B8+XYo="; + hash = "sha256-MvuwvJUPI+UBw9oEVYtjWjPCHUEBJE3L5+EEwBROwQ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hHZt4mRLpeXj1XWJ6v0pBDO0NpFDn0BT2oLgT2yZlm0="; + cargoHash = "sha256-k6mghoRWaKfHzT8YM2ZylJSLDIf005gRL64qqGwo2qw="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index 2f5401e4e4cf..af0c230af635 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ; hash = "sha256-plANa/+9YEQ4ipgdQ7QzPyxgz6eDCBhO7qFlxK6Ab58="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/castero/package.nix b/pkgs/by-name/ca/castero/package.nix index bc1d84690fb0..f7d289e1707f 100644 --- a/pkgs/by-name/ca/castero/package.nix +++ b/pkgs/by-name/ca/castero/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests" ]; diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix index bcca4ac226ed..3fa6ec4c0a45 100644 --- a/pkgs/by-name/cd/cdxgen/package.nix +++ b/pkgs/by-name/cd/cdxgen/package.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-7NrDYd4H0cPQs8w4lWlB0BhqcYZVo6/9zf0ujPjBzsE="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index d7385f7773a5..6989a3864a42 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -112,7 +112,7 @@ python.pkgs.buildPythonApplication rec { writableTmpDirAsHomeHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTests = [ # Relies upon the `charm` tool being installed diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index e46832638e35..26aa0f71ad04 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-06-26"; + version = "0.4.0-unstable-2025-07-03"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "a9932a43c22f489951335e194b2b2b9b97028b44"; - hash = "sha256-ckC0KYk+Ezr8ftWutbvBWNicJldY4OzRyN+kno8Z2Fw="; + rev = "1f2beb0c7cfa53340a7f38c03d4c8f99bf052643"; + hash = "sha256-WGhS4VUeRwi/iBG2ZVXNyKEng9V6qOoI51Ak8PYljJk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix index ac76a738d6a8..9de8221091bd 100644 --- a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix +++ b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "chirpstack-udp-forwarder"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-udp-forwarder"; rev = "v${version}"; - hash = "sha256-7xB85IOwOZ6cifw2TFWzNGNMPl8Pc9seqpSJdWdzStM="; + hash = "sha256-BCflOG9v+tW5o0b/hZqlcg1BA+V/lpNzr3fJ9eg6qeY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ECq6Gfn52ZjS48h479XgTQnZHYSjnJK/T9j5NTlcxz4="; + cargoHash = "sha256-2XTb9Wv61as7XhNMjJeryVq8nY835AxiONJjapdgCAw="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 73175713bbe9..3f56672f23ae 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; + # with trivialautovarinit enabled can produce an empty .pc file + hardeningDisable = [ "trivialautovarinit" ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_EXAMPLES" withExamples) (lib.cmakeBool "BUILD_TOOLS" withTools) diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 5c4f49447278..42c311251c50 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -38,6 +38,7 @@ rustPlatform.buildRustPackage { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = pnpm-hash; + fetcherVersion = 1; }; env = { diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 0ef129331cb8..7c5f35c295f2 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,14 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.48" + "@anthropic-ai/claude-code": "^1.0.51" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.48", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.48.tgz", - "integrity": "sha512-h63VBAZZ6Pl/DlYW2PjbfUeicZ4r9VSl8dymD3d+1lZEHwCPgfMpu3g+30+FDMs79Xqc7qSDm6CRnMApxhbjqw==", - "hasInstallScript": true, + "version": "1.0.51", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.51.tgz", + "integrity": "sha512-annBc4ez7nDPbp+di6bjIQGiAdmdVln4k3gAYioym2MxOEl3py5s7SsoR+dNSmfgfIHUdKBTbtXnXD5rkmO5aA==", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 015b0e958c29..0368b3fc3a5c 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.48"; + version = "1.0.51"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-nl7NGiREuFpbr0if273FfbSpjD/BG8a/uMXfYtiZgbE="; + hash = "sha256-sAILRsi8ZViMfcpqykfnFQzHTJHRwRSZz45otMqa4U0="; }; - npmDepsHash = "sha256-ppsyT+VXXaIP1ncuJx1I8M6eLTk7zP1KStf5nnWSwSo="; + npmDepsHash = "sha256-r/Na3lU7YQ8W5PUuL5EfPu1a/Rz6hBLw/9XmSrKHD1o="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix index 296576174eae..c390fd8ac046 100644 --- a/pkgs/by-name/cl/clickhouse-backup/package.nix +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.6.24"; + version = "2.6.26"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-KpCucAG2t2+HyDLCkc838k07QqWTC57Oolp9CAxTQiY="; + hash = "sha256-CdDzIKCtOE8Q7I6YhMIi4oyjo5rnYrySvzbpcdgQH6s="; }; - vendorHash = "sha256-ynXS0owzBBIPzSma/nhY/cX/gSL6nQ+/KmMYY16NloU="; + vendorHash = "sha256-Vqudi7sl9VTWo4g+74qh9sMUOGd9OpNDlzimEPm/EtU="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 725e38a37160..8b884edea82f 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -16,20 +16,20 @@ let sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/linux/x64/Cursor-1.2.1-x86_64.AppImage"; - hash = "sha256-2rOs5+85crKO/N9dCQLFfUXTfP9JVVR1s/g0bK2E78s="; + url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/linux/x64/Cursor-1.2.2-x86_64.AppImage"; + hash = "sha256-mQr1QMw4wP+kHvE9RWPkCKtHObbr0jpyOxNw3LfTPfc="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/linux/arm64/Cursor-1.2.1-aarch64.AppImage"; - hash = "sha256-Otg+NyW1DmrqIb0xqZCfJ4ys61/DBOQNgaAR8PMOCfg="; + url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/linux/arm64/Cursor-1.2.2-aarch64.AppImage"; + hash = "sha256-EGvm/VW+NDTmOB1o2j3dpq4ckWbroFWEbF9Pezr8SZQ="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-Rh1erFG7UtGwO1NaM5+tq17mI5WdIX750pIzeO9AK+Q="; + url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-IDJklB8wMfrPpc2SO02iVBBE9d7fLN7JotVpPyCQkyE="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-k/j3hJnHIdtfK9+T0aq2gFkRM+JulDt4FpU7n4HGEYM="; + url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-GxiNf58Kf5/l01eBhXRWMLMxAnj1txDQwSe5ei6nTgg="; }; }; @@ -39,7 +39,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = finalCommandLineArgs; - version = "1.2.1"; + version = "1.2.2"; pname = "cursor"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/co/codipack/package.nix b/pkgs/by-name/co/codipack/package.nix index 3f1a717a507c..675ec508b7c4 100644 --- a/pkgs/by-name/co/codipack/package.nix +++ b/pkgs/by-name/co/codipack/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "codipack"; - version = "2.3.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "SciCompKL"; repo = "CoDiPack"; tag = "v${finalAttrs.version}"; - hash = "sha256-feYtPDV0t7b49NIL5s6ZoBttRG2Bkwc0gOX6R6xDIbs="; + hash = "sha256-dGzLPU8YOrBdXPwUnEElqfxzbUdkAQxtv2+7+itNsyI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/comic-neue/package.nix b/pkgs/by-name/co/comic-neue/package.nix index 0926f184ecef..32cfe6cb13a8 100644 --- a/pkgs/by-name/co/comic-neue/package.nix +++ b/pkgs/by-name/co/comic-neue/package.nix @@ -9,21 +9,20 @@ stdenv.mkDerivation rec { version = "2.51"; src = fetchzip { - url = "http://comicneue.com/${pname}-${version}.zip"; - sha256 = "sha256-DjRZtFnJOtZnxhfpgU5ihZFAonRK608/BQztCAExIU0="; - stripRoot = false; # because it comes with a __MACOSX directory + url = "https://github.com/crozynski/comicneue/releases/download/${version}/comicneue-master.zip"; + hash = "sha256-Xkw+Yd36ffptKsS8RSEP9BPX6eQI7TZn2NgU49rdo80="; }; installPhase = '' mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} - cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/ - cp -v ${pname}-${version}/Booklet-ComicNeue.pdf $out/share/doc/ - cp -v ${pname}-${version}/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype - cp -v ${pname}-${version}/OTF/ComicNeue/*.otf $out/share/fonts/opentype - cp -v ${pname}-${version}/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype - cp -v ${pname}-${version}/TTF/ComicNeue/*.ttf $out/share/fonts/truetype - cp -v ${pname}-${version}/WebFonts/*.woff $out/share/fonts/WOFF - cp -v ${pname}-${version}/WebFonts/*.woff2 $out/share/fonts/WOFF2 + cp -v {FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/ + cp -v Booklet-ComicNeue.pdf $out/share/doc/ + cp -v Fonts/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype + cp -v Fonts/OTF/ComicNeue/*.otf $out/share/fonts/opentype + cp -v Fonts/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype + cp -v Fonts/TTF/ComicNeue/*.ttf $out/share/fonts/truetype + cp -v Fonts/WebFonts/*.woff $out/share/fonts/WOFF + cp -v Fonts/WebFonts/*.woff2 $out/share/fonts/WOFF2 ''; meta = with lib; { diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix index 7e79b6eb89be..8111f49b7816 100644 --- a/pkgs/by-name/co/comma/package.nix +++ b/pkgs/by-name/co/comma/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-EP1UGmoPXeyJY1mk3c4DNF6/HkjqlwKf5ZLhjNa1WMo="; + hash = "sha256-Q9s3z/FqkEqCQyvYhH07qlITGGlA8quZcYsK3lO8M8g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-GEHvS4hDBKqSquRmGZ9LMIFsX8MGqOqPZVf0aAzMmmI="; + cargoHash = "sha256-yNx0Sc2JnEfndBBPxaeNMWsdWpB9fAUqXUPVNR+NOrM="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/co/concurrently/package.nix b/pkgs/by-name/co/concurrently/package.nix index f6b3a6166be0..b89146d333c9 100644 --- a/pkgs/by-name/co/concurrently/package.nix +++ b/pkgs/by-name/co/concurrently/package.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { patches ; hash = "sha256-F1teWIABkK0mqZcK3RdGNKmexI/C59QWSrrD1jYbHt0="; + fetcherVersion = 1; }; patches = [ diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index f6bbfd31edd5..7e3ff087f355 100644 --- a/pkgs/by-name/co/copybara/package.nix +++ b/pkgs/by-name/co/copybara/package.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "copybara"; - version = "20250630"; + version = "20250714"; src = fetchurl { url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; - hash = "sha256-eXvFPzlQT3sVcXi+b6ze/3Llnv9T0S2cELdDbyHJ6Yg="; + hash = "sha256-pvJnBMuTJb4juJBJObpA9hP2Fw42IssdAARUGUuEgJo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix index 109b6ac2ec76..9ec093cf4084 100644 --- a/pkgs/by-name/co/coredns/package.nix +++ b/pkgs/by-name/co/coredns/package.nix @@ -6,21 +6,21 @@ installShellFiles, nixosTests, externalPlugins ? [ ], - vendorHash ? "sha256-mp+0/DQTNsgAZTnLqcQq1HVLAfKr5vUGYSZlIvM7KpE=", + vendorHash ? "sha256-Es3xy8NVDo7Xgu32jJa4lhYWGa5hJnRyDKFYQqB3aBY=", }: let attrsToSources = attrs: builtins.map ({ repo, version, ... }: "${repo}@${version}") attrs; in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "coredns"; - version = "1.11.3"; + version = "1.12.2"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; - rev = "v${version}"; - sha256 = "sha256-8LZMS1rAqEZ8k1IWSRkQ2O650oqHLP0P31T8oUeE4fw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-P4GhWrEACR1ZhNhGAoXWvNXYlpwnm2dz6Ggqv72zYog="; }; inherit vendorHash; @@ -95,16 +95,17 @@ buildGoModule rec { postPatch = '' substituteInPlace test/file_cname_proxy_test.go \ - --replace "TestZoneExternalCNAMELookupWithProxy" \ - "SkipZoneExternalCNAMELookupWithProxy" + --replace-fail \ + "TestZoneExternalCNAMELookupWithProxy" \ + "SkipZoneExternalCNAMELookupWithProxy" substituteInPlace test/readme_test.go \ - --replace "TestReadme" "SkipReadme" + --replace-fail "TestReadme" "SkipReadme" # this test fails if any external plugins were imported. # it's a lint rather than a test of functionality, so it's safe to disable. substituteInPlace test/presubmit_test.go \ - --replace "TestImportOrdering" "SkipImportOrdering" + --replace-fail "TestImportOrdering" "SkipImportOrdering" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # loopback interface is lo0 on macos @@ -112,9 +113,11 @@ buildGoModule rec { # test is apparently outdated but only exhibits this on darwin substituteInPlace test/corefile_test.go \ - --replace "TestCorefile1" "SkipCorefile1" + --replace-fail "TestCorefile1" "SkipCorefile1" ''; + __darwinAllowLocalNetworking = true; + postInstall = '' installManPage man/* ''; @@ -124,15 +127,16 @@ buildGoModule rec { kubernetes-multi-node = nixosTests.kubernetes.dns-multi-node; }; - meta = with lib; { + meta = { homepage = "https://coredns.io"; description = "DNS server that runs middleware"; mainProgram = "coredns"; - license = licenses.asl20; - maintainers = with maintainers; [ - rushmorem - rtreffer + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ deltaevo + djds + rtreffer + rushmorem ]; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 415f168dd5b4..ebcf0db9586e 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, rustPlatform, libcosmicAppHook, just, @@ -32,6 +33,14 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; cargoHash = "sha256-wWs3B5hh2DP93i+4gGDTi+7NT4bj8ULJ+fT95sXxUdg="; + patches = [ + (fetchpatch2 { + name = "fix-bluetooth-dbus-spam.patch"; + url = "https://github.com/pop-os/cosmic-applets/commit/b6bb982f2dace0a3d19c78b4b4247760a8010d5b.patch?full_index=1"; + hash = "sha256-S5F9rqYrB38T9R6i/n/j3s79Xeh6BMmNkC+E2kTsus4="; + }) + ]; + nativeBuildInputs = [ just pkg-config diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index 9bcdedb354f8..265dead86b3a 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -117,10 +117,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "http://cppcheck.sourceforge.net"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - joachifm - paveloom - ]; + maintainers = with lib.maintainers; [ joachifm ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 76022e1a95c1..36f4ad91c1f8 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-06-10"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "39ea79a3c132f4e678695c579ea9353d2bd29968"; - hash = "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg="; + rev = "d7427551d6531037da216d20cd36feb19ed4905f"; + hash = "sha256-gJgvE3823NyVOIL0Grkldde3U/N9NNqlLAA0btj3TSg="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/cr/credslayer/package.nix b/pkgs/by-name/cr/credslayer/package.nix index 62c16cfdde7e..1c03283d7737 100644 --- a/pkgs/by-name/cr/credslayer/package.nix +++ b/pkgs/by-name/cr/credslayer/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { wireshark-cli ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/tests.py" ]; diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index 53e5b50e475a..4ea3c37c46db 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-06-26"; + version = "0-unstable-2025-07-02"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "4c8cd6ddfd940a1f61178bb469a2bb7274bc07b1"; - hash = "sha256-6Io0Vj5QG6BwAlcgB0KyQlsRU3Z/elvd1oXt2w+hgBM="; + rev = "0435ecd305e4a4f9f4110cfe7d94a6ff906d2f5d"; + hash = "sha256-NZezC/XZwWivJsmVUkcncVonJM5jRZottRGO+I0KhIY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix index 70626e0c2a46..0245a807e4f3 100644 --- a/pkgs/by-name/cr/crowdin-cli/package.nix +++ b/pkgs/by-name/cr/crowdin-cli/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "crowdin-cli"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip"; - hash = "sha256-4+D1O+/32aYbZs1aKAEPuKq3IDmZho7oX+zERRrGMpw="; + hash = "sha256-fPgcr0Gg0uIgDhnfowFp6K+NhtKdjThLd4yzjcZ78K4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix index 16d26bca7865..49087c07ec7b 100644 --- a/pkgs/by-name/cr/cryptsetup/package.nix +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, lvm2, json_c, asciidoctor, @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.7.5"; + version = "2.8.0"; outputs = [ "bin" @@ -38,20 +37,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-0r5Dlbj1A7Dr9LLYHbkMNalwUKNY7iH+YqDftm5dVSI="; + hash = "sha256-zJ4tN8JahxzqN1ILKNUyIHsMFnD7EPxU1oBx9j9SQ6I="; }; patches = [ # Allow reading tokens from a relative path, see #167994 ./relative-token-path.patch - - # Do not use pagesize as fallback for block size. - # Remove when https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/782 is in the latest stable release - # Fixes https://gitlab.com/cryptsetup/cryptsetup/-/issues/943 - (fetchpatch { - url = "https://gitlab.com/cryptsetup/cryptsetup/-/commit/a39a0d00e504ad7a89442874f72cf0561d6089c4.diff"; - hash = "sha256-teQ/uFYrKuS0ksMEv7rP+d9EUuOl3sINsNhDC88P0xw="; - }) ]; postPatch = '' @@ -95,6 +86,8 @@ stdenv.mkDerivation rec { popt ] ++ lib.optional (!withInternalArgon2) libargon2; + enableParallelBuilding = true; + # The test [7] header backup in compat-test fails with a mysterious # "out of memory" error, even though tons of memory is available. # Issue filed upstream: https://gitlab.com/cryptsetup/cryptsetup/-/issues/763 diff --git a/pkgs/by-name/ct/ctrtool/package.nix b/pkgs/by-name/ct/ctrtool/package.nix index cbfed6b84754..0d0c545fd303 100644 --- a/pkgs/by-name/ct/ctrtool/package.nix +++ b/pkgs/by-name/ct/ctrtool/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { rev-prefix = "ctrtool-v"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; description = "Tool to extract data from a 3ds rom"; - platforms = platforms.linux; - maintainers = [ maintainers.marius851000 ]; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ marius851000 ]; mainProgram = "ctrtool"; }; diff --git a/pkgs/by-name/cv/cvsq/package.nix b/pkgs/by-name/cv/cvsq/package.nix index 13f7ee5547d4..f0e0334d6a35 100644 --- a/pkgs/by-name/cv/cvsq/package.nix +++ b/pkgs/by-name/cv/cvsq/package.nix @@ -5,7 +5,7 @@ makeWrapper, cvs, perl, - nettools, + net-tools, findutils, rsync, coreutils, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ cvs perl - nettools + net-tools findutils rsync coreutils @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/cvsq --prefix PATH : ${ lib.makeBinPath [ cvs - nettools + net-tools findutils rsync coreutils @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/cvsq-branch --prefix PATH : ${ lib.makeBinPath [ cvs - nettools + net-tools findutils rsync coreutils @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/cvsq-merge --prefix PATH : ${ lib.makeBinPath [ cvs - nettools + net-tools findutils rsync coreutils @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/cvsq-switch --prefix PATH : ${ lib.makeBinPath [ cvs - nettools + net-tools findutils rsync coreutils @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/lcvs --prefix PATH : ${ lib.makeBinPath [ cvs - nettools + net-tools findutils rsync coreutils diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix index 5fcd7389b94d..618a7d85a16f 100644 --- a/pkgs/by-name/da/daed/package.nix +++ b/pkgs/by-name/da/daed/package.nix @@ -28,6 +28,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-+yLpSbDzr1OV/bmUUg6drOvK1ok3cBd+RRV7Qrrlp+Q="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index e7d4db0cd085..88df87ea873b 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "25.1.1"; + version = "25.1.2"; src = let @@ -31,10 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-PFY1eZFG8mvbG6D7pDJBBbsySeNmw6/DlxSyNvCJcSI="; - aarch64-linux = "sha256-Fny8+XA7N3rmXqP2UfTPYFIwHHSZTLbABjm+ESMoFJ4="; - x86_64-darwin = "sha256-/U8lcvJotAB+K0pQWpy6RIRqbfJzqVefS67qF9arzw0="; - aarch64-darwin = "sha256-lfz+B2ZHaBoyDKduDn45ocSTMAsS/bBXrByBeIZb0Ew="; + x86_64-linux = "sha256-jyqUIar/RnUvcnXOB3/c7F5BAcpUVL3ufnGuKNGHq0M="; + aarch64-linux = "sha256-1aEbrgPVIaWG3rUwHQCcnVTQtRgS2ksjqH5l13eR7NY="; + x86_64-darwin = "sha256-n6cu7wzC4GowWGUMF2vg+kA+tiOWzgaWLcUw0I/fCXU="; + aarch64-darwin = "sha256-XRFg11t6kiBTPhX8wZbVkHotacjRu3BK1MMGaHDJs6s="; }; in fetchurl { diff --git a/pkgs/by-name/db/dbtpl/package.nix b/pkgs/by-name/db/dbtpl/package.nix new file mode 100644 index 000000000000..d4fa2c6a61b7 --- /dev/null +++ b/pkgs/by-name/db/dbtpl/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + buildPackages, + versionCheckHook, + nix-update-script, +}: +buildGoModule (finalAttrs: { + pname = "dbtpl"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "xo"; + repo = "dbtpl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-r0QIgfDSt7HWnIDnJWGbwkqkXWYWGXoF5H/+zS6gEtE="; + }; + + vendorHash = "sha256-scJRJaaccQovxhzC+/OHuPR4NRaE8+u57S1JY40bif8="; + + nativeBuildInputs = [ + installShellFiles + ]; + + modPostBuild = '' + substituteInPlace vendor/github.com/xo/ox/ox.go \ + --replace-warn "ver := \"(devel)\"" "ver := \"${finalAttrs.version}\"" + ''; + + postInstall = + let + exe = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + "$out/bin/dbtpl" + else + lib.getExe buildPackages.dbtpl; + in + '' + installShellCompletion --cmd dbtpl \ + --bash <(${exe} completion bash) \ + --fish <(${exe} completion fish) \ + --zsh <(${exe} completion zsh) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command line tool to generate idiomatic Go code for SQL databases supporting PostgreSQL, MySQL, SQLite, Oracle, and Microsoft SQL Server"; + homepage = "https://github.com/xo/dbtpl"; + changelog = "https://github.com/xo/dbtpl/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + shellhazard + ]; + mainProgram = "dbtpl"; + }; +}) diff --git a/pkgs/by-name/db/dbus-test-runner/package.nix b/pkgs/by-name/db/dbus-test-runner/package.nix index 225df1ebae0e..740b24c42f4c 100644 --- a/pkgs/by-name/db/dbus-test-runner/package.nix +++ b/pkgs/by-name/db/dbus-test-runner/package.nix @@ -12,6 +12,7 @@ pkg-config, python3, xvfb-run, + gettext, }: stdenv.mkDerivation (finalAttrs: { @@ -24,6 +25,11 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-4yH19X98SVqpviCBIWzIX6FYHWxCbREpuKCNjQuTFDk="; }; + patches = [ + # glib gettext is deprecated and broken, so use regular gettext instead + ./use-regular-gettext.patch + ]; + postPatch = '' patchShebangs tests/test-wait-outputer @@ -39,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook glib # for autoconf macro, gtester, gdbus + gettext intltool pkg-config ]; diff --git a/pkgs/by-name/db/dbus-test-runner/use-regular-gettext.patch b/pkgs/by-name/db/dbus-test-runner/use-regular-gettext.patch new file mode 100644 index 000000000000..f2eb2a3e61dc --- /dev/null +++ b/pkgs/by-name/db/dbus-test-runner/use-regular-gettext.patch @@ -0,0 +1,12 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -46,7 +46,8 @@ GETTEXT_PACKAGE=dbus-test-runner + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default gettext domain]) + +-AM_GLIB_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.21]) + + ########################### + # gcov coverage reporting diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 42759cc723a5..0f5992cd0bcb 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -1,7 +1,7 @@ { lib, copyDesktopItems, - electron_34, + electron_37, fetchFromGitHub, deltachat-rpc-server, makeDesktopItem, @@ -19,36 +19,37 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "1.159.4"; + version = "1.159.5"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-OLE3BoQNgpOHYuMUFBmk+raXimJGOsXySkfP+UTDk/8="; + hash = "sha256-qooN7XRWFqR/bVPAQ8e7KOYNnBD9E70uAesaLUUeXXs="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-+h93tSiKxnnNXPGk7elMQrcIuw3G/j2/gugqSbqOrDw="; + hash = "sha256-TmizhgXMYX0hn4GnsL1QiSyMdahebh0QFbk/cOA48jg="; }; }; - electron = electron_34; + electron = electron_37; pnpm = pnpm_9; in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "1.58.2"; + version = "1.60.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-JYuYuv+OmAQzdw2AM0Qn0Z0+qq8G1JrW5jl2MI21x6M="; + hash = "sha256-WrP4C4zebbRdxy08oQzR3vkO2IBUfsRPnkU1aWqolB4="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-pW8SKplbXLQ5OWLOrG36aAnP/j0y9QaYGIg+Q2/Ulfk="; + hash = "sha256-PBCmyNmlH88y5s7+8WHcei8SP3Q0lIAAnAQn9uaFxLc="; + fetcherVersion = 1; }; nativeBuildInputs = diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index 1f5749299ab8..d32898162f76 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.78.0"; + version = "0.80.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-xQrfYtBL9hUiB6KZcA03KNgGfL8DpkxVNmjl+wS1L00="; + hash = "sha256-p6iBDNTGYgOPQUTRbiu8IT7kN72OCrw7R0ouhWW9yok="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/by-name/de/devpi-client/package.nix b/pkgs/by-name/de/devpi-client/package.nix index 074c39d973e3..22b8ad286aff 100644 --- a/pkgs/by-name/de/devpi-client/package.nix +++ b/pkgs/by-name/de/devpi-client/package.nix @@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d); ''; - pytestFlagsArray = [ + pytestFlags = [ # --fast skips tests which try to start a devpi-server improperly "--fast" ]; diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 4c72fc27f2d8..0205540f90df 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,16 +27,16 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.2.11"; + version = "2.2.12"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-utiIuifPxHjvC0TkY2XLeOlqReaal/4T4hrJ7tmQ27k="; + hash = "sha256-cBufd4HwNffkK2VDPMMUT1qZfgKNa6XKpxT5QlQesyc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QHcH0jgBAYtyYJoaBJW92HR5ZBgdMLupe5+l22Wpfjg="; + cargoHash = "sha256-CmzUe/R9iFU//u0/FxMonYWyx0EJnI/blUktYN/eNe8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index 382a3fc8f7b1..d06de6f83032 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -106,12 +106,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "300"; + version = "301"; format = "setuptools"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-ByfAS1ygWex8FLGeaV1HouSb6ElDZjAhXV5xjpsltFE="; + hash = "sha256-piTdP812LgcxvvgvUOKUrkxVXCbclyQW8dp84beT7H4="; }; outputs = [ @@ -260,7 +260,7 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ pytestCheckHook ] ++ pythonPath; - pytestFlagsArray = [ + pytestFlags = [ # Always show more information when tests fail "-vv" ]; diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/by-name/dj/djhtml/package.nix similarity index 70% rename from pkgs/development/tools/djhtml/default.nix rename to pkgs/by-name/dj/djhtml/package.nix index dc94350fdb2b..2f4f4be65d3d 100644 --- a/pkgs/development/tools/djhtml/default.nix +++ b/pkgs/by-name/dj/djhtml/package.nix @@ -1,10 +1,9 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - setuptools, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "djhtml"; version = "3.0.8"; pyproject = true; @@ -16,16 +15,16 @@ buildPythonApplication rec { hash = "sha256-1bopV6mjwjXdoIN9i3An4NvSpeGcVlQ24nLLjP/UfQU="; }; - build-system = [ setuptools ]; + build-system = [ python3Packages.setuptools ]; pythonImportsCheck = [ "djhtml" ]; - meta = with lib; { + meta = { homepage = "https://github.com/rtts/djhtml"; description = "Django/Jinja template indenter"; changelog = "https://github.com/rtts/djhtml/releases/tag/${src.tag}"; - license = licenses.gpl3Plus; - maintainers = [ ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; mainProgram = "djhtml"; }; } diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix index f9a9aa9c6297..636c31493891 100644 --- a/pkgs/by-name/dn/dns-collector/package.nix +++ b/pkgs/by-name/dn/dns-collector/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "dns-collector"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "dns-collector"; tag = "v${finalAttrs.version}"; - hash = "sha256-q12hMnSqA/KCkmiqsmBpvDmyHtuEWhMBTKwOOyw3Wfs="; + hash = "sha256-ebl/edMN45oLV1pN6mCaOSgxSSyAugsBP2sQWbIiPTI="; }; subPackages = [ "." ]; @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-TtlOwmNyO2/eQCajPBu6Pgdbuk4gacpgtcnr1vZgZdg="; + vendorHash = "sha256-Y0LOtyRJWOFAQwfg8roisSer0oCxPiaYICE1FY/SEF8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/do/docbook2x/package.nix b/pkgs/by-name/do/docbook2x/package.nix index e266b8835ee1..7833b91a3c39 100644 --- a/pkgs/by-name/do/docbook2x/package.nix +++ b/pkgs/by-name/do/docbook2x/package.nix @@ -52,6 +52,11 @@ stdenv.mkDerivation rec { XMLNamespaceSupport ]); + # configure tries to find osx in PATH and hardcodes the resulting path + # (if any) on the Perl code. this fails under strictDeps, so override + # the autoconf test: + OSX = "${opensp}/bin/osx"; + postConfigure = '' # Broken substitution is used for `perl/config.pl', which leaves literal # `$prefix' in it. diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix index c1066373414b..895763c82698 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.132.0"; + version = "1.133.0"; vendorHash = null; @@ -42,7 +42,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; tag = "v${version}"; - hash = "sha256-A4CtJpqHkC88kH6CsEt2Pc+SgHeznjnzRYwclvm7De0="; + hash = "sha256-U3n407HnivvogybgTuB/Rb932bt0WTbk6M1Wf7jRoTo="; }; meta = { diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index 9c4530cbc0f2..f8e3dba5d29b 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -60,6 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-xBonUzA4+1zbViEsKap6CaG6ZRldW1LjNYIB+FmVRFs="; + fetcherVersion = 1; }; # CMake (webkit extension) diff --git a/pkgs/by-name/do/dosfstools/gettext-0.25.patch b/pkgs/by-name/do/dosfstools/gettext-0.25.patch new file mode 100644 index 000000000000..3b90d968ffa2 --- /dev/null +++ b/pkgs/by-name/do/dosfstools/gettext-0.25.patch @@ -0,0 +1,42 @@ +From 893a84738606a8ac588ba1e9d4145cbbcbfff811 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Wed, 2 Jul 2025 12:03:53 +0200 +Subject: [PATCH] Fix autoreconf with gettext 0.25 + +This fixes the following error that appeared when running autoreconf +after updating to gettext 0.25: + + configure.ac:76: error: possibly undefined macro: AM_ICONV + If this token and others are legitimate, please use m4_pattern_allow. + See the Autoconf documentation. + autoreconf: error: /nix/store/dvpiwvz7an7icljfscdi76h11c03cma4-autoconf-2.72/bin/autoconf failed with exit status: 1 + +The version of gettext given in AM_GNU_GETTEXT_VERSION() is picked +quite arbitrarily based on what's likely to be available in distros, +since gettext itself is not actually used here, just some supporting +stuff from it. + +Link: https://github.com/dosfstools/dosfstools/pull/218 +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index efb8fb5..2cecab1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,8 +15,11 @@ + # along with this program. If not, see . + + AC_INIT([dosfstools], [4.2]) ++AC_CONFIG_MACRO_DIRS([m4]) + AC_SUBST([RELEASE_DATE], [2021-01-31]) + AM_INIT_AUTOMAKE([1.11 foreign subdir-objects parallel-tests]) ++AM_GNU_GETTEXT_VERSION([0.20]) ++AM_GNU_GETTEXT([external]) + + AC_ARG_ENABLE([compat-symlinks], + [AS_HELP_STRING([--enable-compat-symlinks], +-- +2.49.0 + diff --git a/pkgs/by-name/do/dosfstools/package.nix b/pkgs/by-name/do/dosfstools/package.nix index 9446485273d3..2ebf8b479b74 100644 --- a/pkgs/by-name/do/dosfstools/package.nix +++ b/pkgs/by-name/do/dosfstools/package.nix @@ -39,19 +39,15 @@ stdenv.mkDerivation rec { url = "https://github.com/dosfstools/dosfstools/commit/8da7bc93315cb0c32ad868f17808468b81fa76ec.patch"; sha256 = "sha256-Quegj5uYZgACgjSZef6cjrWQ64SToGQxbxyqCdl8C7o="; }) + ./gettext-0.25.patch ]; nativeBuildInputs = [ autoreconfHook + gettext pkg-config ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; - # configure.ac:75: error: required file './config.rpath' not found - # https://github.com/dosfstools/dosfstools/blob/master/autogen.sh - postPatch = '' - cp ${gettext}/share/gettext/config.rpath config.rpath - ''; - configureFlags = [ "--enable-compat-symlinks" ]; nativeCheckInputs = [ xxd ]; diff --git a/pkgs/by-name/do/dotbot/package.nix b/pkgs/by-name/do/dotbot/package.nix index 6f205e102d77..34049b5dac70 100644 --- a/pkgs/by-name/do/dotbot/package.nix +++ b/pkgs/by-name/do/dotbot/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "dotbot"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; src = fetchFromGitHub { owner = "anishathalye"; repo = "dotbot"; tag = "v${version}"; - hash = "sha256-3U8lIsqy95Ulxa5f2hHGFmuAqQ7WZtikvgaplX6GTF0="; + hash = "sha256-Bv9nvS8DxmpMB5Bo4Sw2+rVbrnQIcnc/hQZiq0qeJxc="; }; preCheck = '' diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index 835dfea8faac..9501e867b5b0 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2025-06-13"; + version = "0-unstable-2025-06-29"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "4e32a9fa6e58c1474f747a99083303c4a2f14ea7"; - hash = "sha256-j0s6xB8c8vQoOzL34Gu84elec0ig4z75NzlUx6PsW4E="; + rev = "903bcd8dba9cb9dfc70707a28089c469e5302539"; + hash = "sha256-gZAPNRzAuvpIAV7ArPGsqVv6SYBJkqA+Okf6FmStvsU="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/du/duf/package.nix b/pkgs/by-name/du/duf/package.nix index dce3c1588834..20ee29563a94 100644 --- a/pkgs/by-name/du/duf/package.nix +++ b/pkgs/by-name/du/duf/package.nix @@ -5,15 +5,15 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "duf"; version = "0.8.1"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; - rev = "v${version}"; - sha256 = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI="; }; vendorHash = "sha256-oihi7E67VQmym9U1gdD802AYxWRrSowhzBiKg0CBDPc="; @@ -21,7 +21,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=main.Version=${version}" + "-X=main.Version=${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -30,15 +30,15 @@ buildGoModule rec { installManPage duf.1 ''; - meta = with lib; { + meta = { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda penguwin sigmasquadron ]; mainProgram = "duf"; }; -} +}) diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 9ec638ec6c1f..98e36fb990e6 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/bootandy/dust/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ - aaronjheng defelo ]; mainProgram = "dust"; diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix index 241f664111bf..b50d99f801e3 100644 --- a/pkgs/by-name/e2/e2fsprogs/package.nix +++ b/pkgs/by-name/e2/e2fsprogs/package.nix @@ -3,6 +3,7 @@ stdenv, buildPackages, fetchurl, + fetchpatch, pkg-config, libuuid, gettext, @@ -12,6 +13,7 @@ shared ? !stdenv.hostPlatform.isStatic, e2fsprogs, runCommand, + libarchive, }: stdenv.mkDerivation rec { @@ -23,6 +25,20 @@ stdenv.mkDerivation rec { hash = "sha256-CCQuZMoOgZTZwcqtSXYrGSCaBjGBmbY850rk7y105jw="; }; + # 2025-05-31: Fix libarchive, from https://github.com/tytso/e2fsprogs/pull/230 + patches = [ + (fetchpatch { + name = "0001-create_inode_libarchive.c-define-libarchive-dylib-for-darwin.patch"; + url = "https://github.com/tytso/e2fsprogs/commit/e86c65bc7ee276cd9ca920d96e18ed0cddab3412.patch"; + hash = "sha256-HFZAznaNl5rzgVEvYx1LDKh2jd/VEXD/o0wypIh4TR8="; + }) + (fetchpatch { + name = "0002-mkgnutar.pl-avoid-uninitialized-username-variable.patch"; + url = "https://github.com/tytso/e2fsprogs/commit/9217c359db1d1b6d031a0e2ca9a885634fed00da.patch"; + hash = "sha256-iDXmLq77eJolH1mkXSbvZ9tRVtGQt2F45CdkVphUZSs="; + }) + ]; + # fuse2fs adds 14mb of dependencies outputs = [ "bin" @@ -40,27 +56,30 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid gettext + libarchive ] ++ lib.optionals withFuse [ fuse3 ]; configureFlags = - if stdenv.hostPlatform.isLinux then - [ - # It seems that the e2fsprogs is one of the few packages that cannot be - # build with shared and static libs. - (if shared then "--enable-elf-shlibs" else "--disable-elf-shlibs") - "--enable-symlink-install" - "--enable-relative-symlinks" - "--with-crond-dir=no" - # fsck, libblkid, libuuid and uuidd are in util-linux-ng (the "libuuid" dependency) - "--disable-fsck" - "--disable-libblkid" - "--disable-libuuid" - "--disable-uuidd" - ] - else - [ - "--enable-libuuid --disable-e2initrd-helper" - ]; + [ + "--with-libarchive=direct" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # It seems that the e2fsprogs is one of the few packages that cannot be + # build with shared and static libs. + (if shared then "--enable-elf-shlibs" else "--disable-elf-shlibs") + "--enable-symlink-install" + "--enable-relative-symlinks" + "--with-crond-dir=no" + # fsck, libblkid, libuuid and uuidd are in util-linux-ng (the "libuuid" dependency) + "--disable-fsck" + "--disable-libblkid" + "--disable-libuuid" + "--disable-uuidd" + ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + "--enable-libuuid" + "--disable-e2initrd-helper" + ]; nativeCheckInputs = [ buildPackages.perl ]; doCheck = true; @@ -88,6 +107,7 @@ stdenv.mkDerivation rec { [ -e $out/success ] ''; }; + meta = { homepage = "https://e2fsprogs.sourceforge.net/"; changelog = "https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}"; @@ -99,6 +119,6 @@ stdenv.mkDerivation rec { mit # lib/et, lib/ss ]; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ usertam ]; }; } diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix index 274c71c9d748..e149fed743cf 100644 --- a/pkgs/by-name/ea/earthlyls/package.nix +++ b/pkgs/by-name/ea/earthlyls/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/glehmann/earthlyls/releases/tag/${version}"; license = lib.licenses.mit; mainProgram = "earthlyls"; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 9cc27b35d31a..49db81c475b9 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -48,13 +48,13 @@ in stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.2.3"; + version = "7.2.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${version}"; - hash = "sha256-bTyPStOQusIho8x6RI+2Z+4wHSG9ERjo4NuvLUILIm8="; + hash = "sha256-C+zorQ7AFx72eOHUtjCHB2/1i1gnAoSMfEB+dWJIXHM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix index 735a3268aafa..104733fdb62a 100644 --- a/pkgs/by-name/ed/eddie/package.nix +++ b/pkgs/by-name/ed/eddie/package.nix @@ -138,7 +138,7 @@ buildDotnetModule rec { homepage = "https://eddie.website"; license = lib.licenses.gpl3Plus; mainProgram = "eddie-ui"; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index eb0a3e823440..69f00ab94a52 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -6,7 +6,7 @@ cmake, ninja, - removeReferencesTo, + sanitiseHeaderPathsHook, glog, gflags, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - removeReferencesTo + sanitiseHeaderPathsHook ]; buildInputs = [ @@ -98,18 +98,6 @@ stdenv.mkDerivation (finalAttrs: { 'find_package(FBThrift CONFIG REQUIRED COMPONENTS cpp2)' ''; - postFixup = '' - # Sanitize header paths to avoid runtime dependencies leaking in - # through `__FILE__`. - ( - shopt -s globstar - for header in "$dev/include"/**/*.h; do - sed -i "1i#line 1 \"$header\"" "$header" - remove-references-to -t "$dev" "$header" - done - ) - ''; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ed/edid-decode/package.nix b/pkgs/by-name/ed/edid-decode/package.nix deleted file mode 100644 index f5ac1176221e..000000000000 --- a/pkgs/by-name/ed/edid-decode/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - unstableGitUpdater, -}: - -stdenv.mkDerivation { - pname = "edid-decode"; - version = "0-unstable-2024-04-02"; - - outputs = [ - "out" - "man" - ]; - - src = fetchgit { - url = "https://git.linuxtv.org/edid-decode.git"; - rev = "3d635499e4aca3319f0796ba787213c981c5a770"; - hash = "sha256-bqzO39YM/3h9p37xaGJAw9xERgWOD+4yqO/XQiq/QqM="; - }; - - preBuild = '' - export DESTDIR=$out - export bindir=/bin - export mandir=/share/man - ''; - - enableParallelBuilding = true; - - passthru.updateScript = unstableGitUpdater { }; - - meta = with lib; { - description = "EDID decoder and conformance tester"; - homepage = "https://git.linuxtv.org/edid-decode.git"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - platforms = platforms.all; - mainProgram = "edid-decode"; - }; -} diff --git a/pkgs/by-name/ed/edid-generator/package.nix b/pkgs/by-name/ed/edid-generator/package.nix index fd8735ff4226..30f74cb253e2 100644 --- a/pkgs/by-name/ed/edid-generator/package.nix +++ b/pkgs/by-name/ed/edid-generator/package.nix @@ -3,8 +3,8 @@ stdenv, fetchFromGitHub, dos2unix, - edid-decode, hexdump, + v4l-utils, zsh, }: @@ -34,8 +34,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ dos2unix - edid-decode hexdump + v4l-utils zsh ]; diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index 9b244672a146..f4b09fd67509 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -61,31 +61,10 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # FIXME: unvendor OpenSSL again once upstream updates + # to a compatible version. + # Upstream PR: https://github.com/tianocore/edk2/pull/10946 postPatch = '' - # de-vendor OpenSSL - rm -r CryptoPkg/Library/OpensslLib/openssl - mkdir -p CryptoPkg/Library/OpensslLib/openssl - ( - cd CryptoPkg/Library/OpensslLib/openssl - tar --strip-components=1 -xf ${buildPackages.openssl.src} - - # Apply OpenSSL patches. - ${lib.pipe buildPackages.openssl.patches [ - (builtins.filter ( - patch: - !builtins.elem (baseNameOf patch) [ - # Exclude patches not required in this context. - "nix-ssl-cert-file.patch" - "openssl-disable-kernel-detection.patch" - "use-etc-ssl-certs-darwin.patch" - "use-etc-ssl-certs.patch" - ] - )) - (map (patch: "patch -p1 < ${patch}\n")) - lib.concatStrings - ]} - ) - # enable compilation using Clang # https://bugzilla.tianocore.org/show_bug.cgi?id=4620 substituteInPlace BaseTools/Conf/tools_def.template --replace-fail \ diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix index ed42e133e895..54da5b9b3af4 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.77"; + version = "0.78"; 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-yi1i76mBXxgDKBqug/kfb05076VZqJ1iGK8TXZh8F7g="; + hash = "sha256-1kw0oiYkEydoMWrECehI5M6VbcL+Y340Pu5QU2F3sbQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/em/emmet-language-server/package.nix b/pkgs/by-name/em/emmet-language-server/package.nix index 61b80c57f34d..dc2a8a8cff46 100644 --- a/pkgs/by-name/em/emmet-language-server/package.nix +++ b/pkgs/by-name/em/emmet-language-server/package.nix @@ -21,6 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-hh5PEtmSHPs6QBgwWHS0laGU21e82JckIP3mB/P9/vE="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 942c2f342a3c..86d89a85933e 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI="; + fetcherVersion = 1; }; cargoRoot = "src-tauri"; diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index d5d687e1fc73..f59a402b19ad 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.34.1"; + version = "1.34.2"; inherit (stdenv.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -21,8 +21,8 @@ let hash = { - aarch64-linux = "sha256-7v9KwHdQIF4dElsvTPxsJNnpxfLJk3TQ4tCgzwqsebs="; - x86_64-linux = "sha256-iCZNZRh2qa0oqn4Jjj34Q1cEBM9gts6WjESWykorbp0="; + aarch64-linux = "sha256-82jzPZ08FCuM2eABcqU/QTdxEipnnvNjb350ZSiUS0o="; + x86_64-linux = "sha256-B1tnshv5fIjIKjeSADSjBotakhUak3rM0NWt4kWoWhk="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index 4bf15d43a41b..4da34c82565b 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { patches ; hash = "sha256-laTyxRh54x3iopGVgoFtcgaV7R6IKux1O/+tzGEy0Fg="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index 3bd00c4f1962..e0c5734b2ad5 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-fjfzBy1Z7AUKA53yjjCQ6yasHc5QMaOBtXtXA5fNK5s="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix index 87be43114134..cfccafa873c6 100644 --- a/pkgs/by-name/et/etherpad-lite/package.nix +++ b/pkgs/by-name/et/etherpad-lite/package.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-n7LolizpKng7zzccytYoCwJ7uGQbMagsgYPDuq0mdxU="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 3b648c3d1614..b9e4c5d58803 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.204.5"; + version = "0.205.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-kGn7O2OCvStez2eaT+h7EDBi96Q7dshK8X7DUD2SBOo="; + hash = "sha256-T97f5K4TDaAdqm2zU8+cEyq1YIzwy35tX8mb3pPkhIo="; }; - vendorHash = "sha256-n67OSKpMhvgqftoVAqtABfcNgdRSbWjmJv7HSmv3Ev8="; + vendorHash = "sha256-gbTh9/Ny4JVCbpzz+opN92m6LQhPEBj/XuLLZ4M6tIc="; commonMeta = with lib; { license = licenses.mit; @@ -52,7 +52,7 @@ buildGo124Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-HDokBgvRxmKkuQyGIqkX0Hy4Up+K25yYSRYAstE8mBY="; + hash = "sha256-OmiINzMCXbvceCDZ9zYTQKfWQ3iUgovMznmVoQkQ5DE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix index 977b8b78b30d..49722821b258 100644 --- a/pkgs/by-name/ev/evince/package.nix +++ b/pkgs/by-name/ev/evince/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evince"; - version = "48.0"; + version = "48.1"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major finalAttrs.version}/evince-${finalAttrs.version}.tar.xz"; - hash = "sha256-zS9lg1X6kHX9+eW0SqCvOn4JKMVWFOsQQrNhds9FESY="; + hash = "sha256-fYuab6OgXT9bkEiFkCdojHOniP9ukjvDlFEmiElD+hA="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/ex/exempi/package.nix b/pkgs/by-name/ex/exempi/package.nix index e8131c0d8b57..2c7b040bf575 100644 --- a/pkgs/by-name/ex/exempi/package.nix +++ b/pkgs/by-name/ex/exempi/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "exempi"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-6fmj1Cv/c7XrD3fsIs0BY8PiGUnMQUrR8ZoEZd3kH/4="; + sha256 = "sha256-dRO35Cw72QpY132TjGDS6Hxo+BZG58uLEtcf4zQ5HG8="; }; configureFlags = diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index e987a04e9952..eaaca6f4a1be 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eza"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; tag = "v${finalAttrs.version}"; - hash = "sha256-/mk8UMWiw+YrEcZK+C/2AkHXekvxTwWGBsJG7lWbz38="; + hash = "sha256-/SqkaMt4XCdxMYMp7bYY9dYhe3KKKen/YpPg6Xr4fmI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6I7Enwp95u2d3xtnBykVCBE1tBm1OeAyQtxvGCDJPdc="; + cargoHash = "sha256-NwguuIXNKwjFIhNGY1Una78RzxKykkNy+TCTuJvdxnM="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/fa/fable/package.nix b/pkgs/by-name/fa/fable/package.nix index 3cf318c5350e..e7765a80563a 100644 --- a/pkgs/by-name/fa/fable/package.nix +++ b/pkgs/by-name/fa/fable/package.nix @@ -6,9 +6,9 @@ buildDotnetGlobalTool (finalAttrs: { pname = "fable"; - version = "4.25.0"; + version = "4.26.0"; - nugetHash = "sha256-1T6cJKODI5Rm6Ze0f7X/Ecdrrn1NulKSnO3lMW73W0M="; + nugetHash = "sha256-nhIGVwu6kHTW+t0hiD1Pha3+ErE5xACBrVDgFP6qMnc="; passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/fa/facter/package.nix b/pkgs/by-name/fa/facter/package.nix index 864efc67eac1..095730aaf27e 100644 --- a/pkgs/by-name/fa/facter/package.nix +++ b/pkgs/by-name/fa/facter/package.nix @@ -7,7 +7,7 @@ iproute2, lib, makeWrapper, - nettools, + net-tools, pciutils, procps, stdenv, @@ -30,7 +30,7 @@ bundlerApp { [ coreutils gnugrep - nettools + net-tools pciutils procps util-linux diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index 1987f574e7f4..a55807541051 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -7,7 +7,7 @@ cmake, ninja, - removeReferencesTo, + sanitiseHeaderPathsHook, openssl, gflags, @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - removeReferencesTo + sanitiseHeaderPathsHook ]; buildInputs = [ @@ -100,22 +100,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Homebrew sets this, and the shared library build fails without - # it. I don‘t know, either. It scares me. + # it. I don’t know, either. It scares me. (lib.cmakeFeature "CMAKE_SHARED_LINKER_FLAGS" "-Wl,-undefined,dynamic_lookup") ]; - postFixup = '' - # Sanitize header paths to avoid runtime dependencies leaking in - # through `__FILE__`. - ( - shopt -s globstar - for header in "$out/include"/**/*.h; do - sed -i "1i#line 1 \"$header\"" "$header" - remove-references-to -t "$out" "$header" - done - ) - ''; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix index c80656a565e9..ad1b4f3cce96 100644 --- a/pkgs/by-name/fe/fedistar/package.nix +++ b/pkgs/by-name/fe/fedistar/package.nix @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fe/fehlstart/package.nix b/pkgs/by-name/fe/fehlstart/package.nix index 7c289e51688e..175a6ebf7921 100644 --- a/pkgs/by-name/fe/fehlstart/package.nix +++ b/pkgs/by-name/fe/fehlstart/package.nix @@ -2,39 +2,45 @@ lib, stdenv, pkg-config, - gtk2, - keybinder, - fetchFromGitLab, + gtk3, + glib, + keybinder3, + fetchFromGitea, }: stdenv.mkDerivation { pname = "fehlstart"; - version = "unstable-2016-05-23"; + version = "0.5-unstable-2025-01-12"; - src = fetchFromGitLab { - owner = "fehlstart"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "chuvok"; repo = "fehlstart"; - rev = "9f4342d75ec5e2a46c13c99c34894bc275798441"; - sha256 = "1rfzh7w6n2s9waprv7m1bhvqrk36a77ada7w655pqiwkhdj5q95i"; + rev = "cf08d6c3964da9abc8d1af0725894fef62352064"; + hash = "sha256-qq0IhLzSvYnooPb4w+lno8P/tbedrDKTk27HGtQlp2I="; }; patches = [ ./use-nix-profiles.patch ]; + + strictDeps = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ - gtk2 - keybinder + gtk3 + keybinder3 ]; - preConfigure = '' - export PREFIX=$out - ''; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev glib}/include/gio-unix-2.0"; - meta = with lib; { + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { description = "Small desktop application launcher with reasonable memory footprint"; - homepage = "https://gitlab.com/fehlstart/fehlstart"; - license = licenses.gpl3; - maintainers = [ maintainers.mounium ]; - platforms = platforms.all; + homepage = "https://codeberg.org/Chuvok/fehlstart"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.mounium ]; + platforms = lib.platforms.linux; mainProgram = "fehlstart"; }; } diff --git a/pkgs/by-name/fe/fehlstart/use-nix-profiles.patch b/pkgs/by-name/fe/fehlstart/use-nix-profiles.patch index 0c06e53f9814..32758ae231ec 100644 --- a/pkgs/by-name/fe/fehlstart/use-nix-profiles.patch +++ b/pkgs/by-name/fe/fehlstart/use-nix-profiles.patch @@ -1,21 +1,21 @@ ---- fehlstart-9f4342d75ec5e2a46c13c99c34894bc275798441-src/fehlstart.c 1970-01-01 01:00:01.000000000 +0100 -+++ fehlstart.c 2016-08-10 12:21:11.231638418 +0200 -@@ -779,8 +779,15 @@ - read_settings(setting_file, &settings); - update_commands(); - g_hash_table_foreach(action_map, update_launcher, NULL); -- add_launchers(STR_S(APPLICATIONS_DIR_0)); -- add_launchers(STR_S(APPLICATIONS_DIR_1)); -- add_launchers(STR_S(USER_APPLICATIONS_DIR)); +diff --git a/fehlstart.c b/fehlstart.c +index b33c8ff..ce467b5 100644 +--- a/fehlstart.c ++++ b/fehlstart.c +@@ -802,6 +802,16 @@ static void* update_all(void* user_data) + add_launchers(APPLICATIONS_DIR_0); + add_launchers(APPLICATIONS_DIR_1); + add_launchers(USER_APPLICATIONS_DIR); + const char* nixprofiles = getenv("NIX_PROFILES"); + if(nixprofiles != NULL) { + const char* pch = strtok(nixprofiles, " "); + while (pch != NULL) + { -+ String nix_dir = str_concat((String) { pch, strlen(pch), false },STR_S("/share/applications")); ++ char* nix_dir = g_strconcat(pch, "/share/applications", NULL); + add_launchers(nix_dir); + pch = strtok(NULL, " "); + } + } return NULL; } + diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix index d3eaca63a316..baadcc9fa7e6 100644 --- a/pkgs/by-name/fi/fiddler-everywhere/package.nix +++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix @@ -8,11 +8,11 @@ let pname = "fiddler-everywhere"; - version = "6.6.0"; + version = "7.0.0"; src = fetchurl { url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage"; - hash = "sha256-qSQx9uz8P6k/wdPpe7XwhQ6qCZp6IUoLOZnkDWMFS3E="; + hash = "sha256-pDXvzTuivQUjEr0mi/Bw98il6a1D7gJfQ5x5OuQu2wE="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/fi/fido2-manage/package.nix b/pkgs/by-name/fi/fido2-manage/package.nix index b6440098e92f..f83f11ac2117 100644 --- a/pkgs/by-name/fi/fido2-manage/package.nix +++ b/pkgs/by-name/fi/fido2-manage/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + unstableGitUpdater, fetchurl, pkg-config, cmake, @@ -29,15 +30,17 @@ let in stdenv.mkDerivation rec { pname = "fido2-manage"; - version = "0-unstable-2024-11-22"; + version = "0-unstable-2025-06-06"; src = fetchFromGitHub { owner = "token2"; repo = "fido2-manage"; - rev = "2c14b222a432e34750bb3929c620bbdffd1c75be"; - hash = "sha256-xdElYXx+F2XCP5zsbRTmTRyHKGnEt97jNRrQM0Oab5E="; + rev = "4fc6a4e0d905dcc2a7bfee70232a0398e9e4b45d"; + hash = "sha256-olkEUHJ350FIMUlWG37wqSfO2wyYni4CYspwa4lAO5w="; }; + passthru.updateScript = unstableGitUpdater { }; + icon = fetchurl { url = "https://token2.net/img/icon/logo-white.png"; hash = "sha256-UpxRzn24v1vigMFlofVU+YOzKrkxCu2Pk5iktqFgNO8="; diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix index cc46daaaafae..e84c9dcd3c8b 100644 --- a/pkgs/by-name/fi/filebrowser/package.nix +++ b/pkgs/by-name/fi/filebrowser/package.nix @@ -38,6 +38,7 @@ let inherit (finalAttrs) pname version src; sourceRoot = "${src.name}/frontend"; hash = "sha256-vLOtVeGFeHXgQglvKsih4lj1uIs6wipwfo374viIq4I="; + fetcherVersion = 1; }; installPhase = '' diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix index b73b294a424b..d586e1f9cfc4 100644 --- a/pkgs/by-name/fi/firezone-gui-client/package.nix +++ b/pkgs/by-name/fi/firezone-gui-client/package.nix @@ -41,6 +41,7 @@ let inherit pname version; src = "${src}/rust/gui-client"; hash = "sha256-ttbTYBuUv0vyiYzrFATF4x/zngsRXjuLPfL3qW2HEe4="; + fetcherVersion = 1; }; pnpmRoot = "rust/gui-client"; diff --git a/pkgs/by-name/fi/firezone-server/package.nix b/pkgs/by-name/fi/firezone-server/package.nix index 3e09361bf1bb..549c272590b8 100644 --- a/pkgs/by-name/fi/firezone-server/package.nix +++ b/pkgs/by-name/fi/firezone-server/package.nix @@ -35,6 +35,7 @@ beamPackages.mixRelease rec { inherit pname version; src = "${src}/apps/web/assets"; hash = "sha256-ejyBppFtKeyVhAWmssglbpLleOnbw9d4B+iM5Vtx47A="; + fetcherVersion = 1; }; pnpmRoot = "apps/web/assets"; diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index 8f4e9066692f..3df0783767f1 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -77,7 +77,7 @@ python3Packages.buildPythonApplication rec { time-machine ]; - pytestFlagsArray = [ + enabledTestPaths = [ "fittrackee" ]; diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index e451ee6fd812..62b784232421 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -6,7 +6,7 @@ cmake, ninja, - removeReferencesTo, + sanitiseHeaderPathsHook, openssl, glog, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - removeReferencesTo + sanitiseHeaderPathsHook ]; buildInputs = [ @@ -101,18 +101,6 @@ stdenv.mkDerivation (finalAttrs: { export GTEST_FILTER="-${lib.concatStringsSep ":" disabledTests}" ''; - postFixup = '' - # Sanitize header paths to avoid runtime dependencies leaking in - # through `__FILE__`. - ( - shopt -s globstar - for header in "$dev/include"/**/*.h; do - sed -i "1i#line 1 \"$header\"" "$header" - remove-references-to -t "$dev" "$header" - done - ) - ''; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix index a3f6a17a21b8..a0b4eb546ab4 100644 --- a/pkgs/by-name/fl/flaresolverr/package.nix +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/FlareSolverr/FlareSolverr/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.mit; mainProgram = "flaresolverr"; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; inherit (undetected-chromedriver.meta) platforms; }; }) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index eb7b0600efe2..c7c11a2396cb 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.16.12"; + version = "3.16.13"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-0JXJrW/3RKisrasxI1ina43GYwHcpqjbhb/OpaoIVyg="; + hash = "sha256-RtDb/irvZe/v4aXcn0Vfo3pa7alvLWtP3x3vwR4og5s="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix index 083d79d9861b..8d561a278e23 100644 --- a/pkgs/by-name/fl/flood/package.nix +++ b/pkgs/by-name/fl/flood/package.nix @@ -23,6 +23,7 @@ buildNpmPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-E2VxRcOMLvvCQb9gCAGcBTsly571zh/HWM6Q1Zd2eVw="; + fetcherVersion = 1; }; passthru = { diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix index 653da761f4d6..18ae634968d9 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.4"; + version = "2.4.6"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; tag = "v${finalAttrs.version}"; - hash = "sha256-K7NJOLq0Yjf8IlJZKqQA7WS1uKPC+WN97mtPgwhA/+8="; + hash = "sha256-hy2kWJmvvmItXl05Nw9gWEYpoDg+NtP2veO2vZ00QhI="; }; outputs = [ diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix index c942a2e62d71..2cbb1401ccb0 100644 --- a/pkgs/by-name/fo/follow/package.nix +++ b/pkgs/by-name/fo/follow/package.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM="; + fetcherVersion = 1; }; env = { diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 22ba13014094..33f945777718 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -8,7 +8,7 @@ cmake, ninja, pkg-config, - removeReferencesTo, + sanitiseHeaderPathsHook, double-conversion, fast-float, @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja pkg-config - removeReferencesTo + sanitiseHeaderPathsHook ]; # See CMake/folly-deps.cmake in the Folly source tree. @@ -192,18 +192,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - postFixup = '' - # Sanitize header paths to avoid runtime dependencies leaking in - # through `__FILE__`. - ( - shopt -s globstar - for header in "$dev/include"/**/*.h; do - sed -i "1i#line 1 \"$header\"" "$header" - remove-references-to -t "$dev" "$header" - done - ) - ''; - passthru = { inherit boost; fmt = fmt_11; diff --git a/pkgs/by-name/fo/fopnu/package.nix b/pkgs/by-name/fo/fopnu/package.nix index dd5d825af329..fd8df2447f22 100644 --- a/pkgs/by-name/fo/fopnu/package.nix +++ b/pkgs/by-name/fo/fopnu/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec { license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "fopnu"; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix index e18cd0d41e22..e69621c6d8af 100644 --- a/pkgs/by-name/fq/fq/package.nix +++ b/pkgs/by-name/fq/fq/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fq"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-/yRTeWyHVZZzWbkI/VhYD/T5KZq8E2j678LE8gn5ILE="; + hash = "sha256-7AWugaSK9JFkWPKjjtgTZZ37rXUYYco2XXY4JEA7sSk="; }; - vendorHash = "sha256-vp7JQSnzijCkWximw4E2abd39l0qjIGkl+mPfEoli0w="; + vendorHash = "sha256-87jMUtFy/BNUqsfzqyFtk3EB5i71O2zeFYvErV+HBAA="; ldflags = [ "-s" diff --git a/pkgs/by-name/fr/freedv/no-framework.patch b/pkgs/by-name/fr/freedv/no-framework.patch new file mode 100644 index 000000000000..01bb31e00bf5 --- /dev/null +++ b/pkgs/by-name/fr/freedv/no-framework.patch @@ -0,0 +1,28 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 38b3b262..3be9bfee 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -146,21 +146,16 @@ if(APPLE) + TARGET FreeDV + POST_BUILD + COMMAND rm -rf dist_tmp FreeDV.dmg || true +- COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR} ++ COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src + COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources + COMMAND rm ARGS -rf FreeDV.app/Contents/Frameworks + COMMAND mkdir ARGS FreeDV.app/Contents/Frameworks +- COMMAND cp ARGS -a ${Python3_ROOT_DIR}/../../../Python.framework FreeDV.app/Contents/Frameworks +- COMMAND install_name_tool ARGS -add_rpath @loader_path/../Frameworks/Python.framework FreeDV.app/Contents/libs/librade*.dylib + COMMAND cp ARGS ../rade_src/radae_*e.py FreeDV.app/Contents/Resources + COMMAND cp ARGS -a ../rade_src/radae FreeDV.app/Contents/Resources + COMMAND cp ARGS -a ../rade_src/model19_check3 FreeDV.app/Contents/Resources + +- # Precompile Python code to improve startup time +- COMMAND cd FreeDV.app/Contents/Resources && ../Frameworks/Python.framework/Versions/Current/bin/python3 -c "import radae_txe\; import radae_rxe\;" && cd ../../.. +- + # Codesign binary so that it can execute +- COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/bin -name 'Python' -o -name 'python3.12*'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/ -name 'Python'` ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/MacOS/FreeDV ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/lib/python3.12/site-packages/torch/bin/* ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/Python ++ COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` + ) + + if (MACOS_CODESIGN_KEYCHAIN_PROFILE) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index ff04378f9f7e..bdff43aaef2f 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -1,9 +1,11 @@ { - config, lib, stdenv, fetchFromGitHub, cmake, + pkg-config, + python3, + libopus, macdylibbundler, makeWrapper, darwin, @@ -17,64 +19,115 @@ hamlib_4, wxGTK32, sioclient, - pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + dbus, + apple-sdk_15, nix-update-script, }: +let + radaeSrc = fetchFromGitHub { + owner = "drowe67"; + repo = "radae"; + rev = "2354cd2a4b3af60c7feb1c0d6b3d6dd7417c2ac9"; + hash = "sha256-yEr/OCXV83qXi89QHXMrUtQ2UwNOsijQMN35Or2JP+Y="; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "freedv"; - version = "1.9.9.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; tag = "v${finalAttrs.version}"; - hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g="; + hash = "sha256-3vwFB+3LloumEAGlSJZc2+/I8uI6KLP/KuDGeDOj87k="; }; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace CMakeLists.txt \ - --replace-fail "-Wl,-ld_classic" "" - substituteInPlace src/CMakeLists.txt \ - --replace-fail "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler" - sed -i "/codesign/d;/hdiutil/d" src/CMakeLists.txt - ''; + patches = [ + ./no-framework.patch + ]; + + postPatch = + '' + cp -R ${radaeSrc} radae + chmod -R u+w radae + substituteInPlace radae/cmake/BuildOpus.cmake \ + --replace-fail "https://gitlab.xiph.org/xiph/opus/-/archive/main/opus-main.tar.gz" "${libopus.src}" \ + --replace-fail "./autogen.sh && " "" + substituteInPlace cmake/BuildRADE.cmake \ + --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \ + --replace-fail "GIT_TAG main" "" + patchShebangs test/test_*.sh + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace-fail "-Wl,-ld_classic" "" + substituteInPlace src/CMakeLists.txt \ + --replace-fail "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler" + sed -i "/codesign/d;/hdiutil/d" src/CMakeLists.txt + ''; nativeBuildInputs = [ cmake + pkg-config + python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ macdylibbundler makeWrapper darwin.autoSignDarwinBinariesHook + darwin.sigtool ]; - buildInputs = [ - codec2 - libsamplerate - libsndfile - lpcnet - speexdsp - hamlib_4 - wxGTK32 - sioclient - ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]); + buildInputs = + [ + codec2 + libsamplerate + libsndfile + lpcnet + speexdsp + hamlib_4 + wxGTK32 + sioclient + python3.pkgs.numpy + ] + ++ ( + if stdenv.hostPlatform.isLinux then + [ + libpulseaudio + dbus + ] + else if stdenv.hostPlatform.isDarwin then + [ + apple-sdk_15 + ] + else + [ + portaudio + ] + ); cmakeFlags = [ (lib.cmakeBool "USE_INTERNAL_CODEC2" false) (lib.cmakeBool "USE_STATIC_DEPS" false) (lib.cmakeBool "UNITTEST" true) - (lib.cmakeBool "USE_PULSEAUDIO" pulseSupport) + (lib.cmakeBool "USE_NATIVE_AUDIO" (with stdenv.hostPlatform; isLinux || isDarwin)) ]; - doCheck = true; + env.NIX_CFLAGS_COMPILE = "-I${codec2.src}/src"; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - mv $out/bin/FreeDV.app $out/Applications - makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv - ''; + doCheck = false; + + postInstall = + '' + install -Dm755 rade_build/src/librade.* -t $out/lib + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/FreeDV.app $out/Applications + makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv + ''; passthru.updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/fr/froide-govplan/package.nix b/pkgs/by-name/fr/froide-govplan/package.nix index cd2f605c7ca9..cad713bb1957 100644 --- a/pkgs/by-name/fr/froide-govplan/package.nix +++ b/pkgs/by-name/fr/froide-govplan/package.nix @@ -14,13 +14,14 @@ let python = python3Packages.python.override { packageOverrides = self: super: { - django = super.django.override { withGdal = true; }; + django_5 = super.django_5.override { withGdal = true; }; + django = super.django_5; }; }; in python.pkgs.buildPythonApplication rec { pname = "froide-govplan"; - version = "0-unstable-2025-01-27"; + version = "0-unstable-2025-06-25"; pyproject = true; src = fetchFromGitHub { @@ -28,8 +29,8 @@ python.pkgs.buildPythonApplication rec { repo = "froide-govplan"; # No tagged release yet # https://github.com/okfde/froide-govplan/issues/15 - rev = "f1763807614b8c54a9214359a2a1e442ca58cb6d"; - hash = "sha256-Y7/qjhu3y9E55ZDmDf5HUk9JVcUTvi9KnqavqwNixTM="; + rev = "9c325e70a84f26fea37b5a34f24d19fd82ea62ff"; + hash = "sha256-OD4vvKt0FLuiAVGwpspWLB2ZuM1UJkZdv2YcbKKYk9A="; }; patches = [ @@ -69,7 +70,6 @@ python.pkgs.buildPythonApplication rec { build-inputs = [ gdal ]; dependencies = with python.pkgs; [ - bleach django-admin-sortable2 django-cms django-filer @@ -93,6 +93,7 @@ python.pkgs.buildPythonApplication rec { }; }) )) + nh3 psycopg ]; @@ -103,7 +104,7 @@ python.pkgs.buildPythonApplication rec { cp -r project $out/${python.sitePackages}/froide_govplan/ cp -r froide_govplan/locale $out/${python.sitePackages}/froide_govplan/ makeWrapper $out/${python.sitePackages}/froide_govplan/manage.py $out/bin/froide-govplan \ - --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : ${passthru.pythonPath}:$out/${python.sitePackages} \ --set GDAL_LIBRARY_PATH "${gdal}/lib/libgdal.so" \ --set GEOS_LIBRARY_PATH "${geos}/lib/libgeos_c.so" ''; @@ -112,8 +113,8 @@ python.pkgs.buildPythonApplication rec { tests = { inherit (nixosTests) froide-govplan; }; - python = python; - pythonPath = "${python.pkgs.makePythonPath dependencies}:${froide-govplan}/${python.sitePackages}"; + inherit python; + pythonPath = "${python.pkgs.makePythonPath dependencies}"; }; meta = { diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index c6e120dafb69..b602b385a771 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -15,20 +15,38 @@ let python = python3Packages.python.override { - packageOverrides = self: super: { django = super.django.override { withGdal = true; }; }; + packageOverrides = self: super: { + django_5 = super.django_5.override { withGdal = true; }; + django = super.django_5; + # custom python module part of froide + dogtail = super.buildPythonPackage { + pname = "dogtail"; + version = "0-unstable-2024-11-27"; + pyproject = true; + + src = fetchFromGitHub { + owner = "okfde"; + repo = "dogtail"; + rev = "d2f341cab0f05ef4e193f0158fe5a64aadc5bae6"; + hash = "sha256-2lQZgvFXAz6q/3NpBcwckUologWxKmwXI0ZG5nylajg="; + }; + + build-system = with super; [ setuptools ]; + }; + }; }; in python.pkgs.buildPythonApplication rec { pname = "froide"; - version = "0-unstable-2025-04-25"; + version = "0-unstable-2025-07-01"; pyproject = true; src = fetchFromGitHub { owner = "okfde"; repo = "froide"; - rev = "9e4838fc5f17a0506af42ad5fd1ebc66cff4b92a"; - hash = "sha256-0EC6oCaiK7gw5ikemskiK3qOlflGHzlG4giDQNj9tBQ="; + rev = "362bddb5a8fdfe762d59cdebd29016568c9531b2"; + hash = "sha256-c8I/FvXQSkAeacxMQJCpCMKFueNEnLI4R0ElqRbVbNg="; }; patches = [ ./django_42_storages.patch ]; @@ -48,11 +66,9 @@ python.pkgs.buildPythonApplication rec { ]; dependencies = with python.pkgs; [ - bleach celery celery-singleton channels - coreapi dj-database-url django django-celery-beat @@ -63,9 +79,6 @@ python.pkgs.buildPythonApplication rec { django-elasticsearch-dsl django-filingcabinet django-filter - # Project discontinued upstream - # https://github.com/okfde/froide/issues/893 - django-fsm django-json-widget django-leaflet django-mfa3 @@ -86,6 +99,7 @@ python.pkgs.buildPythonApplication rec { geoip2 icalendar markdown + nh3 phonenumbers pillow pikepdf @@ -104,7 +118,8 @@ python.pkgs.buildPythonApplication rec { pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-IeuQoiI/r9AKLZgKkZx0C+qE9ueWuC39Y77MB08zSAc="; + hash = "sha256-g7YX2fVXGmb3Qq9NNCb294bk4/0khcIZVSskYbE8Mdw="; + fetcherVersion = 1; }; postBuild = '' @@ -114,7 +129,7 @@ python.pkgs.buildPythonApplication rec { postInstall = '' cp -r build manage.py $out/${python.sitePackages}/froide/ makeWrapper $out/${python.sitePackages}/froide/manage.py $out/bin/froide \ - --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : "${python3Packages.makePythonPath dependencies}" \ --set GDAL_LIBRARY_PATH "${gdal}/lib/libgdal.so" \ --set GEOS_LIBRARY_PATH "${geos}/lib/libgeos_c.so" ''; @@ -129,6 +144,7 @@ python.pkgs.buildPythonApplication rec { checkInputs = with python.pkgs; [ beautifulsoup4 + pytest-asyncio pytest-factoryboy time-machine ]; @@ -156,6 +172,9 @@ python.pkgs.buildPythonApplication rec { "test_bouncing_email" "test_multiple_partial" "test_logfile_rotation" + # Test hangs + "test_collapsed_menu" + "test_make_request_logged_out_with_existing_account" ]; preCheck = diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index 70b2d4312217..9dec87026de7 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -34,7 +34,7 @@ zeromq, # tests - nettools, + net-tools, nixosTests, # general options @@ -218,7 +218,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; nativeCheckInputs = [ - nettools + net-tools python3.pkgs.pytest ]; diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json index bc3a9e23a5c2..104e36eb51c2 100644 --- a/pkgs/by-name/fs/fsautocomplete/deps.json +++ b/pkgs/by-name/fs/fsautocomplete/deps.json @@ -76,8 +76,8 @@ }, { "pname": "fsharp-analyzers", - "version": "0.31.0", - "hash": "sha256-PoAvaXbXsmvVw870UsnqdD20HoBHO7u4bzoaz5DXfzM=" + "version": "0.32.0", + "hash": "sha256-MnhsK5tOeexL6uQhsV4nTRz8CGbz2o8VyHwAK8x91pE=" }, { "pname": "FSharp.Analyzers.Build", @@ -86,8 +86,8 @@ }, { "pname": "FSharp.Analyzers.SDK", - "version": "0.31.0", - "hash": "sha256-ws2nu1EyEESFqui/3l4+ucATy0Ag/XjjPvLZprcbC5c=" + "version": "0.32.0", + "hash": "sha256-0mdnqvE4ltEfehzS+ylah5MSy+sXbYrKRHrNDlWvIjg=" }, { "pname": "FSharp.Compiler.Service", @@ -206,8 +206,8 @@ }, { "pname": "Ionide.Analyzers", - "version": "0.14.5", - "hash": "sha256-0bJGA3+8+FC3C6e1l4j0mrRO2uujQOf2C3Qa+JxkH3o=" + "version": "0.14.6", + "hash": "sha256-56FJUeWvxE2xbaX/qhfCN6ksiNWz7aGQySEskOnzFB0=" }, { "pname": "Ionide.KeepAChangelog.Tasks", diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix index 1729a1388f1c..ae6a2172f084 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.3"; + version = "0.78.4"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZY0sRRGTazaesHyqUe5C/l8xmo+teTS34KVXd0DnO84="; + hash = "sha256-SBNtVtPVQ+l0U+jsvSiJVdS6TR4+wZ8rScFrRKWJSX8="; }; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/fu/fusionInventory/package.nix b/pkgs/by-name/fu/fusionInventory/package.nix index f07e449bab80..f2bc200723bf 100644 --- a/pkgs/by-name/fu/fusionInventory/package.nix +++ b/pkgs/by-name/fu/fusionInventory/package.nix @@ -6,7 +6,7 @@ pciutils, usbutils, iproute2, - nettools, + net-tools, fetchFromGitHub, makeWrapper, }: @@ -86,7 +86,7 @@ perlPackages.buildPerlPackage rec { dmidecode pciutils usbutils - nettools + net-tools iproute2 ] } diff --git a/pkgs/by-name/fw/fw-fanctrl/package.nix b/pkgs/by-name/fw/fw-fanctrl/package.nix new file mode 100644 index 000000000000..172d67e7ad02 --- /dev/null +++ b/pkgs/by-name/fw/fw-fanctrl/package.nix @@ -0,0 +1,43 @@ +{ + lib, + python3Packages, + fw-ectool, + fetchFromGitHub, +}: + +python3Packages.buildPythonPackage rec { + pname = "fw-fanctrl"; + version = "1.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "TamtamHero"; + repo = "fw-fanctrl"; + tag = "v${version}"; + hash = "sha256-TDVULNb/oH66/UX20mC89NSx8YPe8mPwNCB9+phavP4="; + }; + + build-system = [ python3Packages.setuptools ]; + + dependencies = [ python3Packages.jsonschema ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ fw-ectool ]}" ]; + + postInstall = '' + mkdir -p $out/share/fw-fanctrl + install -m 644 $src/src/fw_fanctrl/_resources/config.json $out/share/fw-fanctrl/config.json + install -m 755 $src/services/system-sleep/fw-fanctrl-suspend $out/share/fw-fanctrl/fw-fanctrl-suspend + patchShebangs --build $out/share/fw-fanctrl/fw-fanctrl-suspend + substituteInPlace $out/share/fw-fanctrl/fw-fanctrl-suspend \ + --replace-fail '"%PYTHON_SCRIPT_INSTALLATION_PATH%"' $out/bin/fw-fanctrl + ''; + + meta = { + mainProgram = "fw-fanctrl"; + homepage = "https://github.com/TamtamHero/fw-fanctrl"; + description = "Simple systemd service to better control Framework Laptop's fan(s)"; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.Svenum ]; + }; +} diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 8793164a0ce7..fdd438810854 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -2,11 +2,11 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, jq, moreutils, - fetchNpmDeps, - npmHooks, + pnpm_10, nodejs, cargo-tauri, pkg-config, @@ -20,34 +20,33 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gale"; - version = "1.7.1"; + version = "1.8.6"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-OaUpyG+XdP7AIA55enPf6/viBGBBQVuNi2QxgD5EVNc="; + hash = "sha256-5xUBW9Owyeet8Jyc+7TQr6XQTbkopbJLeyI5c35iqr0="; }; postPatch = '' jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json ''; - npmDeps = fetchNpmDeps { - name = "gale-${finalAttrs.version}-npm-deps"; - inherit (finalAttrs) src; - hash = "sha256-yaPUNtlb2vMwK42u+3/rViGx6YzhYxRDJylPu++tbNs="; + pnpmDeps = pnpm_10.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-QQXP/x7AjDtUpe6h+pC6vUsIAptv1kN/1MJZjHAIdMo="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-v0/A4jUq5t61KB7NLwvsl6wR7N0UUbdVCk7nFZVTOi8="; + cargoHash = "sha256-6yWRl9WAPJoqoXm0kLfZhEf7AYD6J//FlOmDxzeknFo="; nativeBuildInputs = [ jq moreutils - npmHooks.npmConfigHook + pnpm_10.configHook nodejs cargo-tauri.hook pkg-config @@ -61,12 +60,17 @@ rustPlatform.buildRustPackage (finalAttrs: { webkitgtk_4_1 ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Lightweight Thunderstore client"; homepage = "https://github.com/Kesomannen/gale"; license = lib.licenses.gpl3Only; mainProgram = "gale"; - maintainers = with lib.maintainers; [ tomasajt ]; + maintainers = with lib.maintainers; [ + tomasajt + notohh + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 0dc0354b3745..795701f89d5c 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, - edid-decode, + v4l-utils, fetchFromGitHub, fetchpatch, meson, @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { # For `libdisplay-info` python3 hwdata - edid-decode + v4l-utils # For OpenVR cmake diff --git a/pkgs/by-name/gb/gbenchmark/package.nix b/pkgs/by-name/gb/gbenchmark/package.nix index 10bcbd52c866..f2a3303ee57d 100644 --- a/pkgs/by-name/gb/gbenchmark/package.nix +++ b/pkgs/by-name/gb/gbenchmark/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.9.1"; + version = "1.9.4"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8="; + hash = "sha256-P7wJcKkIBoWtN9FCRticpBzYbEZPq71a0iW/2oDTZRU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index 609ce18ba532..c10c88a916ca 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -268,7 +268,7 @@ stdenv.mkDerivation (finalAttrs: { filelock lxml ]; - pytestFlagsArray = [ + pytestFlags = [ "--benchmark-disable" ]; disabledTestPaths = [ diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix index cd991eb8eec6..64ee05b65a6c 100644 --- a/pkgs/by-name/ge/gemmi/package.nix +++ b/pkgs/by-name/ge/gemmi/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { "test_reading" ]; - pytestFlagsArray = [ "../tests" ]; + enabledTestPaths = [ "../tests" ]; meta = { description = "Macromolecular crystallography library and utilities"; diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix index e51346216df8..04cdb78f6650 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.19.3"; + version = "0.20.1"; format = "pyproject"; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; tag = version; - hash = "sha256-CVb6ibO5+Tp0o+nB+bo9G9OKyB4L05wN1QiB9J4bOqY="; + hash = "sha256-6lBUP+xi0owlD33TLTOlaIFBcfWTnsniK/9cQdo/ND4="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gf/gfxstream/package.nix b/pkgs/by-name/gf/gfxstream/package.nix index 48de695bb91f..8bb81731f3d4 100644 --- a/pkgs/by-name/gf/gfxstream/package.nix +++ b/pkgs/by-name/gf/gfxstream/package.nix @@ -15,25 +15,16 @@ xorg, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "gfxstream"; version = "0.1.2"; src = fetchFromGitiles { url = "https://android.googlesource.com/platform/hardware/google/gfxstream"; - rev = "a29282666c0e2fdbb2c98cfe68a7c0677163ef91"; - hash = "sha256-IYXkaHZPEYIE9KW731GN6x6yRS+FYtP1zyHcaSofhIM="; + rev = "v${finalAttrs.version}-gfxstream-release"; + hash = "sha256-AN6OpZQ2te4iVuh/kFHXzmLAWIMyuoj9FHTVicnbiPw="; }; - patches = [ - # Make libdrm an optional dependency, which is required to build on Darwin. - (fetchpatch { - url = "https://android.googlesource.com/platform/hardware/google/gfxstream/+/a8df2a3eb099b419a7b3638e68ea30b4cffb751b%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-shjeNuxtQokscCGBKEUbOPKOWRELBAnHFNj3Y5w87Nw="; - }) - ]; - # Ensure that meson can find an Objective-C compiler on Darwin. postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace meson.build \ @@ -77,4 +68,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ qyliss ]; platforms = aemu.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 73f360632092..928c4af1a0f1 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-Iuhz/kaamgMWNxilNvCRnjdTFrhSPhHpFKYllQ8OuGU="; + hash = "sha256-gqDnNIoSsCCN1BwkdfoeTMdAe5PoTNnRJE0g9XFtQak="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 21f5a7b48630..6b9b3690321b 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.176.0"; + version = "2.181.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-T14omi5NkMCrqiXF+gSi6ELEdfH4QMp7luJtuCWhGM4="; + hash = "sha256-+oDR+VSR0bGbTJIqNCe1WN1QWm+sEtMIuy/mNhumeyk="; # 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 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-0vFH4gdrtaBca1lWxm2uZ1VerP4hJEJgBQzygDbja3I="; + npmDepsHash = "sha256-vcn9vhpQlacfIxHFt8G67aB91nTr9IClvA9pb+4XFFI="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/gi/gifski/package.nix b/pkgs/by-name/gi/gifski/package.nix index eb0ee73c73a9..ca5991392321 100644 --- a/pkgs/by-name/gi/gifski/package.nix +++ b/pkgs/by-name/gi/gifski/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.33.0"; + version = "1.34.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - hash = "sha256-IjQ2PqjXhNvXknVxfphSSwQEWBuTkSxMFrbwd2trlVI="; + hash = "sha256-8EAC8YH3AIbvYdTL7HtqTL7WqztzCwvDwIVkhiqvtrQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2A7SDu9f7Tf74SAD72gCQ00Ccp3r2MaPo0qjVe3nR5s="; + cargoHash = "sha256-ZppSO3TyZBbNhG+YW71+C9kMu7ok2+kbnnCRbAKsbfs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/git-team/package.nix b/pkgs/by-name/gi/git-team/package.nix index 081c8dc5e71d..6fb27115e1a4 100644 --- a/pkgs/by-name/gi/git-team/package.nix +++ b/pkgs/by-name/gi/git-team/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - go-mockery, + go-mockery_2, installShellFiles, }: @@ -20,7 +20,7 @@ buildGoModule rec { vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A="; nativeBuildInputs = [ - go-mockery + go-mockery_2 installShellFiles ]; diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 83cd155efe1c..b6741c04df1e 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -65,6 +65,7 @@ rustPlatform.buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index 7acdc60c152d..c47db059f17f 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-jW/X8vwV47J20aa3E+WqjRL5n9H+Pb2EQwIVIg1pfug="; + hash = "sha256-9IEsoIq4cuHgcYRuGEEkx5CFHaJzp0pNTpb1pNedzCE="; }; vendorHash = "sha256-GYfK5QQH0DhoJqc4ynZBWuhhrG5t6KoGpUkZPSfWfEQ="; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 19547d81247d..48333f8312e1 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-eIvqZ9a+foYH+jXuqGz1m/4C+0Xq8mTvm7ZajKeOw58="; + fetcherVersion = 1; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 6465e144acf9..48688fa884e5 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -56,24 +56,24 @@ let pname = "gitkraken"; - version = "11.2.0"; + version = "11.2.1"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz"; - hash = "sha256-yCAxNYwjnmK0lSkH9x8Q4KoQgAWwWmCS8O81tcsqWhs="; + hash = "sha256-nxYWcw8A/lIVyjiUJOmcjmTblbxiLSxMUjo7KnlAMzs="; }; x86_64-darwin = fetchzip { url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip"; - hash = "sha256-q3sy2VxgccA/9UaX08NcNusibXYNPFzZcaNlVi2eN9E="; + hash = "sha256-7I3yAEarGGhFs/PvcqvoDx8MbJ/zEuNN/s0o357M1vc="; }; aarch64-darwin = fetchzip { url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip"; - hash = "sha256-6SxuOgfWMpaYYES+9QBwYJ4t+Go43Af0cwzs/tPVOts="; + hash = "sha256-pDPdi+cRMqhxu/84u6ojxteIi1VHfN3qy/NTruHVt8U="; }; }; diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix index 0fce21e5fa14..d80bd7c298a3 100644 --- a/pkgs/by-name/gi/gitlab/package.nix +++ b/pkgs/by-name/gi/gitlab/package.nix @@ -9,7 +9,7 @@ gitlabEnterprise ? false, lib, makeWrapper, - nettools, + net-tools, nixosTests, nodejs_20, replace, @@ -221,7 +221,7 @@ stdenv.mkDerivation { rubyEnv.bundler tzdata git - nettools + net-tools ]; patches = [ diff --git a/pkgs/by-name/gi/gitolite/package.nix b/pkgs/by-name/gi/gitolite/package.nix index 0a4b4b9a2df6..79b5169df336 100644 --- a/pkgs/by-name/gi/gitolite/package.nix +++ b/pkgs/by-name/gi/gitolite/package.nix @@ -5,7 +5,7 @@ git, lib, makeWrapper, - nettools, + net-tools, perl, nixosTests, }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - nettools + net-tools perl ]; nativeBuildInputs = [ makeWrapper ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { substituteInPlace src/lib/Gitolite/Hooks/Update.pm \ --replace /usr/bin/perl "${perl}/bin/perl" substituteInPlace src/lib/Gitolite/Setup.pm \ - --replace hostname "${nettools}/bin/hostname" + --replace hostname "${net-tools}/bin/hostname" substituteInPlace src/commands/sskm \ --replace /bin/rm "${coreutils}/bin/rm" ''; diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 233aa038d297..45e1b27165ae 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.84.2"; + version = "2.84.3"; outputs = [ "bin" @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-iOlg3ZNwV0B9YfyztFqGBwSyWSPDeuJHi4Xy7LWkAh8="; + hash = "sha256-qk+HwyJb9XyoXzIIiPdISQGheTTKNwI8O9hDWnLbhj4="; }; patches = diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix index a683021591d4..e6aef1932490 100644 --- a/pkgs/by-name/gl/glpi-agent/package.nix +++ b/pkgs/by-name/gl/glpi-agent/package.nix @@ -6,7 +6,7 @@ pciutils, usbutils, iproute2, - nettools, + net-tools, fetchFromGitHub, makeWrapper, versionCheckHook, @@ -105,7 +105,7 @@ perlPackages.buildPerlPackage rec { dmidecode pciutils usbutils - nettools + net-tools iproute2 ] } diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index 30cb241f5dec..cb6d963cf508 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; - hash = "sha256-zMV46aPoPQ3BU1c30f2gm6qVxxZ/Xl7LFfeGZUCU7tU="; + hash = "sha256-SrRG1YsQx2KDInplSHuLvbdLpQCentIwRfz6i6P7KGE="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix index 429899d4c2f9..d8b3287f780a 100644 --- a/pkgs/by-name/gn/gnome-builder/package.nix +++ b/pkgs/by-name/gn/gnome-builder/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-builder"; - version = "48.0"; + version = "48.2"; outputs = [ "out" @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; - hash = "sha256-ev6aejs8ZiF2i8RqYdaY3XiLNlP7RqcII4vcz03me6Q="; + hash = "sha256-7BKA1H6BSjE7dMuSfVoFk4BUSqD1bodVKXg5fWx0zGM="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index dcf5cf77f51e..178c1ae9b02b 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.54.3"; + version = "3.54.4"; outputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-vPZV3R3cIrwleTtoQNoZ9crXugtyJ/+WntnCUvA2qsU="; + hash = "sha256-VXOZQ+dH3LSIXqYHpMJ2fYAC9xKV4a/+pi6jb20c9ZM="; }; mesonFlags = [ diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index 3d5dc92ddb82..d190a459755f 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "48.2"; + version = "48.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-6Sh+hjSJ5fpqLFWuW+ocqRCuQBbe6zQXNiZ4sEqR7P8="; + hash = "sha256-rd40wI9AtjQRvm8dF+I1VQoAkElIceZIHDEpidf0otQ="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index 1d383b1d6cb1..7efa7375bae7 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -69,7 +69,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "48.2"; + version = "48.3"; outputs = [ "out" @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-XSbMfvymNIW33bbHo5Msoa+fqPy+OLjJnqP0qyFzpqk="; + hash = "sha256-+wID/HSFk/FOUXMmGOHwQlJf1xl2Sg/bDuP2/kE6mys="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index dda5eef005eb..475449737e09 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "48.2"; + version = "48.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-q/0wZDqGxl9IhrZ2XrO7YhXJ6gmBfWvRZcUAVokIIsk="; + hash = "sha256-Emlx6LwADdwgAXjI+sj3EU7tQt5KTiASugaz/+cH4jo="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index b49dd59173c8..cb300d5afd47 100644 --- a/pkgs/by-name/gn/gnome-user-share/package.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-user-share"; - version = "48.0"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz"; - hash = "sha256-tVgFBwGVwvZYQVuc0shbLNFOqYHWGCOlANTWK4v4OAE="; + hash = "sha256-grz9TvPqf9eyr3+6mkW0dOF03NgowcS/5/+KLvhYunc="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/gn/gnum4/loong-fix-build.patch b/pkgs/by-name/gn/gnum4/loong-fix-build.patch deleted file mode 100644 index d5243357928b..000000000000 --- a/pkgs/by-name/gn/gnum4/loong-fix-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with line number tweak, and change to generated file added as well.] -From: Sun Haiyong -Date: Tue, 31 Aug 2021 11:11:52 +0800 -Subject: [PATCH] stack-direction: Add support for loongarch CPU - -* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch, -set "sv_cv_stack_direction" to "-1" . ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -31,6 +31,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - i?86 | x86_64 | \ - i860 | \ - ia64 | \ -+ loongarch* | \ - m32r | \ - m68* | \ - m88k | \ ---- a/configure -+++ b/configure -@@ -46399,6 +46399,7 @@ else $as_nop - i?86 | x86_64 | \ - i860 | \ - ia64 | \ -+ loongarch* | \ - m32r | \ - m68* | \ - m88k | \ --- -2.17.2 - diff --git a/pkgs/by-name/gn/gnum4/package.nix b/pkgs/by-name/gn/gnum4/package.nix index 1b264ffc1290..4a096c117ec5 100644 --- a/pkgs/by-name/gn/gnum4/package.nix +++ b/pkgs/by-name/gn/gnum4/package.nix @@ -9,17 +9,15 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnum4"; - version = "1.4.19"; + version = "1.4.20"; src = fetchurl { - url = "mirror://gnu/m4/m4-${version}.tar.bz2"; - sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; + url = "mirror://gnu/m4/m4-${finalAttrs.version}.tar.bz2"; + hash = "sha256-rGmJ7l0q7YFzl4BjDMLOCX4qZUb+uWpKVNs31GoUUuQ="; }; - # https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/m4/m4-1.4.19-r1.ebuild - patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./loong-fix-build.patch; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch = @@ -35,6 +33,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Issue exists whenever NLS is disabled, and there's an upstream fix + # for GCC, but there's no good way to check whether NLS or GCC is in + # use. (Checking stdenv.cc.isGNU causes infinite recursion.) + hardeningDisable = [ "format" ]; + doCheck = false; configureFlags = [ @@ -66,4 +69,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix ++ lib.platforms.windows; }; -} +}) diff --git a/pkgs/by-name/go/go-jsonnet/package.nix b/pkgs/by-name/go/go-jsonnet/package.nix index a932b1531d97..86d3cbf00944 100644 --- a/pkgs/by-name/go/go-jsonnet/package.nix +++ b/pkgs/by-name/go/go-jsonnet/package.nix @@ -36,7 +36,6 @@ buildGoModule (finalAttrs: { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nshalman - aaronjheng ]; mainProgram = "jsonnet"; }; diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix index 99cd99afeaaa..ecc0dddaf54e 100644 --- a/pkgs/by-name/go/go-mockery/package.nix +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -1,80 +1,72 @@ { lib, - buildGoModule, # sync with go below, update to latest release + stdenv, + buildGoModule, fetchFromGitHub, - - # passthru test - go-mockery, - runCommand, - go, + versionCheckHook, + go-task, + gotestsum, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "go-mockery"; - version = "2.53.3"; + version = "3.4.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; - rev = "v${version}"; - sha256 = "sha256-X0cHpv4o6pzgjg7+ULCuFkspeff95WFtJbVHqy4LxAg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-qcK0FXtAL7kJ+dotthmnMcGa9wu97UsDKBoKy5lD2W4="; }; + proxyVendor = true; + vendorHash = "sha256-Xy2w61ATNDOZKtdekeA9NSdyJq2/eiEZ9iJ3PDSUm9Q="; + ldflags = [ "-s" "-w" - "-X" - "github.com/vektra/mockery/v${lib.versions.major version}/pkg/logging.SemVer=v${version}" + "-X github.com/vektra/mockery/v${lib.versions.major finalAttrs.version}/internal/logging.SemVer=v${finalAttrs.version}" ]; env.CGO_ENABLED = false; - proxyVendor = true; - vendorHash = "sha256-AQY4x2bLqMwHIjoKHzEm1hebR29gRs3LJN8i00Uup5o="; - subPackages = [ "." ]; - preCheck = '' - # check all paths - unset subPackages + nativeCheckInputs = [ + versionCheckHook + go-task + gotestsum + ]; - substituteInPlace ./pkg/generator_test.go --replace-fail 0.0.0-dev ${version} - substituteInPlace ./pkg/logging/logging_test.go --replace-fail v0.0 v${lib.versions.majorMinor version} + prePatch = '' + # remove test.ci's dependency on lint since we don't need it and + # it tries to use remote golangci-lint + substituteInPlace Taskfile.yml \ + --replace-fail "deps: [lint]" "" \ + --replace-fail "go run gotest.tools/gotestsum" "gotestsum" + + # patch scripts used in e2e testing + patchShebangs e2e ''; - passthru.tests = { - generateMock = - runCommand "${pname}-test" - { - nativeBuildInputs = [ go-mockery ]; - buildInputs = [ go ]; - } - '' - if [[ $(${meta.mainProgram} --version) != *"${version}"* ]]; then - echo "Error: program version does not match package version" - exit 1 - fi + checkPhase = '' + runHook preCheck - export HOME=$TMPDIR + ${ + # TestRemoteTemplates/schema_validation_OK fails only on x86_64-darwin + (lib.optionalString ( + stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86 + ) "rm -rf e2e/test_remote_templates/") + } + # run unit tests and e2e tests plus pre-gen necessary mocks + task test.ci - cat < foo.go - package main + runHook postCheck + ''; - type Foo interface { - Bark() string - } - EOF - - ${meta.mainProgram} --name Foo --dir . - - if [[ ! -f "mocks/Foo.go" ]]; then - echo "Error: mocks/Foo.go was not generated by ${pname}" - exit 1 - fi - - touch $out - ''; - }; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/mockery"; + versionCheckProgramArg = "version"; meta = { homepage = "https://github.com/vektra/mockery"; @@ -86,4 +78,4 @@ buildGoModule rec { mainProgram = "mockery"; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/go/go-mockery_2/package.nix b/pkgs/by-name/go/go-mockery_2/package.nix new file mode 100644 index 000000000000..09243bb05618 --- /dev/null +++ b/pkgs/by-name/go/go-mockery_2/package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + go-task, + gotestsum, + getent, +}: + +buildGoModule (finalAttrs: { + pname = "go-mockery_2"; + # supported upstream until 2029-12-31 + # https://vektra.github.io/mockery/latest/v3/#v2-support-lifecycle + version = "2.53.3"; + + src = fetchFromGitHub { + owner = "vektra"; + repo = "mockery"; + tag = "v${finalAttrs.version}"; + hash = "sha256-X0cHpv4o6pzgjg7+ULCuFkspeff95WFtJbVHqy4LxAg="; + }; + + proxyVendor = true; + vendorHash = "sha256-AQY4x2bLqMwHIjoKHzEm1hebR29gRs3LJN8i00Uup5o="; + + ldflags = [ + "-s" + "-w" + "-X github.com/vektra/mockery/v${lib.versions.major finalAttrs.version}/pkg/logging.SemVer=v${finalAttrs.version}" + ]; + + env.CGO_ENABLED = false; + + subPackages = [ "." ]; + + nativeCheckInputs = [ + versionCheckHook + ]; + + meta = { + homepage = "https://github.com/vektra/mockery"; + description = "Mock code autogenerator for Golang - v2"; + maintainers = with lib.maintainers; [ + fbrs + jk + ]; + mainProgram = "mockery"; + license = lib.licenses.bsd3; + }; +}) diff --git a/pkgs/by-name/go/gobetween/gomod.patch b/pkgs/by-name/go/gobetween/gomod.patch deleted file mode 100644 index 2f0fb408061f..000000000000 --- a/pkgs/by-name/go/gobetween/gomod.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/go.mod b/src/go.mod -index 3242342..795c306 100644 ---- a/src/go.mod -+++ b/src/go.mod -@@ -28,7 +28,7 @@ require ( - github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect - github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect - github.com/juju/webbrowser v1.0.0 // indirect -- github.com/lxc/lxd v0.0.0-20200706202337-814c96fcec74 -+ github.com/lxc/lxd v0.0.0-20200727014606-0d408e8e8ebb - github.com/mattn/go-colorable v0.1.7 // indirect - github.com/miekg/dns v1.1.30 - github.com/mitchellh/go-testing-interface v1.14.0 // indirect diff --git a/pkgs/by-name/go/gobetween/package.nix b/pkgs/by-name/go/gobetween/package.nix index ca795661eeee..27f5eb3f04b7 100644 --- a/pkgs/by-name/go/gobetween/package.nix +++ b/pkgs/by-name/go/gobetween/package.nix @@ -6,39 +6,47 @@ enableStatic ? stdenv.hostPlatform.isStatic, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gobetween"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "yyyar"; repo = "gobetween"; - rev = version; - sha256 = "0bxf89l53sqan9qq23rwawjkcanv9p61sw56zjqhyx78f0bh0zbc"; + tag = finalAttrs.version; + hash = "sha256-xmyqDi2q7J909cWMec9z2u0DJVJjzv86vjYkSfw/3o8="; }; - patches = [ - ./gomod.patch - ]; + vendorHash = "sha256-3jv0dSsJg90J64Ay7USkUOi8cF1Sj+A7v/snJEdJPFU="; + + env = { + CGO_ENABLED = 0; + }; buildPhase = '' + runHook preBuild + make -e build${lib.optionalString enableStatic "-static"} + + runHook postBuild ''; - vendorHash = null; - installPhase = '' + runHook preInstall + mkdir -p $out/bin cp bin/gobetween $out/bin cp -r share $out/share cp -r config $out/share + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Modern & minimalistic load balancer for the Сloud era"; homepage = "https://gobetween.io"; - license = licenses.mit; - maintainers = with maintainers; [ tomberek ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomberek ]; + mainProgram = "gobetween"; }; -} +}) diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix index 895730ce9e0a..bc9946df3589 100644 --- a/pkgs/by-name/go/gojq/package.nix +++ b/pkgs/by-name/go/gojq/package.nix @@ -47,7 +47,6 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ xiaoxiangmoe - aaronjheng ]; mainProgram = "gojq"; }; diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 95e7d9824df8..168a77c346a7 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm'.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-8dSyU9arSvISc2kDWbg/CP6L4sZjZi/Zv7TZN4ONOjQ="; + fetcherVersion = 1; }; env = { diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index 1f6c115e09ae..13d04e8a2da9 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -14,8 +14,7 @@ nlohmann_json, openssl, pkg-config, - # upstream PR to update: https://github.com/googleapis/google-cloud-cpp/pull/14974 - protobuf_29, + protobuf_31, pkgsBuildHost, # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 apis ? [ "*" ], @@ -23,24 +22,24 @@ }: let # defined in cmake/GoogleapisConfig.cmake - googleapisRev = "6a474b31c53cc1797710206824a17b364a835d2d"; + googleapisRev = "f01a17a560b4fbc888fd552c978f4e1f8614100b"; googleapis = fetchFromGitHub { name = "googleapis-src"; owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256-t5oX6Gc1WSMSBDftXA9RZulckUenxOEHBYeq2qf8jnY="; + hash = "sha256-eJA3KM/CZMKTR3l6omPJkxqIBt75mSNsxHnoC+1T4gw="; }; in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "2.29.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "sha256-gCq8Uc+s/rnJWsGlI7f+tvAZHH8K69+H/leUOKE2GCY="; + sha256 = "sha256-TF3MLBmjUbKJkZVcaPXbagXrAs3eEhlNQBjYQf0VtT8="; }; patches = [ @@ -62,7 +61,7 @@ stdenv.mkDerivation rec { grpc nlohmann_json openssl - protobuf_29 + protobuf_31 gbenchmark gtest ]; diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix index 0e45df953fb5..a4de4af4c403 100644 --- a/pkgs/by-name/go/goperf/package.nix +++ b/pkgs/by-name/go/goperf/package.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2025-06-05"; + version = "0-unstable-2025-07-10"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "b481878a17bef398145703a878ff39e5bedae345"; - hash = "sha256-jaMJhBf6uE7pKhGYU5RiHl2DpOBhZLqmZvIYZuYFGP4="; + rev = "7b7c2de18447122afb45241f2ca525b4dd19df7b"; + hash = "sha256-WUoInX/Wuq5TnDcCJWnPQtdX+2dIAFKTQdBDZyw8Z9Q="; }; - vendorHash = "sha256-r0GYVYgBoTE5Dpma5xqp7llBF9+QDgD/PfL+P01LImA="; + vendorHash = "sha256-wAHri6Tj+vDJ0vCvRngK+mdXG5tU5WVeni54gA26nDQ="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix index 51d63e78d187..86f7c5e9ea79 100644 --- a/pkgs/by-name/gr/gr-framework/package.nix +++ b/pkgs/by-name/gr/gr-framework/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "GR framework is a graphics library for visualisation applications"; homepage = "https://gr-framework.org"; license = licenses.mit; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index 556a3ae4c714..0d5df0db0002 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, + fetchurl, buildPackages, cmake, zlib, @@ -25,7 +26,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.72.0"; # N.B: if you change this, please update: + version = "1.73.1"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -38,19 +39,28 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-3ZFQ59zoxNlS5tdm5Bt8EyKyp+9HEpYvLlWarErIR6g="; + hash = "sha256-VAr+f+xqZfrP4XfCnZ9KxVTO6pHQe9gB2DgaQuen840="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - # armv6l support, https://github.com/grpc/grpc/pull/21341 - name = "grpc-link-libatomic.patch"; - url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; - hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; - }) - # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654 - ] ++ (lib.optional stdenv.hostPlatform.isDarwin ./dynamic-lookup-darwin.patch); + patches = + [ + (fetchpatch { + # armv6l support, https://github.com/grpc/grpc/pull/21341 + name = "grpc-link-libatomic.patch"; + url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; + hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654 + ./dynamic-lookup-darwin.patch + # https://github.com/grpc/grpc/issues/39170 + (fetchurl { + url = "https://raw.githubusercontent.com/rdhafidh/vcpkg/0ae97b7b81562bd66ab99d022551db1449c079f9/ports/grpc/00017-add-src-upb.patch"; + hash = "sha256-0zaJqeCM90DTtUR6xCUorahUpiJF3D/KODYkUXQh2ok="; + }) + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix index 2678e192a375..6c3d41f31be4 100644 --- a/pkgs/by-name/gt/gtest/package.nix +++ b/pkgs/by-name/gt/gtest/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, cmake, ninja, + sanitiseHeaderPathsHook, # Enable C++17 support # https://github.com/google/googletest/issues/3081 # Projects that require a higher standard can override this package. @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.16.0"; + version = "1.17.0"; outputs = [ "out" @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "googletest"; rev = "v${version}"; - hash = "sha256-01PK9LxqHno89gypd7ze5gDP4V3en2J5g6JZRqohDB0="; + hash = "sha256-HIHMxAUR4bjmFLoltJeIAVSulVQ6kVuIT2Ku+lwAx/4="; }; patches = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja + sanitiseHeaderPathsHook ]; cmakeFlags = diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix index b2dcd36565c2..0831f4c4d86f 100644 --- a/pkgs/by-name/gu/gui-for-clash/package.nix +++ b/pkgs/by-name/gu/gui-for-clash/package.nix @@ -44,6 +44,7 @@ let inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/frontend"; hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc="; + fetcherVersion = 1; }; sourceRoot = "${finalAttrs.src.name}/frontend"; diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index a7480d64ee4e..fae5157c6005 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -46,6 +46,7 @@ let inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/frontend"; hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc="; + fetcherVersion = 1; }; sourceRoot = "${finalAttrs.src.name}/frontend"; diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix index 571fd8408252..7c64ef08745f 100644 --- a/pkgs/by-name/gu/gumbo/package.nix +++ b/pkgs/by-name/gu/gumbo/package.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "gumbo"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "gumbo-parser"; repo = "gumbo-parser"; rev = version; - hash = "sha256-QpGOBKNPBryCXZKKEQMv9TXJiNyXESBFiR4wM0lmjiI="; + hash = "sha256-QNzllJI0ZHRl8o3ktJq+rI8v4SUUJ3MJ6uIubqf1heI="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/gv/gvpe/package.nix b/pkgs/by-name/gv/gvpe/package.nix index cca9f556a2d5..d67e119fefac 100644 --- a/pkgs/by-name/gv/gvpe/package.nix +++ b/pkgs/by-name/gv/gvpe/package.nix @@ -6,7 +6,7 @@ gmp, zlib, iproute2, - nettools, + net-tools, pkg-config, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set dev $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C - sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C + sed -e 's@/sbin/ifconfig@${net-tools}/sbin/ifconfig@g' -i src/device-*.C ''; meta = with lib; { diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index d2a694d0285c..ef8fabdf6e59 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.21.2"; + version = "2.21.3"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-XYzk989eaOXU81EWUbwhLl6Fy30dbLhn4/x2wJ4I4ac="; + hash = "sha256-l5tD9QIQfuRXG6hxP2ensb3SeX/A7F/xx694rQKUUrI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/hans/package.nix b/pkgs/by-name/ha/hans/package.nix index 8314ef012ef2..fb73c3e09533 100644 --- a/pkgs/by-name/ha/hans/package.nix +++ b/pkgs/by-name/ha/hans/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - nettools, + net-tools, }: stdenv.mkDerivation rec { @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { owner = "friedrich"; }; - buildInputs = [ nettools ]; + buildInputs = [ net-tools ]; postPatch = '' - substituteInPlace src/tun.cpp --replace "/sbin/" "${nettools}/bin/" + substituteInPlace src/tun.cpp --replace "/sbin/" "${net-tools}/bin/" ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index 389c0fb29ecc..774c8ee3b82b 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.2.1"; + version = "3.2.3"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-uz+Wenl8iFHQhoPsQ9+v5K179a2G+msHIcrQM+qeWuU="; + hash = "sha256-r472Qoa93ckyMsXb5OpDaozLXchBfPoeiFvsUohPk0c="; }; buildInputs = diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix index 9ce59acc5731..92f3eb567c3c 100644 --- a/pkgs/by-name/ha/harfbuzz/package.nix +++ b/pkgs/by-name/ha/harfbuzz/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "10.2.0"; + version = "11.2.1"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-Yg40aPrsLqhoXTLEalhGm4UO9jBAs1Zc3gWVmCW0gic="; + hash = "sha256-CTcUyFSKKFCUaF8L3JmeIC1ma1nus98v+SGraLgzakk="; }; postPatch = diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index bd16e0652546..dcb1fe770445 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.47.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-kVZG3Vfe+PABhrXY26AUlBxrpiL9UtmIka84s0yvsXI="; + hash = "sha256-vhaIDzjOG43+zxJU1BTPNPTmbDkLqFo0NRfvYcJSvSo="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-M6HdwQZanMxTvDdw0giycoSJmaMVfGI8Vg9NjdYJaak="; + cargoHash = "sha256-6f8zJyz36Da7OvqWBE1w5IsRa8dNulSxLrQiTqjEbKo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix index 675e5247256b..c17c963e3097 100644 --- a/pkgs/by-name/hd/hdr10plus/package.nix +++ b/pkgs/by-name/hd/hdr10plus/package.nix @@ -23,12 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "dev" ]; - inherit (hdr10plus_tool) - src - useFetchCargoVendor - cargoDeps - cargoHash - ; + inherit (hdr10plus_tool) src cargoDeps cargoHash; nativeBuildInputs = [ cargo-c ]; buildInputs = [ fontconfig ]; diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix index 64ecfeefe2ae..7a29147156ca 100644 --- a/pkgs/by-name/he/herbstluftwm/package.nix +++ b/pkgs/by-name/he/herbstluftwm/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { export PYTHONPATH="$PYTHONPATH:../python" ''; - pytestFlagsArray = [ "../tests" ]; + enabledTestPaths = [ "../tests" ]; disabledTests = [ "test_autostart" # $PATH problems "test_wmexec_to_other" # timeouts in sandbox diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index 1722a58ebafa..d5dca60dbe20 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-9WCIdQ91IU8pfq6kpbmmn6APBTNwpCi9ovgRuWYUad8="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/heroic/package.nix b/pkgs/by-name/he/heroic/package.nix index 6ffb8e0fc6c7..d8218c4a94ae 100644 --- a/pkgs/by-name/he/heroic/package.nix +++ b/pkgs/by-name/he/heroic/package.nix @@ -28,7 +28,7 @@ buildFHSEnv { zenity kdePackages.kdialog mangohud - nettools + net-tools opencl-headers p7zip pciutils diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index a0de686dfb10..039d6c1489d6 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-07-02"; + version = "0-unstable-2025-07-11"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "89af52d9a893af013f5f4c1d2d56912106827153"; - hash = "sha256-ENTd/sd4Vz/VJYn14SVqW1OH2m7WIAvsm9A9SrmDZRY="; + rev = "392ddb642abec771d63688c49fa7bcbb9d2a5717"; + hash = "sha256-A4nftqiNz2bNihz0bKY94Hq/6ydR6UQOcGioeL7iymY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 951a2f8a29d6..d2e40a060116 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -39,6 +39,7 @@ buildGo123Module { inherit pname version; src = "${src}/frontend"; hash = "sha256-6Q+tIY5dl5jCQyv1F8btLdJg0oEUGs0Wyu/joVdVhf8="; + fetcherVersion = 1; }; pnpmRoot = "../frontend"; diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index b48cb98ebe58..95e0091061b4 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { patches ; hash = "sha256-aPkXHKG3vDsfYqYx9q9+2wZhuFqmPcXdoBqOfAvW9oA="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix index b25aa33f9143..0eb47d64454f 100644 --- a/pkgs/by-name/ho/homer/package.nix +++ b/pkgs/by-name/ho/homer/package.nix @@ -26,6 +26,7 @@ stdenvNoCC.mkDerivation rec { patches ; hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y="; + fetcherVersion = 1; }; # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable. diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index 1971ae3c4882..c5ec5f4711b4 100644 --- a/pkgs/by-name/ho/houdini/package.nix +++ b/pkgs/by-name/ho/houdini/package.nix @@ -38,7 +38,7 @@ buildFHSEnv { tbb xwayland qt5.qtwayland - nettools # needed by licensing tools + net-tools # needed by licensing tools bintools # needed for ld and other tools, so ctypes can find/load sos from python ocl-icd # needed for opencl numactl # needed by hfs ocl backend diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index 12ace2d35cbc..286ba7d49f04 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -20,7 +20,7 @@ net-snmp, openssl, perl, - nettools, + net-tools, avahi, bash, util-linux, @@ -141,7 +141,7 @@ python3Packages.buildPythonApplication { "--prefix" "PATH" ":" - "${nettools}/bin" + "${net-tools}/bin" ]; patches = [ diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 7e5fcefabac6..d73afb063612 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.147.9"; + version = "0.148.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-rTEtllENG33jAAgROjQrOjd4FKpe8uYAi3VLMII71SM="; + hash = "sha256-EGga3tSaq+95s+3iamiCZ0qfdLE6Nw3hhZ7t54OIRjU="; }; - vendorHash = "sha256-lSTSzQFR1JpGb8iYWyL/UM0W/AmFvFAcvi3+pJAJOws="; + vendorHash = "sha256-vckvhw1kpcI2SXSNjUR6u5o21qz9ZcWw+namDglpwxc="; checkFlags = let diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index 8f4966a9bd86..84a8760a8a97 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.396"; + version = "0.397"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${finalAttrs.version}"; - hash = "sha256-fn+Dcl7R3PADoTuilSQrXFBnXQM1c66jliTc0G89RIQ="; + hash = "sha256-+sspONNszkXVl357Gs40AYvppIYFvlaeVMuei9gpLLU="; }; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 3feeeed41fb1..1e5c1d91ab9b 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -131,6 +131,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; version = "0-unstable-2025-06-15"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "NixOS"; diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index 448a2e85dc2f..3872937acfa2 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprwayland-scanner"; rev = "v${finalAttrs.version}"; - hash = "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4="; + hash = "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index f727f2b2aeda..f3f4a9d390b5 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "infrastructure-agent"; - version = "1.65.1"; + version = "1.65.3"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = version; - hash = "sha256-OHL0H2OCPd5+HenF63/ndWYkdlufrG31Xlb9Sv9EP6g="; + hash = "sha256-T87ET+rKGqEEmVujJMkHlgA29cYK+yQ7K+JTICwT57s="; }; vendorHash = "sha256-eZtO+RFw+yUjIQ03y0NOiHIFLcwEwWu5A+7wsaraCCQ="; diff --git a/pkgs/by-name/in/inih/package.nix b/pkgs/by-name/in/inih/package.nix index bdc673ccbef1..f3e0fdeaa4e5 100644 --- a/pkgs/by-name/in/inih/package.nix +++ b/pkgs/by-name/in/inih/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "inih"; - version = "58"; + version = "60"; src = fetchFromGitHub { owner = "benhoyt"; repo = "inih"; rev = "r${version}"; - hash = "sha256-b2f6hQvkmWgni/zdfv3I1b9ypd7zSyEBv/JVBA6K7/w="; + hash = "sha256-6U6/b7J4dGFwVPw31Vl+BEDrN2ygK43Hb344Uk8NdFs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index fb8d7e48ea60..d467ca283448 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -10,6 +10,8 @@ ruby, validatePkgConfig, testers, + unity-test, + ctestCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -19,56 +21,57 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "iniparser"; repo = "iniparser"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-z10S9ODLprd7CbL5Ecgh7H4eOwTetYwFXiWBUm6fIr4="; }; - patches = lib.optionals finalAttrs.finalPackage.doCheck [ - (replaceVars ./remove-fetchcontent-usage.patch { - # Do not let cmake's fetchContent download unity - unitySrc = symlinkJoin { - paths = [ - (fetchFromGitHub { - owner = "throwtheswitch"; - repo = "unity"; - rev = "v2.6.0"; - hash = "sha256-SCcUGNN/UJlu3ALJiZ9bQKxYRZey3cm9QG+NOehp6Ow="; - }) - ]; - postBuild = '' - ln -s ${finalAttrs.src}/test/unity_config.h $out/src/unity_config.h - ''; - }; - }) - ]; + patches = lib.optional finalAttrs.doCheck ( + # 1. Do not fetch the Unity GitHub repository + # 2. Lookup the Unity pkgconfig file + # 3. Get the generate_test_runner.rb file from the Unity share directory + replaceVars ./remove-fetchcontent-usage.patch { + # Get the test generator + UNITY-GENERATE-TEST-RUNNER = "${unity-test}/share/generate_test_runner.rb"; + } + ); nativeBuildInputs = [ cmake doxygen validatePkgConfig - ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ ruby ]; + ]; - cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; - - doCheck = false; + cmakeFlags = [ + (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + ]; + doCheck = true; + nativeCheckInputs = [ + ruby + ctestCheckHook + ]; + checkInputs = [ + ( + (unity-test.override { + supportDouble = true; + }).overrideAttrs + { + doCheck = false; + } + ) + ]; postFixup = '' ln -sv $out/include/iniparser/*.h $out/include/ ''; - passthru.tests = { - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - iniparser-with-tests = finalAttrs.overrideAttrs (_: { - doCheck = true; - }); - }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { homepage = "https://gitlab.com/iniparser/iniparser"; description = "Free standalone ini file parsing library"; changelog = "https://gitlab.com/iniparser/iniparser/-/releases/v${finalAttrs.version}"; - license = licenses.mit; - platforms = platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; pkgConfigModules = [ "iniparser" ]; maintainers = [ ]; }; diff --git a/pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch b/pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch index db96c37e6b2c..16c24385cd48 100644 --- a/pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch +++ b/pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch @@ -1,17 +1,52 @@ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index b28d151..33a6bcf 100644 +index 0735d27..32c5cdb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt -@@ -28,10 +28,8 @@ set(FETCHCONTENT_QUIET OFF) +@@ -26,16 +26,8 @@ endif() - FetchContent_Declare( - unity + set(FETCHCONTENT_QUIET OFF) + +-FetchContent_Declare( +- unity - GIT_REPOSITORY "https://github.com/throwtheswitch/unity.git" - GIT_PROGRESS TRUE - PATCH_COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_LIST_DIR}/unity_config.h ./src/) -+ SOURCE_DIR @unitySrc@ -+) +- +-FetchContent_MakeAvailable(unity) +-target_compile_definitions(unity PUBLIC UNITY_INCLUDE_CONFIG_H +- UNITY_USE_COMMAND_LINE_ARGS) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(UNITY REQUIRED unity) + + function(create_test_runner) + set(options) +@@ -52,7 +44,7 @@ function(create_test_runner) + add_custom_command( + OUTPUT test_${TEST_RUNNER_NAME}_runner.c + COMMAND +- ${RUBY_EXECUTABLE} ${unity_SOURCE_DIR}/auto/generate_test_runner.rb ++ @UNITY-GENERATE-TEST-RUNNER@ + ${CMAKE_CURRENT_SOURCE_DIR}/test_${TEST_RUNNER_NAME}.c + test_${TEST_RUNNER_NAME}_runner.c ${CMAKE_CURRENT_LIST_DIR}/unity-config.yml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/test_${TEST_RUNNER_NAME}.c +@@ -62,10 +54,18 @@ function(create_test_runner) + test_${TEST_RUNNER_NAME}_runner.c) + foreach(TARGET_TYPE ${TARGET_TYPES}) + # if BUILD_STATIC_LIBS=ON shared takes precedence ++ target_include_directories( ++ test_${TEST_RUNNER_NAME} ++ PUBLIC ++ ${UNITY_INCLUDE_DIRS}) ++ target_compile_options( ++ test_${TEST_RUNNER_NAME} ++ PUBLIC ++ ${UNITY_CFLAGS_OTHER}) + target_link_libraries( + test_${TEST_RUNNER_NAME} + ${PROJECT_NAME}-${TARGET_TYPE} +- unity) ++ ${UNITY_LIBRARIES}) + endforeach() + endfunction() - FetchContent_MakeAvailable(unity) - target_compile_definitions(unity PUBLIC UNITY_INCLUDE_CONFIG_H) diff --git a/pkgs/by-name/io/iodine/package.nix b/pkgs/by-name/io/iodine/package.nix index 683708af9ebc..081c65318655 100644 --- a/pkgs/by-name/io/iodine/package.nix +++ b/pkgs/by-name/io/iodine/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, zlib, - nettools, + net-tools, nixosTests, }: @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib ]; - env.NIX_CFLAGS_COMPILE = ''-DIFCONFIGPATH="${nettools}/bin/" -DROUTEPATH="${nettools}/bin/"''; + env.NIX_CFLAGS_COMPILE = ''-DIFCONFIGPATH="${net-tools}/bin/" -DROUTEPATH="${net-tools}/bin/"''; installFlags = [ "prefix=\${out}" ]; diff --git a/pkgs/by-name/io/ios-safari-remote-debug/package.nix b/pkgs/by-name/io/ios-safari-remote-debug/package.nix index 216c4ed15cdd..47f3f6d973ad 100644 --- a/pkgs/by-name/io/ios-safari-remote-debug/package.nix +++ b/pkgs/by-name/io/ios-safari-remote-debug/package.nix @@ -35,6 +35,6 @@ buildGoModule rec { homepage = "https://git.gay/besties/ios-safari-remote-debug"; license = lib.licenses.agpl3Plus; mainProgram = "ios-safari-remote-debug"; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 416af017b6cd..82595e3be187 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -74,9 +74,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/google/ios-webkit-debug-proxy/releases/tag/${finalAttrs.src.rev}"; license = licenses.bsd3; mainProgram = "ios_webkit_debug_proxy"; - maintainers = with maintainers; [ - abustany - paveloom - ]; + maintainers = with maintainers; [ abustany ]; }; }) diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index 51e77c023f7d..0355f71c7c9a 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.14.0"; + version = "6.15.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-ptI1iBUAllkcPQD8J6MkqC7nHXoanup4313xetm4Rh8="; + hash = "sha256-gEGFSoglg61SY0ZnNsnIxox0saNXVKt3DSM0P5R1KPs="; }; patches = [ diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index 82dae0ed306a..556f71b15b68 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -4,7 +4,7 @@ fetchurl, fetchFromGitHub, coreutils, - nettools, + net-tools, java, scala_3, polyml, @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { veriT vampire' eprover-ho - nettools + net-tools ]; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ procps ]; diff --git a/pkgs/by-name/is/isocodes/package.nix b/pkgs/by-name/is/isocodes/package.nix index 297f40d1b70c..68c43ab4be2a 100644 --- a/pkgs/by-name/is/isocodes/package.nix +++ b/pkgs/by-name/is/isocodes/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "iso-codes"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { url = with finalAttrs; "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-3VyhPbd+xt0cwl9cAYQpCocOwf7SRdjjmgT/NPWQdsM="; + hash = "sha256-UR9nv0tRqnfxfEWtv/UzJCtQ8eNw/kmlcGtjQZAvrIc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/it/it-tools/package.nix b/pkgs/by-name/it/it-tools/package.nix index 75bba8012aaa..7c8bb989875a 100644 --- a/pkgs/by-name/it/it-tools/package.nix +++ b/pkgs/by-name/it/it-tools/package.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm_8.fetchDeps { inherit pname version src; hash = "sha256-m1eXBE5rakcq8NGnPC9clAAvNJQrN5RuSQ94zfgGZxw="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index a9e9de15e9ab..1ac509621df1 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "jellyfin-tui"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "dhonus"; repo = "jellyfin-tui"; tag = "v${version}"; - hash = "sha256-ECMZ8sWzX/aZK0N8zGz5dMCndVVxwkZW/qSvmHu+87Q="; + hash = "sha256-gT6Zs32BhSfwH+JjwJcY9wK7WrqGuaWP+q/2rF8gp4M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rOKgaEDfOZfVuwMnp81Kd/mq0o0SkQD2lVNLubUq1HQ="; + cargoHash = "sha256-U298pYDYzaRdU5w3FWHMkgaCT15aUTZITroVcEJ1Q0w="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/je/jellyflix/package.nix b/pkgs/by-name/je/jellyflix/package.nix index 5a2b86e90494..15a20de0fa00 100644 --- a/pkgs/by-name/je/jellyflix/package.nix +++ b/pkgs/by-name/je/jellyflix/package.nix @@ -1,23 +1,32 @@ { lib, - flutter327, + stdenv, + flutter332, fetchFromGitHub, makeDesktopItem, copyDesktopItems, + alsa-lib, mpv-unwrapped, }: -flutter327.buildFlutterApplication rec { +flutter332.buildFlutterApplication rec { pname = "jellyflix"; - version = "1.0.0"; + version = "1.4.886"; src = fetchFromGitHub { owner = "jellyflix-app"; repo = "jellyflix"; tag = version; - hash = "sha256-jqMjKpUOcL4hElEWM1mrQaoraZPj0aUNt2hGLw39inc="; + hash = "sha256-1kQIHUHDRKuJbqrYo40vjmcxSTPEi5uVUSi2MCKk6qA="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; + postPatch = '' + substituteInPlace lib/services/api_service.dart \ + --replace-fail "} on DioException catch (_) { + return _.response!.statusCode ?? 400;" "} on DioException catch (e) { + return e.response!.statusCode ?? 400;" + ''; + postInstall = '' install -Dm644 $src/assets/icon/icon.png $out/share/icons/hicolor/scalable/apps/jellyflix.png ''; @@ -27,21 +36,51 @@ flutter327.buildFlutterApplication rec { ]; buildInputs = [ + alsa-lib mpv-unwrapped ]; - gitHashes = { - filter_list = "sha256-/KgFLeoBTC3yq77esDqXwqP97+BcO3msYKki86OJEj0="; - tentacle = "sha256-30a4Vn8wL0TdboSYPm1W+hRqXSsuID0gNOVnNe3KmPE="; - media_kit = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM="; - media_kit_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM="; - media_kit_libs_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM="; - media_kit_libs_android_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM="; - media_kit_libs_ios_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM="; - media_kit_libs_macos_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM="; - media_kit_libs_windows_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM="; + customSourceBuilders = { + volume_controller = + { version, src, ... }: + stdenv.mkDerivation { + pname = "volume_controller"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + substituteInPlace linux/CMakeLists.txt \ + --replace-fail '# ALSA dependency for volume control' 'find_package(PkgConfig REQUIRED)' \ + --replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)' + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r ./* $out/ + + runHook postInstall + ''; + }; }; + gitHashes = + let + media_kit-hash = "sha256-8dIiEeeBQOGST9kGHSp15Cdg377AQeBynbvWPAnGbJc="; + in + { + filter_list = "sha256-cYnsujNMC6n9hZNHcbOevXWh54+jPeuHEUbdt1mDgP8="; + tentacle = "sha256-30a4Vn8wL0TdboSYPm1W+hRqXSsuID0gNOVnNe3KmPE="; + media_kit = media_kit-hash; + media_kit_video = media_kit-hash; + media_kit_libs_video = media_kit-hash; + media_kit_libs_android_video = media_kit-hash; + media_kit_libs_ios_video = media_kit-hash; + media_kit_libs_macos_video = media_kit-hash; + media_kit_libs_windows_video = media_kit-hash; + }; + desktopItems = [ (makeDesktopItem { name = "jellyflix"; diff --git a/pkgs/by-name/je/jellyflix/pubspec.lock.json b/pkgs/by-name/je/jellyflix/pubspec.lock.json index 506219f3e999..598b04d1b91d 100644 --- a/pkgs/by-name/je/jellyflix/pubspec.lock.json +++ b/pkgs/by-name/je/jellyflix/pubspec.lock.json @@ -4,27 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", "url": "https://pub.dev" }, "source": "hosted", - "version": "72.0.0" + "version": "76.0.0" }, "_macros": { "dependency": "transitive", "description": "dart", "source": "sdk", - "version": "0.3.2" + "version": "0.3.3" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.7.0" + "version": "6.11.0" }, "analyzer_plugin": { "dependency": "transitive", @@ -40,101 +40,101 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.7" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "async": { "dependency": "direct main", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.13.0" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { "dependency": "transitive", "description": { "name": "build", - "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "build_config": { - "dependency": "transitive", - "description": { - "name": "build_config", - "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "build_daemon": { - "dependency": "transitive", - "description": { - "name": "build_daemon", - "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "build_resolvers": { - "dependency": "transitive", - "description": { - "name": "build_resolvers", - "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", "url": "https://pub.dev" }, "source": "hosted", "version": "2.4.2" }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.13" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.2" + "version": "8.0.0" }, "built_collection": { "dependency": "direct main", @@ -150,11 +150,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "cached_network_image": { "dependency": "direct main", @@ -190,11 +190,11 @@ "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -230,11 +230,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", @@ -250,21 +250,21 @@ "dependency": "transitive", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.1" }, "connectivity_plus": { "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d", + "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.1" + "version": "6.1.4" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -296,6 +296,16 @@ "source": "hosted", "version": "3.0.6" }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, "custom_lint": { "dependency": "direct dev", "description": { @@ -330,21 +340,21 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.7" + "version": "2.3.8" }, "dbus": { "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "device_info_plus": { "dependency": "direct main", @@ -370,51 +380,51 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0+1" }, "dio_web_adapter": { "dependency": "transitive", "description": { "name": "dio_web_adapter", - "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.1" }, "dots_indicator": { "dependency": "direct main", "description": { "name": "dots_indicator", - "sha256": "58b6a365744aa62aa1b70c4ea29e5106fbe064f5edaf7e9652e9b856edbfd9bb", + "sha256": "2a53e0321a3f0d87e38ef30f6e9ff1deb5d6c0e2c5708e057d26cdaa94a95f10", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.1.0" }, "fake_async": { "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.3" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", @@ -426,12 +436,22 @@ "source": "hosted", "version": "7.0.1" }, + "file_saver": { + "dependency": "direct main", + "description": { + "name": "file_saver", + "sha256": "017a127de686af2d2fbbd64afea97052d95f2a0f87d19d25b87e097407bf9c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.14" + }, "filter_list": { "dependency": "direct main", "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "e0d861d51682f5d6080227b20f201a8f85395377", + "resolved-ref": "4a7510a8cc183c7a72973f6bc7b1ba8fda3717fb", "url": "https://github.com/TheAlphamerc/filterlist.git" }, "source": "git", @@ -477,11 +497,11 @@ "dependency": "direct main", "description": { "name": "flutter_downloader", - "sha256": "b6da5495b6258aa7c243d0f0a5281e3430b385bccac11cc508f981e653b25aa6", + "sha256": "93a9ddbd561f8a3f5483b4189453fba145a0a1014a88143c96a966296b78a118", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.8" + "version": "1.12.0" }, "flutter_hooks": { "dependency": "direct main", @@ -533,21 +553,21 @@ "dependency": "direct main", "description": { "name": "flutter_secure_storage", - "sha256": "1913841ac4c7bf57cd2e05b717e1fbff7841b542962feff827b16525a781b3e4", + "sha256": "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.3" + "version": "9.2.4" }, "flutter_secure_storage_linux": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_linux", - "sha256": "bf7404619d7ab5c0a1151d7c4e802edad8f33535abfbeff2f9e1fe1274e2d705", + "sha256": "be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.2.3" }, "flutter_secure_storage_macos": { "dependency": "transitive", @@ -601,6 +621,16 @@ "source": "sdk", "version": "0.0.0" }, + "flutter_widget_from_html_core": { + "dependency": "direct main", + "description": { + "name": "flutter_widget_from_html_core", + "sha256": "b1048fd119a14762e2361bd057da608148a895477846d6149109b2151d2f7abf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.2" + }, "freezed_annotation": { "dependency": "transitive", "description": { @@ -625,11 +655,11 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "go_router": { "dependency": "direct main", @@ -695,21 +725,31 @@ "dependency": "transitive", "description": { "name": "hotreloader", - "sha256": "ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e", + "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.3.0" + }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.6" }, "http": { "dependency": "transitive", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.4.0" }, "http_multi_server": { "dependency": "transitive", @@ -725,31 +765,31 @@ "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.2" }, "image": { "dependency": "transitive", "description": { "name": "image", - "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.4" }, "intl": { "dependency": "direct main", "description": { "name": "intl", - "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.19.0" + "version": "0.20.2" }, "io": { "dependency": "transitive", @@ -765,11 +805,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "json_annotation": { "dependency": "transitive", @@ -785,21 +825,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "10.0.9" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -845,21 +885,31 @@ "dependency": "transitive", "description": { "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2-main.4" + "version": "0.1.3-main.0" + }, + "markdown": { + "dependency": "direct main", + "description": { + "name": "markdown", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.0" }, "matcher": { "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -876,29 +926,29 @@ "description": { "path": "media_kit", "ref": "main", - "resolved-ref": "443c5311156d2996abe68bb68c561c9f2494cf23", + "resolved-ref": "e95d9f7c75f5c456d05370ced9b0a00db9b5a5d8", "url": "https://github.com/jellyflix-app/media-kit.git" }, "source": "git", - "version": "1.1.11" + "version": "1.2.0" }, "media_kit_libs_android_video": { "dependency": "direct overridden", "description": { "path": "libs/android/media_kit_libs_android_video", "ref": "main", - "resolved-ref": "443c5311156d2996abe68bb68c561c9f2494cf23", + "resolved-ref": "e95d9f7c75f5c456d05370ced9b0a00db9b5a5d8", "url": "https://github.com/jellyflix-app/media-kit.git" }, "source": "git", - "version": "1.3.6" + "version": "1.3.7" }, "media_kit_libs_ios_video": { "dependency": "direct overridden", "description": { "path": "libs/ios/media_kit_libs_ios_video", "ref": "main", - "resolved-ref": "443c5311156d2996abe68bb68c561c9f2494cf23", + "resolved-ref": "e95d9f7c75f5c456d05370ced9b0a00db9b5a5d8", "url": "https://github.com/jellyflix-app/media-kit.git" }, "source": "git", @@ -908,18 +958,18 @@ "dependency": "transitive", "description": { "name": "media_kit_libs_linux", - "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.2.1" }, "media_kit_libs_macos_video": { "dependency": "direct overridden", "description": { "path": "libs/macos/media_kit_libs_macos_video", "ref": "main", - "resolved-ref": "443c5311156d2996abe68bb68c561c9f2494cf23", + "resolved-ref": "e95d9f7c75f5c456d05370ced9b0a00db9b5a5d8", "url": "https://github.com/jellyflix-app/media-kit.git" }, "source": "git", @@ -930,43 +980,43 @@ "description": { "path": "libs/universal/media_kit_libs_video", "ref": "main", - "resolved-ref": "443c5311156d2996abe68bb68c561c9f2494cf23", + "resolved-ref": "e95d9f7c75f5c456d05370ced9b0a00db9b5a5d8", "url": "https://github.com/jellyflix-app/media-kit.git" }, "source": "git", - "version": "1.0.5" + "version": "1.0.6" }, "media_kit_libs_windows_video": { "dependency": "direct overridden", "description": { "path": "libs/windows/media_kit_libs_windows_video", "ref": "main", - "resolved-ref": "443c5311156d2996abe68bb68c561c9f2494cf23", + "resolved-ref": "e95d9f7c75f5c456d05370ced9b0a00db9b5a5d8", "url": "https://github.com/jellyflix-app/media-kit.git" }, "source": "git", - "version": "1.0.10" + "version": "1.0.11" }, "media_kit_video": { "dependency": "direct main", "description": { "path": "media_kit_video", "ref": "main", - "resolved-ref": "443c5311156d2996abe68bb68c561c9f2494cf23", + "resolved-ref": "e95d9f7c75f5c456d05370ced9b0a00db9b5a5d8", "url": "https://github.com/jellyflix-app/media-kit.git" }, "source": "git", - "version": "1.2.5" + "version": "1.3.0" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", @@ -1022,41 +1072,41 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.2" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.2.0" }, "path": { "dependency": "transitive", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_provider": { "dependency": "direct main", @@ -1072,11 +1122,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.17" }, "path_provider_foundation": { "dependency": "transitive", @@ -1122,31 +1172,31 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "11.4.0" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "12.1.0" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.7" }, "permission_handler_html": { "dependency": "transitive", @@ -1162,11 +1212,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1182,11 +1232,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "platform": { "dependency": "transitive", @@ -1222,31 +1272,31 @@ "dependency": "transitive", "description": { "name": "posix", - "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "6.0.2" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "quiver": { "dependency": "transitive", @@ -1332,57 +1382,57 @@ "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c", + "sha256": "6ba1b5812f66c64e9e4892be2d36ecd34210f4e0da8bdec6a2ea34f1aa42683e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.1" }, "screen_brightness_platform_interface": { "dependency": "transitive", "description": { "name": "screen_brightness_platform_interface", - "sha256": "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b", + "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "shelf": { "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_web_socket": { "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "skeletonizer": { "dependency": "direct main", "description": { "name": "skeletonizer", - "sha256": "ff4c36e826efd5288d7a84e7619a6e9be8185d3064cecf101a9133762f3b401b", + "sha256": "a9ddf63900947f4c0648372b6e9987bc2b028db9db843376db6767224d166c31", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.0" + "version": "2.0.1" }, "sky_engine": { "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "source_gen": { "dependency": "transitive", @@ -1408,11 +1458,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1428,41 +1478,41 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "sqflite_android": { "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", + "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+6" + "version": "2.5.5" }, "sqflite_darwin": { "dependency": "transitive", "description": { "name": "sqflite_darwin", - "sha256": "96a698e2bc82bd770a4d6aab00b42396a7c63d9e33513a56945cbccb594c2474", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "sqflite_platform_interface": { "dependency": "transitive", @@ -1478,11 +1528,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.1" }, "state_notifier": { "dependency": "transitive", @@ -1498,11 +1548,11 @@ "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", @@ -1518,21 +1568,21 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.4.1" }, "synchronized": { "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "tentacle": { "dependency": "direct main", @@ -1549,21 +1599,21 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.4" }, "timing": { "dependency": "transitive", @@ -1639,21 +1689,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.16" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -1689,21 +1739,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.1" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "uuid": { "dependency": "transitive", @@ -1729,41 +1779,41 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "15.0.0" }, "volume_controller": { "dependency": "transitive", "description": { "name": "volume_controller", - "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "sha256": "d75039e69c0d90e7810bfd47e3eedf29ff8543ea7a10392792e81f9bded7edf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "3.4.0" }, "wakelock_plus": { "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.3.2" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", + "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.2.3" }, "watcher": { "dependency": "transitive", @@ -1779,41 +1829,41 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.6" + "version": "1.0.1" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.3" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69", + "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.13.0" }, "win32_registry": { "dependency": "transitive", @@ -1857,7 +1907,7 @@ } }, "sdks": { - "dart": ">=3.5.4 <4.0.0", - "flutter": ">=3.24.0" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.31.0-0.0.pre" } } diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index 0c90d98157bc..25804ba2c1ce 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-Ym16jPHMHKmojMQOuMamDsW/u+oP1UhbCP5dooTUzFQ="; + fetcherVersion = 1; }; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/jq/jq/disable-end-of-epoch-conversion-test.patch b/pkgs/by-name/jq/jq/disable-end-of-epoch-conversion-test.patch index 570d443db12f..70917b5cfd29 100644 --- a/pkgs/by-name/jq/jq/disable-end-of-epoch-conversion-test.patch +++ b/pkgs/by-name/jq/jq/disable-end-of-epoch-conversion-test.patch @@ -1,12 +1,11 @@ diff --git a/tests/optional.test b/tests/optional.test -index 2623731..85bc9e9 100644 +index 77354cc..6cc7c12 100644 --- a/tests/optional.test +++ b/tests/optional.test -@@ -12,11 +12,6 @@ last(range(365 * 67)|("1970-03-01T01:02:03Z"|strptime("%Y-%m-%dT%H:%M:%SZ")|mkti - null - [2037,1,11,1,2,3,3,41] +@@ -1,10 +1,5 @@ + # See tests/jq.test and the jq manual for more information. --# Regression test for #3276 +-# Regression test for #3276 (fails on mingw/WIN32) -fromdate -"2038-01-19T03:14:08Z" -2147483648 diff --git a/pkgs/by-name/jq/jq/musl.patch b/pkgs/by-name/jq/jq/musl.patch new file mode 100644 index 000000000000..3632899882e7 --- /dev/null +++ b/pkgs/by-name/jq/jq/musl.patch @@ -0,0 +1,31 @@ +From 63e9449a8142ce30c83fcd7e9396e5de9843774e Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Thu, 3 Jul 2025 11:00:13 +0200 +Subject: [PATCH] jq.test: drop non-portable %F test + +%F is a non-portable GNU extension, not supported by all strptime +implementations (for example musl's). + +Link: https://github.com/jqlang/jq/pull/3365 +--- + tests/jq.test | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/tests/jq.test b/tests/jq.test +index 4ecf72f..6bfb6f8 100644 +--- a/tests/jq.test ++++ b/tests/jq.test +@@ -1848,10 +1848,6 @@ try ["OK", strflocaltime({})] catch ["KO", .] + "2015-03-05T23:51:47Z" + [[2015,2,5,23,51,47,4,63],1425599507] + +-[strptime("%FT%T")|(.,mktime)] +-"2025-06-07T08:09:10" +-[[2025,5,7,8,9,10,6,157],1749283750] +- + # Check day-of-week and day of year computations + # (should trip an assert if this fails) + last(range(365 * 67)|("1970-03-01T01:02:03Z"|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime) + (86400 * .)|strftime("%Y-%m-%dT%H:%M:%SZ")|strptime("%Y-%m-%dT%H:%M:%SZ")) +-- +2.49.0 + diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix index 5d3a7c3aa975..66cae1f2c1b1 100644 --- a/pkgs/by-name/jq/jq/package.nix +++ b/pkgs/by-name/jq/jq/package.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "jq"; - version = "1.8.0"; + version = "1.8.1"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { url = "https://github.com/jqlang/jq/releases/download/jq-${finalAttrs.version}/jq-${finalAttrs.version}.tar.gz"; - hash = "sha256-kYEVd/kdmmGV/1DCv/7JtyyEKdwF7D6gIv2VwG0rMZw="; + hash = "sha256-K+ZOcSnOyxHVkGKQ66EK9pT7nj5/n8IIoxHcM8qDfrA="; }; outputs = [ @@ -30,14 +30,15 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; - # tortured syntax to avoid rebuilds - # needed because epoch conversion test here is right at the end of 32 bit integer space - # See also: https://github.com/jqlang/jq/blob/859a8073ee8a21f2133154eea7c2bd5e0d60837f/tests/optional.test#L15-L18 - # "-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64" would be preferrable, but breaks with dynamic linking, - # unless done globally in stdenv for all of 32 bit. - ${if stdenv.hostPlatform.is32bit then "patches" else null} = [ - ./disable-end-of-epoch-conversion-test.patch - ]; + patches = + [ ./musl.patch ] + ++ lib.optionals stdenv.hostPlatform.is32bit [ + # needed because epoch conversion test here is right at the end of 32 bit integer space + # See also: https://github.com/jqlang/jq/blob/859a8073ee8a21f2133154eea7c2bd5e0d60837f/tests/optional.test#L15-L18 + # "-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64" would be preferrable, but breaks with dynamic linking, + # unless done globally in stdenv for all of 32 bit. + ./disable-end-of-epoch-conversion-test.patch + ]; # https://github.com/jqlang/jq/issues/2871 postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' @@ -123,14 +124,15 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/jqlang/jq/releases/tag/jq-${finalAttrs.version}"; description = "Lightweight and flexible command-line JSON processor"; homepage = "https://jqlang.github.io/jq/"; + downloadPage = "https://jqlang.github.io/jq/download/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ raskin artturin ncfavier + jk ]; platforms = lib.platforms.unix; - downloadPage = "https://jqlang.github.io/jq/download/"; mainProgram = "jq"; }; }) diff --git a/pkgs/by-name/ju/jumpapp/package.nix b/pkgs/by-name/ju/jumpapp/package.nix index fd6a3b8c7276..f02e9b2941f4 100644 --- a/pkgs/by-name/ju/jumpapp/package.nix +++ b/pkgs/by-name/ju/jumpapp/package.nix @@ -7,7 +7,7 @@ xdotool, wmctrl, xprop, - nettools, + net-tools, }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { xdotool wmctrl xprop - nettools + net-tools perl ]; postFixup = diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix index ebca0dc9095c..08da47828918 100644 --- a/pkgs/by-name/ju/jumpy/package.nix +++ b/pkgs/by-name/ju/jumpy/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch2, makeWrapper, pkg-config, zstd, @@ -14,19 +15,27 @@ xorg, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "jumpy"; - version = "0.8.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "fishfolk"; repo = "jumpy"; - rev = "v${version}"; - sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek="; + tag = "v${finalAttrs.version}"; + hash = "sha256-g/CpSycTCM1i6O7Mir+3huabvr4EXghDApquEUNny8c="; }; + # This patch may be removed in the next release + cargoPatches = [ + (fetchpatch2 { + url = "https://github.com/fishfolk/jumpy/commit/8234e6d2c0b33c75e2112596ded1734fdba50fb8.patch?full_index=1"; + hash = "sha256-IWjBw1Wj/6CT/x6xm6vfpUMfk7A5/EsdbPDvWywRFc8="; + }) + ]; + useFetchCargoVendor = true; - cargoHash = "sha256-hVEpTNTXwOQoxlhOewUvHyfBh+APnx8Fox90CmdMRQ4="; + cargoHash = "sha256-2I9s1zH94GRqXGBxZYyXOQwNeYrpV1UhUSKGCs9Ce9Q="; nativeBuildInputs = [ makeWrapper @@ -77,12 +86,14 @@ rustPlatform.buildRustPackage rec { meta = { description = "Tactical 2D shooter played by up to 4 players online or on a shared screen"; mainProgram = "jumpy"; - homepage = "https://fishfight.org/"; - changelog = "https://github.com/fishfolk/jumpy/releases/tag/v${version}"; + homepage = "https://fishfolk.org/games/jumpy"; + changelog = "https://github.com/fishfolk/jumpy/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ mit # or asl20 + # Assets + cc-by-nc-40 ]; maintainers = with lib.maintainers; [ figsoda ]; }; -} +}) diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix index 951a33687595..f25b2d4eb652 100644 --- a/pkgs/by-name/k9/k9s/package.nix +++ b/pkgs/by-name/k9/k9s/package.nix @@ -10,22 +10,21 @@ writableTmpDirAsHomeHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "k9s"; version = "0.50.7"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-K0JETHs2vOOfDUPw22x+2O5WN0rtkXsRxMnUHrCpkDg="; }; ldflags = [ "-s" - "-w" - "-X github.com/derailed/k9s/cmd.version=${version}" - "-X github.com/derailed/k9s/cmd.commit=${src.rev}" + "-X github.com/derailed/k9s/cmd.version=${finalAttrs.version}" + "-X github.com/derailed/k9s/cmd.commit=${finalAttrs.src.rev}" "-X github.com/derailed/k9s/cmd.date=1970-01-01T00:00:00Z" ]; @@ -44,7 +43,7 @@ buildGoModule rec { tests.version = testers.testVersion { package = k9s; command = "HOME=$(mktemp -d) k9s version -s"; - inherit version; + inherit (finalAttrs) version; }; updateScript = nix-update-script { }; }; @@ -60,6 +59,9 @@ buildGoModule rec { --bash <($out/bin/k9s completion bash) \ --fish <($out/bin/k9s completion fish) \ --zsh <($out/bin/k9s completion zsh) + + mkdir -p $out/share/k9s/skins + cp -r $src/skins/* $out/share/k9s/skins/ ''; nativeCheckInputs = [ writableTmpDirAsHomeHook ]; @@ -67,7 +69,7 @@ buildGoModule rec { meta = { description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; - changelog = "https://github.com/derailed/k9s/releases/tag/v${version}"; + changelog = "https://github.com/derailed/k9s/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; mainProgram = "k9s"; maintainers = with lib.maintainers; [ @@ -79,4 +81,4 @@ buildGoModule rec { ryan4yin ]; }; -} +}) diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix index 2c2e9c3129a3..1d63fdab3e5b 100644 --- a/pkgs/by-name/ka/karakeep/package.nix +++ b/pkgs/by-name/ka/karakeep/package.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { }; hash = "sha256-yf8A0oZ0Y4A5k7gfinIU02Lbqp/ygyvIBlldS0pv5+0="; + fetcherVersion = 1; }; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix index 6beace090293..541a0a017ed1 100644 --- a/pkgs/by-name/kn/knowsmore/package.nix +++ b/pkgs/by-name/kn/knowsmore/package.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "knowsmore" ]; - pytestFlagsArray = [ "tests/tests*" ]; + enabledTestPaths = [ "tests/tests*" ]; meta = with lib; { description = "Tool for pentesting Microsoft Active Directory"; diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 35551dadaef1..d5fc0c3e8122 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -41,13 +41,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.94"; + version = "1.95.1"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-qWH8yGjDTkMPLHjfMopfQKyBA5T1HHgllEH9Joceq3s="; + hash = "sha256-aoVOEPK3hPuzkrHIFvDrnAw2D/OxXlRLXXP0CZJghx4="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index 78b542d6d841..72e95894d686 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.35.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.36.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "16"; # Also update kubo-migrator when changing the repo version @@ -16,7 +16,7 @@ buildGoModule rec { # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-OubXaa2JWbEaakDV6pExm5PkiZ5XPd9uG+S4KwWb0xQ="; + hash = "sha256-KrNP3JMkyTo6hghLLGWerH1Oz3HsnTI5jCfqRbp6AR8="; }; # tarball contains multiple files/directories diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 596e8245b179..3d1cbea4f1c2 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -22,20 +22,20 @@ wayland, wayland-protocols, wayland-scanner, - wlroots_0_18, + wlroots_0_19, xcbutilwm, xwayland, }: stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; tag = finalAttrs.version; - hash = "sha256-JeEw1xKwgsTMllZXvNaXXdgmZnmIFUyG/cJ14QFQf/E="; + hash = "sha256-7PgRbOSxU7v49dcTuke7V/Xa42baw79iMvfnCOYx4qU="; }; outputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { pango wayland wayland-protocols - wlroots_0_18 + wlroots_0_19 xcbutilwm xwayland ]; diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index d90826440ed6..e0f7d270d397 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -45,7 +45,6 @@ buildGoModule rec { Br1ght0ne equirosa khaneliman - paveloom starsep sigmasquadron ]; diff --git a/pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch b/pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch deleted file mode 100644 index 372bdc8cafbd..000000000000 --- a/pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git src/pkg-xml2.c src/pkg-xml2.c -index 048ca38c..9ea4de35 100644 ---- src/pkg-xml2.c -+++ src/pkg-xml2.c -@@ -507,8 +507,13 @@ f_xml_generate (svalue_t *sp) - return sp; - } - -+#if LIBXML_VERSION >= 21200 -+static void -+xml_pkg_error_handler(void * userData, const xmlError *error) -+#else - static void - xml_pkg_error_handler(void * userData, xmlErrorPtr error) -+#endif - { - if (error) - { diff --git a/pkgs/by-name/ld/ldmud/package.nix b/pkgs/by-name/ld/ldmud/package.nix index fa85bacb6c23..f97923fa4e59 100644 --- a/pkgs/by-name/ld/ldmud/package.nix +++ b/pkgs/by-name/ld/ldmud/package.nix @@ -26,29 +26,29 @@ python310, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ldmud"; - version = "3.6.7"; + version = "3.6.8"; src = fetchFromGitHub { owner = "ldmud"; repo = "ldmud"; - rev = version; - sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA="; + tag = finalAttrs.version; + hash = "sha256-ojOLM1vkuwuF0vXx6lCH0+OlyLkkOOnTJEUiZPpUhzo="; }; patches = [ - ./libxml2-2.12.0-compat.patch ./mysql-compat.patch ]; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ autoreconfHook pkg-config bison ]; + buildInputs = [ libgcrypt @@ -86,10 +86,14 @@ stdenv.mkDerivation rec { (lib.enableFeature pythonSupport "use-python") ]; - preConfigure = lib.optionalString mysqlSupport '' - export CPPFLAGS="-I${lib.getDev libmysqlclient}/include/mysql" - export LDFLAGS="-L${libmysqlclient}/lib/mysql" - ''; + preConfigure = + lib.optionalString mysqlSupport '' + export CPPFLAGS="-I${lib.getDev libmysqlclient}/include/mysql" + export LDFLAGS="-L${libmysqlclient}/lib/mysql" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export LDFLAGS="$LDFLAGS -L${libiconv}/lib -liconv" + ''; installTargets = [ "install-driver" @@ -105,7 +109,7 @@ stdenv.mkDerivation rec { meta = { description = "Gamedriver for LPMuds including a LPC compiler, interpreter and runtime"; homepage = "https://ldmud.eu"; - changelog = "https://github.com/ldmud/ldmud/blob/${version}/HISTORY"; + changelog = "https://github.com/ldmud/ldmud/blob/${finalAttrs.version}/HISTORY"; longDescription = '' LDMud started as a project to clean up and modernize Amylaar's LPMud gamedriver. Primary goals are full documentation, a commented source body @@ -120,4 +124,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ cpu ]; }; -} +}) diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index c7ee06fcca50..e6568dc948c5 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-nobOORfhwlGEvNt+MfDKd3rXor6tJHDulz5oD1BGY4I="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index 758e65fd4daf..7ce41595e4ac 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -2,17 +2,17 @@ lib, fetchurl, fetchpatch, - autoreconfHook, ncurses, pcre2, stdenv, + versionCheckHook, # Boolean options withSecure ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "less"; - version = "668"; + version = "679"; # `less` is provided by the following sources: # - meta.homepage @@ -21,26 +21,9 @@ stdenv.mkDerivation (finalAttrs: { # homepage, and only those not marked as beta. src = fetchurl { url = "https://www.greenwoodsoftware.com/less/less-${finalAttrs.version}.tar.gz"; - hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg="; + hash = "sha256-m2iCDDT6igr2sOAbdPApi83UCgSJxhZJtHBYkIoVPXg="; }; - patches = [ - (fetchpatch { - # Fix configure parameters --with-secure=no and --without-secure. - url = "https://github.com/gwsw/less/commit/8fff6c56bfc833528b31ebdaee871f65fbe342b1.patch"; - hash = "sha256-XV5XufivNWWLGeIpaP04YQPWcxIUKYYEINdT+eEx+WA="; - includes = [ - "configure.ac" - ]; - }) - ]; - - # Need `autoreconfHook` since we patch `configure.ac`. - # TODO: Remove the `configure.ac` patch and `autoreconfHook` next release - nativeBuildInputs = [ - autoreconfHook - ]; - buildInputs = [ ncurses pcre2 @@ -59,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + meta = { homepage = "https://www.greenwoodsoftware.com/less/"; description = "More advanced file pager than 'more'"; diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix index 767dd6cfed66..c7b987841844 100644 --- a/pkgs/by-name/li/lib3mf/package.nix +++ b/pkgs/by-name/li/lib3mf/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, automaticcomponenttoolkit, @@ -12,19 +13,35 @@ openssl, libuuid, zlib, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lib3mf"; - version = "2.3.2"; + version = "2.4.1"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = "lib3mf"; - tag = "v${version}"; - hash = "sha256-XEwrJINiNpI2+1wXxczirci8VJsUVs5iDUAMS6jWuNk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wq/dT/8m+em/qFoNNj6s5lyx/MgNeEBGSMBpuJiORqA="; }; + patches = [ + # some patches are required for the gcc 14 source build + # remove next release + # https://github.com/3MFConsortium/lib3mf/pull/413 + (fetchpatch { + url = "https://github.com/3MFConsortium/lib3mf/pull/413/commits/96b2f5ec9714088907fe8a6f05633e2bbd82053f.patch?full_index=1"; + hash = "sha256-cJRc+SW1/6Ypf2r34yroVTxu4NMJWuoSmzsmoXogrUk="; + }) + # https://github.com/3MFConsortium/lib3mf/pull/421 + (fetchpatch { + url = "https://github.com/3MFConsortium/lib3mf/pull/421/commits/6d7b5709a4a1cf9bd55ae8b4ae999c9ca014f62c.patch?full_index=1"; + hash = "sha256-rGOyXZUZglRNMu1/oVhgSpRdi0pUa/wn5SFHCS9jVOY="; + }) + ]; + nativeBuildInputs = [ cmake ninja @@ -79,11 +96,14 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.updateScript = nix-update-script { }; + meta = with lib; { + changelog = "https://github.com/3MFConsortium/lib3mf/releases/tag/${finalAttrs.src.tag}"; description = "Reference implementation of the 3D Manufacturing Format file standard"; homepage = "https://3mf.io/"; license = licenses.bsd2; maintainers = with maintainers; [ ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index 3dfd38cd4cad..427eac7604c9 100644 --- a/pkgs/by-name/li/libadwaita/package.nix +++ b/pkgs/by-name/li/libadwaita/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.7.3"; + version = "1.7.4"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-zVmVh1iljidcXU+c7DAGBPkYyJkA11SvXtuCosB/Foc="; + hash = "sha256-HHSKqYOtIfG6JR8zvXl06tq0iHVVNIpVJLDwyB+nI0I="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/li/libajantv2/demos-ntv2overlay-no-makefile.patch b/pkgs/by-name/li/libajantv2/demos-ntv2overlay-no-makefile.patch new file mode 100644 index 000000000000..02fc44a5e79a --- /dev/null +++ b/pkgs/by-name/li/libajantv2/demos-ntv2overlay-no-makefile.patch @@ -0,0 +1,23 @@ +From f822ffa9f886b668fe0a6269f0ba8bf48043d190 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Sun, 22 Jun 2025 14:12:08 +0100 +Subject: [PATCH 4/4] Don't attempt to install a non-existent Makefile + +--- + demos/ntv2overlay/CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/demos/ntv2overlay/CMakeLists.txt b/demos/ntv2overlay/CMakeLists.txt +index 4520e795..ae94906f 100644 +--- a/demos/ntv2overlay/CMakeLists.txt ++++ b/demos/ntv2overlay/CMakeLists.txt +@@ -48,6 +48,3 @@ endif() + if (AJA_INSTALL_CMAKE) + install(FILES CMakeLists.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/libajantv2/demos/ntv2overlay) + endif() +-if (AJA_INSTALL_MISC) +- install(FILES Makefile DESTINATION ${CMAKE_INSTALL_PREFIX}/libajantv2/demos/ntv2overlay) +-endif() +-- +2.49.0 + diff --git a/pkgs/by-name/li/libajantv2/device-info-list.patch b/pkgs/by-name/li/libajantv2/device-info-list.patch index c4351ecee00c..b0a9d05e93ee 100644 --- a/pkgs/by-name/li/libajantv2/device-info-list.patch +++ b/pkgs/by-name/li/libajantv2/device-info-list.patch @@ -1,8 +1,18 @@ +From 5d6984729190139ddcbefb825e4d59a8bdfc3551 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Sun, 22 Jun 2025 14:05:49 +0100 +Subject: [PATCH 2/3] Properly mark CNTV2DeviceScanner::GetDeviceInfoList as a + class member method + +--- + ajantv2/src/ntv2devicescanner.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/ajantv2/src/ntv2devicescanner.cpp b/ajantv2/src/ntv2devicescanner.cpp -index 448e48d372..6b46f9f69d 100644 +index 11d145be..1fb0b433 100644 --- a/ajantv2/src/ntv2devicescanner.cpp +++ b/ajantv2/src/ntv2devicescanner.cpp -@@ -137,7 +137,7 @@ +@@ -117,7 +117,7 @@ CNTV2DeviceScanner::CNTV2DeviceScanner (const bool inScanNow) } #endif // !defined(NTV2_DEPRECATE_16_3) @@ -11,3 +21,6 @@ index 448e48d372..6b46f9f69d 100644 { AJAAutoLock tmpLock(&sDevInfoListLock); return sDevInfoList; +-- +2.49.0 + diff --git a/pkgs/by-name/li/libajantv2/musl.patch b/pkgs/by-name/li/libajantv2/musl.patch index d27e9b7495da..5221be4e3f96 100644 --- a/pkgs/by-name/li/libajantv2/musl.patch +++ b/pkgs/by-name/li/libajantv2/musl.patch @@ -1,7 +1,7 @@ -From 6b27c75125f2b2c66d5d6dd8d35569260ac72f17 Mon Sep 17 00:00:00 2001 +From 8312398dbc1f0a960c0e64c2faaa756277c0f67c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 3 Jan 2025 12:21:28 +0100 -Subject: [PATCH] Don't use non-standard ACCESSPERMS macro +Subject: [PATCH 3/3] Don't use non-standard ACCESSPERMS macro This macro is non-standard, and is not defined by e.g. musl libc. It's just a define for 0777, so just use that instead. @@ -28,5 +28,5 @@ index 78196446..e18b10a3 100644 char* result = getcwd(cwdBuf, AJA_MAX_PATH); AJA_UNUSED(result); -- -2.47.0 +2.49.0 diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix index 2b9e8e9d03fa..6352cf082700 100644 --- a/pkgs/by-name/li/libajantv2/package.nix +++ b/pkgs/by-name/li/libajantv2/package.nix @@ -12,18 +12,19 @@ stdenv.mkDerivation rec { pname = "libajantv2"; - version = "17.1.3"; + version = "17.5.0"; src = fetchFromGitHub { owner = "aja-video"; repo = "libajantv2"; rev = "ntv2_${builtins.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-7APoPj2LnvdwfuVforoJz0YxKU1WmAgRqIfXao4IZmY="; + hash = "sha256-/BfFbBScS75TpUZEeYzAHd1PtnZgnCNfGtjwYPJJjkg="; }; patches = [ ./use-system-mbedtls.patch ./device-info-list.patch ./musl.patch + ./demos-ntv2overlay-no-makefile.patch ]; outputs = [ diff --git a/pkgs/by-name/li/libajantv2/use-system-mbedtls.patch b/pkgs/by-name/li/libajantv2/use-system-mbedtls.patch index 7654658a2c0b..73d445d3ba6e 100644 --- a/pkgs/by-name/li/libajantv2/use-system-mbedtls.patch +++ b/pkgs/by-name/li/libajantv2/use-system-mbedtls.patch @@ -1,16 +1,19 @@ -Commit ID: 1aeee534119a22e717ce3d0e9f62c8791cd825b9 -Change ID: pzyrusopmyvtvnwnruvrltqtpqtzxrpo -Author: Luke Granger-Brown (2024-12-20 18:03:16) -Committer: Luke Granger-Brown (2024-12-20 18:03:25) +From 6c8dca24e48b0bbeb11e9611fe547246167030ab Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Fri, 20 Dec 2024 18:03:16 +0000 +Subject: [PATCH 1/3] Use system mbedtls, rather than downloading from a random + Git branch... - Use system mbedtls, rather than downloading from a random Git branch... +--- + ajantv2/CMakeLists.txt | 50 +++--------------------------------------- + 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/ajantv2/CMakeLists.txt b/ajantv2/CMakeLists.txt -index ffa572e9c8..74c23e8e4e 100644 +index 8037dd4b..aa6e6577 100644 --- a/ajantv2/CMakeLists.txt +++ b/ajantv2/CMakeLists.txt -@@ -52,49 +52,13 @@ - else() +@@ -55,49 +55,13 @@ else() + endif() message(STATUS "NTV2 SDK will load signed 3rd-party plugins") - set(MBEDTLS_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/mbedtls-install) @@ -23,7 +26,6 @@ index ffa572e9c8..74c23e8e4e 100644 - set(MBEDCRYPTO_LIBRARY ${MBEDTLS_LIBRARY_DIR}/mbedcrypto.lib) - set(MBEDTLS_EXTRA_CONFIG_FLAGS - "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON" -- "-DMSVC_STATIC_RUNTIME=ON" - "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}") - elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|Darwin)$") - set(MBEDTLS_LIBRARY ${MBEDTLS_LIBRARY_DIR}/libmbedtls.a) @@ -35,7 +37,7 @@ index ffa572e9c8..74c23e8e4e 100644 - # BUILD_BYPRODUCTS informing CMake where the .a files are located is required to make Ninja build work - ExternalProject_Add( - mbedtls -- GIT_REPOSITORY https://github.com/aja-video/mbedtls.git +- GIT_REPOSITORY ${AJANTV2_MBEDTLS_URL} - GIT_TAG fix-win-dll-cmake - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${MBEDTLS_INSTALL_DIR} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} @@ -46,6 +48,7 @@ index ffa572e9c8..74c23e8e4e 100644 - -DUSE_STATIC_MBEDTLS_LIBRARY=ON - -DUSE_SHARED_MBEDTLS_LIBRARY=OFF - ${MBEDTLS_EXTRA_CONFIG_FLAGS} +- CMAKE_CACHE_ARGS "-DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}" - BUILD_ALWAYS TRUE - BUILD_BYPRODUCTS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY} - ) @@ -62,7 +65,7 @@ index ffa572e9c8..74c23e8e4e 100644 endif() -@@ -668,10 +632,6 @@ +@@ -671,10 +635,6 @@ if (NOT TARGET ${PROJECT_NAME}) aja_ntv2_log_build_info() add_library(${PROJECT_NAME} SHARED ${TARGET_SOURCES}) @@ -73,7 +76,7 @@ index ffa572e9c8..74c23e8e4e 100644 target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFS_DYNAMIC} -@@ -687,10 +647,6 @@ +@@ -690,10 +650,6 @@ if (NOT TARGET ${PROJECT_NAME}) add_library(${PROJECT_NAME} STATIC ${TARGET_SOURCES}) @@ -84,3 +87,6 @@ index ffa572e9c8..74c23e8e4e 100644 target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFS_STATIC} ${AJANTV2_TARGET_COMPILE_DEFS}) +-- +2.49.0 + diff --git a/pkgs/by-name/li/libaom/package.nix b/pkgs/by-name/li/libaom/package.nix index 103835f010e0..66e24e3c91ff 100644 --- a/pkgs/by-name/li/libaom/package.nix +++ b/pkgs/by-name/li/libaom/package.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.11.0"; + version = "3.12.1"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - hash = "sha256-SqXDeIApj7XEK2cChenN9pun5eNm4Q+Smpp76xHwMMU="; + hash = "sha256-AAS6wfq4rZ4frm6+gwKoIS3+NVzPhhfW428WXJQ2tQ8="; stripRoot = false; }; diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix index 37f941e3dac6..caba93785756 100644 --- a/pkgs/by-name/li/libapparmor/package.nix +++ b/pkgs/by-name/li/libapparmor/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch2, autoreconfHook, autoconf-archive, pkg-config, @@ -33,27 +32,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libapparmor"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitLab { owner = "apparmor"; repo = "apparmor"; tag = "v${finalAttrs.version}"; - hash = "sha256-oj6mGw/gvoRGpJqw72Lk6LJuurg8efjiV1pvZYbXz6A="; + hash = "sha256-f9FgowlV4lZKKuddGCirqbajhIGyTUQc7IFHSvqY6eQ="; }; sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor"; - patches = [ - # avoid creating non-reproducible pycache in check phase - # https://gitlab.com/apparmor/apparmor/-/merge_requests/1697 - # remove on next release - (fetchpatch2 { - url = "https://gitlab.com/apparmor/apparmor/-/commit/b50ee983522f0efb5920676db545ae25b2e8998d.patch"; - hash = "sha256-AXl0osJHX4uUGppiOuHjpvlSRChqGyRCqv+8TYoLYMk="; - stripLen = 2; - }) - ]; - postPatch = '' substituteInPlace swig/perl/Makefile.am \ --replace-fail install_vendor install_site diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index 44e6f482dbe4..8a2a308a6958 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -2,12 +2,11 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, acl, attr, autoreconfHook, bzip2, - e2fsprogs, + fetchpatch, glibcLocalesUtf8, lzo, openssl, @@ -33,27 +32,21 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-nL2p2h+U25fhQQjbj16yhxhU8xEEuhNynIx7SNzl6Mo="; + hash = "sha256-KN5SvQ+/g/OOa+hntMX3D8p5IEWO0smke5WK+DwrOH0="; }; patches = [ - # Remove in next release - # - # Fixes macOS metadata file handling when reading certain tarballs - # (e.g, bsdtar-produced tar containing a file with xattrs whose name is exactly 99 bytes long) - # - # - # This also fixes test_copy in the test suite. + # https://github.com/libarchive/libarchive/pull/2689 + # Remove after next release. (fetchpatch { - name = "reset-header-state-after-mac-metadata.patch"; - url = "https://github.com/libarchive/libarchive/commit/5bb36db5e19aecabccec8f351ec22f8c3a8695f0.patch"; - hash = "sha256-eNGSunYZ5b0TrkBUtOO7MYGXc+SEn1Sxm8MYyI+4JsQ="; + url = "https://github.com/libarchive/libarchive/commit/489d0b8e2f1fafd3b7ebf98f389ca67462c34651.patch?full_index=1"; + hash = "sha256-r+tSJ+WA0VKCjg+8MfS5/RqcB+aAMZ2dK0YUh+U1q78="; }) ]; @@ -112,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ acl attr - e2fsprogs ] ++ lib.optional xarSupport libxml2; diff --git a/pkgs/by-name/li/libass/package.nix b/pkgs/by-name/li/libass/package.nix index 68a443b16e66..452bdf92d108 100644 --- a/pkgs/by-name/li/libass/package.nix +++ b/pkgs/by-name/li/libass/package.nix @@ -17,11 +17,11 @@ assert fontconfigSupport -> fontconfig != null; stdenv.mkDerivation rec { pname = "libass"; - version = "0.17.3"; + version = "0.17.4"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-6uQl2lDwAVwh97OpxyYqkQ8CGK9GniLikxRi/tPFCVk="; + hash = "sha256-ePEXm4ONAl6cJuj+8z+AkvZWEURP+hv8DPrGozURoFo="; }; outputs = [ diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix index 240a16e0975f..fddc260fc8c4 100644 --- a/pkgs/by-name/li/libavif/package.nix +++ b/pkgs/by-name/li/libavif/package.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { pname = "libavif"; version = "1.3.0"; + outputs = [ + "out" + "dev" + ]; + src = fetchFromGitHub { owner = "AOMediaCodec"; repo = "libavif"; diff --git a/pkgs/by-name/li/libbladeRF/package.nix b/pkgs/by-name/li/libbladeRF/package.nix index f09ab673cd87..0f5364bc21b9 100644 --- a/pkgs/by-name/li/libbladeRF/package.nix +++ b/pkgs/by-name/li/libbladeRF/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; - # Let us avoid nettools as a dependency. + # Let us avoid net-tools as a dependency. postPatch = '' sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash ''; diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index 323d49b427c3..dca021ffbe13 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -16,7 +16,7 @@ doxygen, python3, python3Packages, - systemd, # for libudev + udev, libpisp, withTracing ? lib.meta.availableOn stdenv.hostPlatform lttng-ust, lttng-ust, # withTracing @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.5.0"; + version = "0.5.1"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-zlMjeLlEeigzisVr7kWVrTI5gRbpJb2pZvqXNdErITQ="; + hash = "sha256-JV5sa/jiqubcenSeYC4jlB/RgGJt3o1HTIyy7U4Ljlg="; }; outputs = [ @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { libdrm # hotplugging - systemd + udev # pycamera python3Packages.pybind11 diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index c15cb447278a..8643f0b1abbb 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -28,11 +28,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.75"; + version = "2.76"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - hash = "sha256-3k5+BkybpFHVI03Ubol9fHHJap6/mgxEW8BPR0LYNjI="; + hash = "sha256-Yp2kqymQDQ9/zDYicHN0MRmSX9cRyZoWibv1ybQMjm8="; }; outputs = [ diff --git a/pkgs/by-name/li/libcap_ng/package.nix b/pkgs/by-name/li/libcap_ng/package.nix index 6435e5b676bf..99b7547c8fcc 100644 --- a/pkgs/by-name/li/libcap_ng/package.nix +++ b/pkgs/by-name/li/libcap_ng/package.nix @@ -1,18 +1,37 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, + swig, + testers, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcap-ng"; version = "0.8.5"; - src = fetchurl { - url = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${version}.tar.gz"; - hash = "sha256-O6UpTRy9+pivqs+8ALavntK4PoohgXGF39hEzIx6xv8="; + src = fetchFromGitHub { + owner = "stevegrubb"; + repo = "libcap-ng"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qcHIHG59PDPfPsXA1r4hG4QhK2qyE7AgXOwUDjIy7lE="; }; + # NEWS needs to exist or else the build fails + postPatch = '' + touch NEWS + ''; + + strictDeps = true; + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook + swig + ]; + outputs = [ "out" "dev" @@ -23,10 +42,24 @@ stdenv.mkDerivation rec { "--without-python" ]; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + }; + + # assumption: build machine runs linux kernel 5.0 or newer + # see https://github.com/stevegrubb/libcap-ng?tab=readme-ov-file#note-to-distributions + doCheck = true; + + meta = { + changelog = "https://people.redhat.com/sgrubb/libcap-ng/ChangeLog"; description = "Library for working with POSIX capabilities"; homepage = "https://people.redhat.com/sgrubb/libcap-ng/"; - platforms = platforms.linux; - license = licenses.lgpl21; + pkgConfigModules = [ "libcap-ng" ]; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ grimmauld ]; }; -} +}) diff --git a/pkgs/by-name/li/libdecor/package.nix b/pkgs/by-name/li/libdecor/package.nix index 063ad2f6059c..1c1d8931ea8d 100644 --- a/pkgs/by-name/li/libdecor/package.nix +++ b/pkgs/by-name/li/libdecor/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libdecor"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libdecor"; repo = "libdecor"; rev = version; - hash = "sha256-mID19uHXFKJUZtQsSOXjRdz541YVjMxmSHVa+DlkPRc="; + hash = "sha256-7h/Xfw8chzRmmWKcOyIB7KSL+ZzNGDpElfE22ReoJqY="; }; outputs = [ diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix index a7a060d9dc6d..34078fc48c3c 100644 --- a/pkgs/by-name/li/libdex/package.nix +++ b/pkgs/by-name/li/libdex/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdex"; - version = "0.10.0"; + version = "0.10.1"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz"; - hash = "sha256-mKaWJqp2Rq1FW+p6f5LSof+kfkVZoVShv+mMFvpxHuE="; + hash = "sha256-dHLogJDbKyKDB1Be3rpEg+hyaBNAywQErmSsPaW+0KY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libdisplay-info/package.nix b/pkgs/by-name/li/libdisplay-info/package.nix index 241f09ebc190..97406754be65 100644 --- a/pkgs/by-name/li/libdisplay-info/package.nix +++ b/pkgs/by-name/li/libdisplay-info/package.nix @@ -7,7 +7,7 @@ ninja, python3, hwdata, - edid-decode, + v4l-utils, }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meson pkg-config ninja - edid-decode + v4l-utils hwdata python3 ]; diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index ed2216680fd2..f55f9b75524f 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libedit"; - version = "20240808-3.1"; + version = "20250104-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz"; - hash = "sha256-XwVzNJ13xKSJZxkc3WY03Xql9jmMalf+A3zAJpbWCZ8="; + hash = "sha256-I3knAWlFUKU3IGMM0c1hZxAbV3Ot3ctBBPc0W3OlaKw="; }; outputs = [ diff --git a/pkgs/by-name/li/libfreehand/package.nix b/pkgs/by-name/li/libfreehand/package.nix new file mode 100644 index 000000000000..3a7ae6f8565e --- /dev/null +++ b/pkgs/by-name/li/libfreehand/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchzip, + fetchpatch, + perl, + pkg-config, + boost, + cppunit, + doxygen, + gperf, + icu, + lcms2, + librevenge, + zlib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libfreehand"; + version = "0.1.2"; + + src = fetchzip { + url = "https://dev-www.libreoffice.org/src/libfreehand/libfreehand-${finalAttrs.version}.tar.xz"; + hash = "sha256-0icEGnTtYveP24FbYjRB7tFW/TquSOszbqZspHAhQ7I="; + }; + + nativeBuildInputs = [ + perl + pkg-config + ]; + + buildInputs = [ + boost + cppunit + doxygen + gperf + icu + lcms2 + librevenge + zlib + ]; + + configureFlags = [ "--disable-werror" ]; + + patches = [ + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libfreehand/-/raw/main/libfreehand-0.1.2-icu-fix.patch?ref_type=heads"; + hash = "sha256-SRkcF+FRkFdueLSTOMYWo6+CCl05f0OBP6G5VrXRyCw="; + }) + ]; + + meta = { + description = "Adobe Freehand import library"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix index 07be13a7ed67..9ae48ef2ddac 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.10.3"; + version = "1.11.1"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - hash = "sha256-iwhwiXrFrGfe1Wjc+t9Flpz6imvrD9YK8qnq3Coycqo="; + hash = "sha256-JOkckSOkbFToNx86OiUC8RmPKJP7+/Wa+VvBwhSZsA4="; }; outputs = [ @@ -69,10 +69,22 @@ stdenv.mkDerivation rec { "build" ]; - postConfigure = '' - sed -i configure \ - -e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/' - ''; + postConfigure = + '' + sed -i configure \ + -e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/' + '' + # The cipher/simd-common-riscv.h wasn't added to the release tarball, please remove this hack on next version update + # https://dev.gnupg.org/T7647 + + lib.optionalString stdenv.hostPlatform.isRiscV '' + cp ${ + fetchurl { + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob_plain;f=cipher/simd-common-riscv.h;h=8381000f9ac148c60a6963a1d9ec14a3fee1c576;hb=81ce5321b1b79bde6dfdc3c164efb40c13cf656b"; + hash = "sha256-Toe15YLAOYULnLc2fGMMv/xzs/q1t3LsyiqtL7imc+8="; + name = "simd-common-riscv.h"; + } + } cipher/simd-common-riscv.h + ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index f59e81215cb4..389977babf4f 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -15,6 +15,8 @@ gtk4, gobject-introspection, gnome, + common-updater-scripts, + _experimental-update-script-combinators, buildPackages, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection @@ -22,14 +24,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libglycin"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "glycin"; tag = finalAttrs.version; - hash = "sha256-M4DcWLE40OPB7zIkv4uLj6xTac3LTDcZ2uAO2S/cUz4="; + hash = "sha256-K+cR+0a/zRpOvMsX1ZljjJYYOXbHkyDGE9Q9vY1qJBg="; }; nativeBuildInputs = @@ -48,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-iNSpLvIi3oZKSRlkwkDJp5i8MdixRvmWIOCzbFHIdHw="; + hash = "sha256-zGDmmRbaR2boaf9lLzvW/H7xgMo9uHTmlC0oNupLUos="; }; buildInputs = [ @@ -71,10 +73,33 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - updateScript = gnome.updateScript { - attrPath = "libglycin"; - packageName = "glycin"; - }; + updateScript = + let + updateSource = gnome.updateScript { + attrPath = "libglycin"; + packageName = "glycin"; + }; + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${ + lib.makeBinPath [ + common-updater-scripts + ] + } + update-source-version libglycin --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; }; meta = { diff --git a/pkgs/by-name/li/libgpg-error/package.nix b/pkgs/by-name/li/libgpg-error/package.nix index 2270bea43e21..6fc3c016cefe 100644 --- a/pkgs/by-name/li/libgpg-error/package.nix +++ b/pkgs/by-name/li/libgpg-error/package.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation ( rec { pname = "libgpg-error"; - version = "1.51"; + version = "1.55"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-vg8bLba5Pu1VNpzfefGfcnUMjHw5/CC1d+ckVFQn5rI="; + hash = "sha256-lbF4FIhj8H1F3wzqZ+iAp5ue9x9dIwut3ABxEoUW73g="; }; postPatch = '' diff --git a/pkgs/by-name/li/libiio/cmake-fix-libxml2-find-package.patch b/pkgs/by-name/li/libiio/cmake-fix-libxml2-find-package.patch index 034f6d32c7d1..5196508dccd7 100644 --- a/pkgs/by-name/li/libiio/cmake-fix-libxml2-find-package.patch +++ b/pkgs/by-name/li/libiio/cmake-fix-libxml2-find-package.patch @@ -1,13 +1,13 @@ -diff --color -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2022-06-02 02:57:01.503340155 +0300 -+++ b/CMakeLists.txt 2022-06-02 02:54:33.726941188 +0300 -@@ -378,7 +378,7 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d5313c50..0ef102bf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -408,7 +408,7 @@ if (WITH_XML_BACKEND) # So, try first to find the CMake module provided by libxml2 package, then fallback # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially # in static build case). -- find_package(LibXml2 QUIET NO_MODULE) +- find_package(LibXml2 QUIET NO_MODULE NO_SYSTEM_ENVIRONMENT_PATH) + find_package(LibXml2 QUIET MODULE) if(DEFINED LIBXML2_VERSION_STRING) set(LIBXML2_FOUND ON) set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) -Seulement dans b: good.patch diff --git a/pkgs/by-name/li/libiio/hardcode-library-path.patch b/pkgs/by-name/li/libiio/hardcode-library-path.patch index dad35851cdc6..1e9b0805b0d3 100644 --- a/pkgs/by-name/li/libiio/hardcode-library-path.patch +++ b/pkgs/by-name/li/libiio/hardcode-library-path.patch @@ -1,38 +1,19 @@ diff --git a/bindings/python/iio.py b/bindings/python/iio.py -index 5306daa..f8962ee 100644 +index b91260cc..04bcfa7f 100644 --- a/bindings/python/iio.py +++ b/bindings/python/iio.py -@@ -229,9 +229,9 @@ if "Windows" in _system(): - _iiolib = "libiio.dll" - else: - # Non-windows, possibly Posix system -- _iiolib = "iio" -+ _iiolib = "@libiio@" +@@ -218,13 +218,7 @@ _ChannelPtr = _POINTER(_Channel) + _BufferPtr = _POINTER(_Buffer) + _DataFormatPtr = _POINTER(DataFormat) +-if "Windows" in _system(): +- _iiolib = "libiio.dll" +-else: +- # Non-windows, possibly Posix system +- _iiolib = "iio" +- -_lib = _cdll(find_library(_iiolib), use_errno=True, use_last_error=True) -+_lib = _cdll(_iiolib, use_errno=True, use_last_error=True) ++_lib = _cdll("@libiio@", use_errno=True, use_last_error=True) _get_backends_count = _lib.iio_get_backends_count _get_backends_count.restype = c_uint -diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein -index cd14e2e..516c409 100644 ---- a/bindings/python/setup.py.cmakein -+++ b/bindings/python/setup.py.cmakein -@@ -62,7 +62,7 @@ class InstallWrapper(install): - _iiolib = "libiio.dll" - else: - # Non-windows, possibly Posix system -- _iiolib = "iio" -+ _iiolib = "@libiio@" - try: - import os - -@@ -72,7 +72,7 @@ class InstallWrapper(install): - fulllibpath = find_recursive(destdir, "libiio.so") - _lib = _cdll(fulllibpath, use_errno=True, use_last_error=True) - else: -- _lib = _cdll(find_library(_iiolib), use_errno=True, use_last_error=True) -+ _lib = _cdll(_iiolib, use_errno=True, use_last_error=True) - if not _lib._name: - raise OSError - except OSError: diff --git a/pkgs/by-name/li/libiio/package.nix b/pkgs/by-name/li/libiio/package.nix index 582382b8a2a3..67c1a406d920 100644 --- a/pkgs/by-name/li/libiio/package.nix +++ b/pkgs/by-name/li/libiio/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libiio"; - version = "0.24"; + version = "0.26"; outputs = [ "out" @@ -29,13 +29,15 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; - rev = "v${version}"; - sha256 = "sha256-c5HsxCdp1cv5BGTQ/8dc8J893zk9ntbfAudLpqoQ1ow="; + tag = "v${version}"; + hash = "sha256-nrpGccj9Q3S9wYs0/dHC3YAy5ZvTiPiSUtPY6r5WlaE="; }; # Revert after https://github.com/NixOS/nixpkgs/issues/125008 is # fixed properly - patches = [ ./cmake-fix-libxml2-find-package.patch ]; + patches = [ + ./cmake-fix-libxml2-find-package.patch + ]; nativeBuildInputs = [ @@ -79,8 +81,7 @@ stdenv.mkDerivation rec { postPatch = '' - substituteInPlace libiio.rules.cmakein \ - --replace /bin/sh ${runtimeShell} + patchShebangs libiio.rules.cmakein '' + lib.optionalString pythonSupport '' # Hardcode path to the shared library into the bindings. @@ -92,11 +93,18 @@ stdenv.mkDerivation rec { moveToOutput ${python3.sitePackages} "$python" ''; - meta = with lib; { + nativeInstallCheckInputs = lib.optionals pythonSupport [ + python3.pkgs.pythonImportsCheckHook + ]; + + pythonImportsCheck = [ "iio" ]; + + meta = { + changelog = "https://github.com/analogdevicesinc/libiio/releases/tag/${src.tag}"; description = "API for interfacing with the Linux Industrial I/O Subsystem"; homepage = "https://github.com/analogdevicesinc/libiio"; - license = licenses.lgpl21Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ thoughtpolice ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix index e56bbdb07383..a965175ad511 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.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; tag = finalAttrs.version; - hash = "sha256-ImDTMObirpw/SouCftlALJoWCbXsRc6bf4IFjYfWpUY="; + hash = "sha256-yGCMtAa0IjyeSBv3HxCQfYDSbNSbscj3choU6D2dlp8="; }; patches = diff --git a/pkgs/by-name/li/libmspub/package.nix b/pkgs/by-name/li/libmspub/package.nix new file mode 100644 index 000000000000..803be7ab7e32 --- /dev/null +++ b/pkgs/by-name/li/libmspub/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchzip, + fetchpatch, + pkg-config, + boost, + doxygen, + icu, + librevenge, + zlib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libmspub"; + version = "0.1.4"; + + src = fetchzip { + url = "https://dev-www.libreoffice.org/src/libmspub/libmspub-${finalAttrs.version}.tar.xz"; + hash = "sha256-/6e9IGcTIZTlnsakOaSjTn3DsO9ZNQigdCCbMbrBTQE="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + boost + doxygen + icu + librevenge + zlib + ]; + + configureFlags = [ "--with-docs" ]; + + patches = [ + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libmspub/-/raw/main/buildfix.diff?ref_type=heads"; + hash = "sha256-evxEoQ0a6YHoymR+SEJwqfr7rkWp3JnsWOD1tfYfZOw="; + }) + ]; + + meta = { + description = "Microsoft Publisher import library"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libmspub"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + }; +}) diff --git a/pkgs/by-name/li/libmtp/package.nix b/pkgs/by-name/li/libmtp/package.nix index d3edc7c2cf41..f5c2eb548f08 100644 --- a/pkgs/by-name/li/libmtp/package.nix +++ b/pkgs/by-name/li/libmtp/package.nix @@ -3,6 +3,7 @@ autoconf, automake, fetchFromGitHub, + fetchpatch, gettext, lib, libiconv, @@ -23,6 +24,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-hIH6W8qQ6DB4ST7SlFz6CCnLsEGOWgmUb9HoHMNA3wY="; }; + patches = [ + # gettext-0.25 support + (fetchpatch { + name = "gettext-0.25.patch"; + url = "https://github.com/libmtp/libmtp/commit/5e53ee68e61cc6547476b942b6aa9776da5d4eda.patch"; + hash = "sha256-eXDNDHg8K+ZiO9n4RqQPJrh4V9GNiK/ZxZOA/oIX83M="; + }) + (fetchpatch { + name = "gettext-0.25-p2.patch"; + url = "https://github.com/libmtp/libmtp/commit/122eb9d78b370955b9c4d7618b12a2429f01b81a.patch"; + hash = "sha256-Skqr6REBl/Egf9tS5q8k5qmEhFY+rG2fymbiu9e4Mho="; + }) + ]; + outputs = [ "bin" "dev" @@ -41,7 +56,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libusb1 ]; - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + preConfigure = '' + autopoint -f + NOCONFIGURE=1 ./autogen.sh + ''; configureFlags = [ "--with-udev=${placeholder "out"}/lib/udev" ]; diff --git a/pkgs/by-name/li/libmypaint/0001-configure-use-regular-GETTEXT-unconditionally.patch b/pkgs/by-name/li/libmypaint/0001-configure-use-regular-GETTEXT-unconditionally.patch new file mode 100644 index 000000000000..c816f5a892f5 --- /dev/null +++ b/pkgs/by-name/li/libmypaint/0001-configure-use-regular-GETTEXT-unconditionally.patch @@ -0,0 +1,37 @@ +From dd663ee7bf6a2ff7dd47fc360ac7cd44c83039d0 Mon Sep 17 00:00:00 2001 +From: Grimmauld +Date: Sat, 12 Jul 2025 12:46:58 +0200 +Subject: [PATCH] configure: use regular GETTEXT unconditionally + +Modern autoconf breaks when `IT_PROG_INTLTOOL` is conditional [1]. + +`glib` gettext is obsolete and broken, so switch to regular gettext instead. +This also needs to be unconditional. + +To achieve unconditional directives, indentation needs to be removed +as indentation is part of the syntax. + +[1] https://github.com/mypaint/libmypaint/issues/178 +--- + configure.ac | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 416d9fe..9479db9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -248,8 +248,9 @@ if test "x$enable_i18n" != "xno"; then + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The prefix for our gettext translation domains.]) + AC_SUBST(GETTEXT_PACKAGE) +- IT_PROG_INTLTOOL +- AM_GLIB_GNU_GETTEXT ++IT_PROG_INTLTOOL ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.21]) + + dnl Debian: stdlib + dnl Windows, and OSX: -lintl +-- +2.49.0 + diff --git a/pkgs/by-name/li/libmypaint/package.nix b/pkgs/by-name/li/libmypaint/package.nix index 76a98bb5f219..6b20366a57d8 100644 --- a/pkgs/by-name/li/libmypaint/package.nix +++ b/pkgs/by-name/li/libmypaint/package.nix @@ -1,8 +1,6 @@ { lib, stdenv, - autoconf, - automake, fetchFromGitHub, glib, intltool, @@ -10,6 +8,8 @@ libtool, pkg-config, python3, + gettext, + autoreconfHook, }: stdenv.mkDerivation rec { @@ -28,12 +28,17 @@ stdenv.mkDerivation rec { sha256 = "1ppgpmnhph9h8ayx9776f79a0bxbdszfw9c6bw7c3ffy2yk40178"; }; + patches = [ + # glib gettext macros are broken/obsolete, + # so we patch libmypaint to use regular gettext instead. + ./0001-configure-use-regular-GETTEXT-unconditionally.patch + ]; + strictDeps = true; nativeBuildInputs = [ - autoconf - automake - glib # AM_GLIB_GNU_GETTEXT + autoreconfHook + gettext intltool libtool pkg-config diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix index b9a7c8fd31b5..2098ceb2cfa8 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.7.13"; + version = "0.8.0"; 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-3NfN5PnEmOtJbEVW4cG4E1Pip0dH6CcKQlZRF+pC4fE="; + hash = "sha256-VT7pxjxLPLybZk1bwx2LxO6zRfrYgJ8Dy/kxR6EIqzI="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libpagemaker/package.nix b/pkgs/by-name/li/libpagemaker/package.nix new file mode 100644 index 000000000000..4edb59e9d992 --- /dev/null +++ b/pkgs/by-name/li/libpagemaker/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchzip, + fetchpatch, + pkg-config, + boost, + doxygen, + librevenge, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libpagemaker"; + version = "0.0.4"; + + src = fetchzip { + url = "https://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-${finalAttrs.version}.tar.xz"; + hash = "sha256-fAtCNbP0fI2LxTOPPh5zbdF50wWhsrfSoNFPVU9tBas="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + boost + doxygen + librevenge + ]; + + patches = [ + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libpagemaker/-/raw/main/libpagemaker-0.0.4-const-ref-exception.patch?ref_type=heads"; + hash = "sha256-yZbiLAZHgzygGetiuoKiQS010pRfZTi2CbAAxQdCZbs="; + }) + ]; + + meta = { + description = "Adobe PageMaker import library"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/libplist/package.nix b/pkgs/by-name/li/libplist/package.nix index ad66cd6baebe..f85a8ac73398 100644 --- a/pkgs/by-name/li/libplist/package.nix +++ b/pkgs/by-name/li/libplist/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "libplist"; - version = "2.6.0"; + version = "2.7.0"; outputs = [ "bin" @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "libimobiledevice"; repo = "libplist"; rev = version; - hash = "sha256-hitRcOjbF+L9Og9/qajqFqOhKfRn9+iWLoCKmS9dT80="; + hash = "sha256-Rc1KwJR+Pb2lN8019q5ywERrR7WA2LuLRiEvNsZSxXc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix index c665e4bce2bb..28220adbc9a4 100644 --- a/pkgs/by-name/li/libqalculate/package.nix +++ b/pkgs/by-name/li/libqalculate/package.nix @@ -75,12 +75,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '"gnuplot - ' '"${gnuplotBinary} - ' ''; - preBuild = '' - pushd docs/reference - doxygen Doxyfile - popd - ''; - meta = { description = "Advanced calculator library"; homepage = "http://qalculate.github.io"; diff --git a/pkgs/by-name/li/libqxp/package.nix b/pkgs/by-name/li/libqxp/package.nix new file mode 100644 index 000000000000..46a70cf55007 --- /dev/null +++ b/pkgs/by-name/li/libqxp/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchzip, + pkg-config, + boost, + cppunit, + doxygen, + icu, + librevenge, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libqxp"; + version = "0.0.2"; + + src = fetchzip { + url = "https://dev-www.libreoffice.org/src/libqxp/libqxp-${finalAttrs.version}.tar.xz"; + hash = "sha256-5AcZDdmowFbsl9xJ/CPXAUL5zSNu90HgX3V0V8Pt/Rw="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + boost + cppunit + doxygen + icu + librevenge + ]; + + meta = { + description = "QuarkXPress import library"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libqxp"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/librecad/package.nix b/pkgs/by-name/li/librecad/package.nix index 63b730c4a4ea..9a175061c3eb 100644 --- a/pkgs/by-name/li/librecad/package.nix +++ b/pkgs/by-name/li/librecad/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "librecad"; - version = "2.2.1.1"; + version = "2.2.1.2"; src = fetchFromGitHub { owner = "LibreCAD"; repo = "LibreCAD"; tag = "v${finalAttrs.version}"; - hash = "sha256-0RhdX8wUjZ2JQazhFjkfdnxvh5VhXfVMspvhBF03VNk="; + hash = "sha256-a/0prti7aFIzoHXyd6NsiKx4ugW/vRXURAHBrAqyp84="; }; buildInputs = [ diff --git a/pkgs/by-name/li/librime-lua/package.nix b/pkgs/by-name/li/librime-lua/package.nix index b503fecfb138..0c988e2b8b62 100644 --- a/pkgs/by-name/li/librime-lua/package.nix +++ b/pkgs/by-name/li/librime-lua/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "librime-lua"; - version = "0-unstable-2024-12-21"; + version = "0-unstable-2025-07-07"; src = fetchFromGitHub { owner = "hchunhui"; repo = "librime-lua"; - rev = "e3912a4b3ac2c202d89face3fef3d41eb1d7fcd6"; - hash = "sha256-zx0F41szn5qlc2MNjt1vizLIsIFQ67fp5cb8U8UUgtY="; + rev = "68f9c364a2d25a04c7d4794981d7c796b05ab627"; + hash = "sha256-m7/qXdIlMMHscDDcFmusNuOR0cuzPpDQdprqRci8qZw="; }; propagatedBuildInputs = [ lua ]; diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix index b0f5cbc51ce3..ed4aedfd2965 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.1"; + version = "0.11.2"; src = fetchurl { url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz"; - hash = "sha256-FLfcxy6R4IFRxYuYGntXCrJmP2MOfSg3ZF1anGEsG3k="; + hash = "sha256-aVKfwY9bYB8Lrw5aRQGivCbfXi8Rb1+PB/Gfr6ptBOc="; }; outputs = [ diff --git a/pkgs/by-name/li/libsystemtap/package.nix b/pkgs/by-name/li/libsystemtap/package.nix index e79d852912af..f6a981062dec 100644 --- a/pkgs/by-name/li/libsystemtap/package.nix +++ b/pkgs/by-name/li/libsystemtap/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "libsystemtap"; - version = "5.2"; + version = "5.3"; src = fetchgit { url = "git://sourceware.org/git/systemtap.git"; - rev = "release-5.2"; - hash = "sha256-SUPNarZW8vdK9hQaI2kU+rfKWIPiXB4BvJvRNC1T9tU="; + rev = "release-5.3"; + hash = "sha256-W9iJ+hyowqgeq1hGcNQbvPfHpqY0Yt2W/Ng/4p6asxc="; }; dontBuild = true; diff --git a/pkgs/by-name/li/libtpms/package.nix b/pkgs/by-name/li/libtpms/package.nix index 744277555714..f65860d8bf9b 100644 --- a/pkgs/by-name/li/libtpms/package.nix +++ b/pkgs/by-name/li/libtpms/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-YKs/XYJ8UItOtSinl28/G9XFVzobFd4ZDKtClQDLXFk="; + sha256 = "sha256-uj06cAhepTOFxSeiBY/UVP/rtBQHLvrODe4ljU6ALOE="; }; hardeningDisable = [ "strictflexarrays3" ]; diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix index 3e79567280db..3ba541fd11ca 100644 --- a/pkgs/by-name/li/liburcu/package.nix +++ b/pkgs/by-name/li/liburcu/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "0.15.2"; + version = "0.15.3"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - hash = "sha256-WfNvK4vaG3Ygp+ztJjTybFSURIGKgxMCWjuwnAdmph0="; + hash = "sha256-Jmh+yE4+EUdZRUyISgir6ved7AmwQYld30xF7BUKy20="; }; outputs = [ @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ perl ]; + enableParallelBuilding = true; + preCheck = "patchShebangs tests/unit"; doCheck = true; diff --git a/pkgs/by-name/li/libvoikko/package.nix b/pkgs/by-name/li/libvoikko/package.nix index 1c48c08fa53f..bb3f37578008 100644 --- a/pkgs/by-name/li/libvoikko/package.nix +++ b/pkgs/by-name/li/libvoikko/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libvoikko"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "voikko"; repo = "corevoikko"; tag = "rel-libvoikko-${finalAttrs.version}"; - hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M="; + hash = "sha256-iWBIXAJKzjSP5mEBSfI+uZl0b2wRsjrYfdX2cHF/uuk="; }; sourceRoot = "${finalAttrs.src.name}/libvoikko"; diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix index aa6da1a76a12..f5a313cdc5c5 100644 --- a/pkgs/by-name/li/libvpx/package.nix +++ b/pkgs/by-name/li/libvpx/package.nix @@ -131,13 +131,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.15.0"; + version = "1.15.2"; src = fetchFromGitHub { owner = "webmproject"; repo = "libvpx"; rev = "v${version}"; - hash = "sha256-ewkx1okhpa05jn4DyN8pkl6UJoz4Ymw4jRe6GN1lWuA="; + hash = "sha256-1F5Zlue2DY1yJXwfDfGeh3KcFTQVo9voHcGkgItKgh0="; }; postPatch = '' diff --git a/pkgs/by-name/li/libzmf/doxygen.patch b/pkgs/by-name/li/libzmf/doxygen.patch new file mode 100644 index 000000000000..bddef78046bd --- /dev/null +++ b/pkgs/by-name/li/libzmf/doxygen.patch @@ -0,0 +1,30 @@ +diff --git a/docs/doxygen/Makefile.am b/docs/doxygen/Makefile.am +index 4351042..40a02e8 100644 +--- a/docs/doxygen/Makefile.am ++++ b/docs/doxygen/Makefile.am +@@ -6,9 +6,7 @@ if WITH_LIBZMF_DOCS + + install-data-am: + mkdir -p $(DESTDIR)$(docdir)/html +- $(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/ +- $(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/ +- $(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/ ++ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/ + + uninstall-am: + -rm -rf $(DESTDIR)$(docdir)/html +diff --git a/docs/doxygen/Makefile.in b/docs/doxygen/Makefile.in +index 9ad8360..0ff329d 100644 +--- a/docs/doxygen/Makefile.in ++++ b/docs/doxygen/Makefile.in +@@ -476,9 +476,7 @@ ps-am: + + @WITH_LIBZMF_DOCS_TRUE@install-data-am: + @WITH_LIBZMF_DOCS_TRUE@ mkdir -p $(DESTDIR)$(docdir)/html +-@WITH_LIBZMF_DOCS_TRUE@ $(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/ +-@WITH_LIBZMF_DOCS_TRUE@ $(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/ +-@WITH_LIBZMF_DOCS_TRUE@ $(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/ ++@WITH_LIBZMF_DOCS_TRUE@ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/ + + @WITH_LIBZMF_DOCS_TRUE@uninstall-am: + @WITH_LIBZMF_DOCS_TRUE@ -rm -rf $(DESTDIR)$(docdir)/html diff --git a/pkgs/by-name/li/libzmf/package.nix b/pkgs/by-name/li/libzmf/package.nix index 0d7071ec8059..f25e69e77827 100644 --- a/pkgs/by-name/li/libzmf/package.nix +++ b/pkgs/by-name/li/libzmf/package.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; }; + patches = [ + # https://git.libreoffice.org/libzmf/+/48f94abff2fcc4943626a62c6180c60862288b08%5E%21 + ./doxygen.patch + ]; + buildInputs = [ boost icu diff --git a/pkgs/by-name/li/linux-pam/CVE-2025-6020.patch b/pkgs/by-name/li/linux-pam/CVE-2025-6020.patch new file mode 100644 index 000000000000..faa8e440334c --- /dev/null +++ b/pkgs/by-name/li/linux-pam/CVE-2025-6020.patch @@ -0,0 +1,1315 @@ +From 8a44d6aecab1239b79f7b2455d0a70603df2d33c Mon Sep 17 00:00:00 2001 +From: Olivier Bal-Petre +Date: Tue, 4 Mar 2025 14:37:02 +0100 +Subject: [PATCH] pam_namespace: fix potential privilege escalation + +Existing protection provided by protect_dir() and protect_mount() were +bind mounting on themselves all directories part of the to-be-secured +paths. However, this works *only* against attacks executed by processes +in the same mount namespace as the one the mountpoint was created in. +Therefore, a user with an out-of-mount-namespace access, or multiple +users colluding, could exploit multiple race conditions, and, for +instance, elevate their privileges to root. + +This commit keeps the existing protection as a defense in depth +measure, and to keep the existing behavior of the module. However, +it converts all the needed function calls to operate on file +descriptors instead of absolute paths to protect against race +conditions globally. + +Signed-off-by: Olivier Bal-Petre +Signed-off-by: Dmitry V. Levin + +(cherry-picked from 475bd60c552b98c7eddb3270b0b4196847c0072e) +--- + modules/pam_namespace/pam_namespace.c | 896 +++++++++++++++++--------- + modules/pam_namespace/pam_namespace.h | 10 + + 2 files changed, 588 insertions(+), 318 deletions(-) + +diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c +index e499d95a..93c4dbe0 100644 +--- a/modules/pam_namespace/pam_namespace.c ++++ b/modules/pam_namespace/pam_namespace.c +@@ -41,6 +41,8 @@ + #include "pam_namespace.h" + #include "argv_parse.h" + ++#define MAGIC_LNK_FD_SIZE 64 ++ + /* --- evaluating all files in VENDORDIR/security/namespace.d and /etc/security/namespace.d --- */ + static const char *base_name(const char *path) + { +@@ -63,6 +65,248 @@ static void close_fds_pre_exec(struct instance_data *idata) + } + } + ++static void ++strip_trailing_slashes(char *str) ++{ ++ char *p = str + strlen(str); ++ ++ while (--p > str && *p == '/') ++ *p = '\0'; ++} ++ ++static int protect_mount(int dfd, const char *path, struct instance_data *idata) ++{ ++ struct protect_dir_s *dir = idata->protect_dirs; ++ char tmpbuf[MAGIC_LNK_FD_SIZE]; ++ ++ while (dir != NULL) { ++ if (strcmp(path, dir->dir) == 0) { ++ return 0; ++ } ++ dir = dir->next; ++ } ++ ++ if (pam_sprintf(tmpbuf, "/proc/self/fd/%d", dfd) < 0) ++ return -1; ++ ++ dir = calloc(1, sizeof(*dir)); ++ ++ if (dir == NULL) { ++ return -1; ++ } ++ ++ dir->dir = strdup(path); ++ ++ if (dir->dir == NULL) { ++ free(dir); ++ return -1; ++ } ++ ++ if (idata->flags & PAMNS_DEBUG) { ++ pam_syslog(idata->pamh, LOG_INFO, ++ "Protect mount of %s over itself", path); ++ } ++ ++ if (mount(tmpbuf, tmpbuf, NULL, MS_BIND, NULL) != 0) { ++ int save_errno = errno; ++ pam_syslog(idata->pamh, LOG_ERR, ++ "Protect mount of %s failed: %m", tmpbuf); ++ free(dir->dir); ++ free(dir); ++ errno = save_errno; ++ return -1; ++ } ++ ++ dir->next = idata->protect_dirs; ++ idata->protect_dirs = dir; ++ ++ return 0; ++} ++ ++/* ++ * Returns a fd to the given absolute path, acquired securely. This means: ++ * - iterating on each segment of the path, ++ * - not following user symlinks, ++ * - using race-free operations. ++ * ++ * Takes a bit mask to specify the operation mode: ++ * - SECURE_OPENDIR_PROTECT: call protect_mount() on each unsafe segment of path ++ * - SECURE_OPENDIR_MKDIR: create last segment of path if does not exist ++ * - SECURE_OPENDIR_FULL_FD: open the directory with O_RDONLY instead of O_PATH, ++ * allowing more operations to be done with the returned fd ++ * ++ * Be aware that using SECURE_OPENDIR_PROTECT: ++ * - will modify some external state (global structure...) and should not be ++ * called in cleanup code paths. See wrapper secure_opendir_stateless() ++ * - need a non-NULL idata to call protect_mount() ++ */ ++static int secure_opendir(const char *path, int opm, mode_t mode, ++ struct instance_data *idata) ++{ ++ char *p; ++ char *d; ++ char *dir; ++ int dfd = -1; ++ int dfd_next; ++ int save_errno; ++ int flags = O_DIRECTORY | O_CLOEXEC; ++ int rv = -1; ++ struct stat st; ++ ++ if (opm & SECURE_OPENDIR_FULL_FD) ++ flags |= O_RDONLY; ++ else ++ flags |= O_PATH; ++ ++ /* Check for args consistency */ ++ if ((opm & SECURE_OPENDIR_PROTECT) && idata == NULL) ++ return -1; ++ ++ /* Accept only absolute paths */ ++ if (*path != '/') ++ return -1; ++ ++ dir = p = strdup(path); ++ if (p == NULL) ++ return -1; ++ ++ /* Assume '/' is safe */ ++ dfd = open("/", flags); ++ if (dfd == -1) ++ goto error; ++ ++ /* Needed to not loop too far and call openat() on NULL */ ++ strip_trailing_slashes(p); ++ ++ dir++; ++ ++ /* In case path is '/' */ ++ if (*dir == '\0') { ++ free(p); ++ return dfd; ++ } ++ ++ while ((d=strchr(dir, '/')) != NULL) { ++ *d = '\0'; ++ ++ dfd_next = openat(dfd, dir, flags); ++ if (dfd_next == -1) ++ goto error; ++ ++ if (fstat(dfd_next, &st) != 0) { ++ close(dfd_next); ++ goto error; ++ } ++ ++ if ((flags & O_NOFOLLOW) && (opm & SECURE_OPENDIR_PROTECT)) { ++ /* we are inside user-owned dir - protect */ ++ if (protect_mount(dfd_next, p, idata) == -1) { ++ close(dfd_next); ++ goto error; ++ } ++ /* ++ * Reopen the directory to obtain a new descriptor ++ * after protect_mount(), this is necessary in cases ++ * when another directory is going to be mounted over ++ * the given path. ++ */ ++ close(dfd_next); ++ dfd_next = openat(dfd, dir, flags); ++ if (dfd_next == -1) ++ goto error; ++ } else if (st.st_uid != 0 ++ || (st.st_gid != 0 && (st.st_mode & S_IWGRP)) ++ || (st.st_mode & S_IWOTH)) { ++ /* do not follow symlinks on subdirectories */ ++ flags |= O_NOFOLLOW; ++ } ++ ++ close(dfd); ++ dfd = dfd_next; ++ ++ *d = '/'; ++ dir = d + 1; ++ } ++ ++ rv = openat(dfd, dir, flags); ++ ++ if (rv == -1) { ++ if ((opm & SECURE_OPENDIR_MKDIR) && mkdirat(dfd, dir, mode) == 0) ++ rv = openat(dfd, dir, flags); ++ ++ if (rv == -1) ++ goto error; ++ } ++ ++ if ((flags & O_NOFOLLOW) && (opm & SECURE_OPENDIR_PROTECT)) { ++ /* we are inside user-owned dir - protect */ ++ if (protect_mount(rv, p, idata) == -1) { ++ save_errno = errno; ++ close(rv); ++ rv = -1; ++ errno = save_errno; ++ } ++ /* ++ * Reopen the directory to obtain a new descriptor after ++ * protect_mount(), this is necessary in cases when another ++ * directory is going to be mounted over the given path. ++ */ ++ close(rv); ++ rv = openat(dfd, dir, flags); ++ } ++ ++error: ++ save_errno = errno; ++ free(p); ++ if (dfd >= 0) ++ close(dfd); ++ errno = save_errno; ++ ++ return rv; ++} ++ ++/* ++ * Returns a fd to the given path, acquired securely. ++ * It can be called in all situations, including in cleanup code paths, as ++ * it does not modify external state (no access to global structures...). ++ */ ++static int secure_opendir_stateless(const char *path) ++{ ++ return secure_opendir(path, 0, 0, NULL); ++} ++ ++/* ++ * Umount securely the given path, even if the directories along ++ * the path are under user control. It should protect against ++ * symlinks attacks and race conditions. ++ */ ++static int secure_umount(const char *path) ++{ ++ int save_errno; ++ int rv = -1; ++ int dfd = -1; ++ char s_path[MAGIC_LNK_FD_SIZE]; ++ ++ dfd = secure_opendir_stateless(path); ++ if (dfd == -1) ++ return rv; ++ ++ if (pam_sprintf(s_path, "/proc/self/fd/%d", dfd) < 0) ++ goto error; ++ ++ /* ++ * We still have a fd open to path itself, ++ * so we need to do a lazy umount. ++ */ ++ rv = umount2(s_path, MNT_DETACH); ++ ++error: ++ save_errno = errno; ++ close(dfd); ++ errno = save_errno; ++ return rv; ++} ++ + /* Evaluating a list of files which have to be parsed in the right order: + * + * - If etc/security/namespace.d/@filename@.conf exists, then +@@ -188,7 +432,7 @@ static void unprotect_dirs(struct protect_dir_s *dir) + struct protect_dir_s *next; + + while (dir != NULL) { +- umount(dir->dir); ++ secure_umount(dir->dir); + free(dir->dir); + next = dir->next; + free(dir); +@@ -606,14 +850,9 @@ static int process_line(char *line, const char *home, const char *rhome, + goto skipping; + } + +-#define COPY_STR(dst, src, apd) \ +- (snprintf((dst), sizeof(dst), "%s%s", (src), (apd)) != \ +- (ssize_t) (strlen(src) + strlen(apd))) +- +- if (COPY_STR(poly->dir, dir, "") +- || COPY_STR(poly->rdir, rdir, "") +- || COPY_STR(poly->instance_prefix, instance_prefix, +- poly->method == TMPDIR ? "XXXXXX" : "")) { ++ if (pam_sprintf(poly->dir, "%s", dir) < 0 ++ || pam_sprintf(poly->rdir, "%s", rdir) < 0 ++ || pam_sprintf(poly->instance_prefix, "%s", instance_prefix) < 0) { + pam_syslog(idata->pamh, LOG_NOTICE, "Pathnames too long"); + goto skipping; + } +@@ -896,6 +1135,23 @@ static char *md5hash(const char *instname, struct instance_data *idata) + } + + #ifdef WITH_SELINUX ++static char *secure_getfilecon(pam_handle_t *pamh, const char *dir) ++{ ++ char *ctx = NULL; ++ int dfd = secure_opendir(dir, SECURE_OPENDIR_FULL_FD, 0, NULL); ++ if (dfd < 0) { ++ pam_syslog(pamh, LOG_ERR, "Error getting fd to %s: %m", dir); ++ return NULL; ++ } ++ if (fgetfilecon(dfd, &ctx) < 0) ++ ctx = NULL; ++ if (ctx == NULL) ++ pam_syslog(pamh, LOG_ERR, ++ "Error getting poly dir context for %s: %m", dir); ++ close(dfd); ++ return ctx; ++} ++ + static int form_context(const struct polydir_s *polyptr, + char **i_context, char **origcon, + struct instance_data *idata) +@@ -907,12 +1163,9 @@ static int form_context(const struct polydir_s *polyptr, + /* + * Get the security context of the directory to polyinstantiate. + */ +- rc = getfilecon(polyptr->dir, origcon); +- if (rc < 0 || *origcon == NULL) { +- pam_syslog(idata->pamh, LOG_ERR, +- "Error getting poly dir context, %m"); ++ *origcon = secure_getfilecon(idata->pamh, polyptr->dir); ++ if (*origcon == NULL) + return PAM_SESSION_ERR; +- } + + if (polyptr->method == USER) return PAM_SUCCESS; + +@@ -1008,29 +1261,52 @@ static int form_context(const struct polydir_s *polyptr, + #endif + + /* +- * poly_name returns the name of the polyinstantiated instance directory ++ * From the instance differentiation string, set in the polyptr structure: ++ * - the absolute path to the instance dir, ++ * - the absolute path to the previous dir (parent), ++ * - the instance name (may be different than the instance differentiation string) ++ */ ++static int set_polydir_paths(struct polydir_s *polyptr, const char *inst_differentiation) ++{ ++ char *tmp; ++ ++ if (pam_sprintf(polyptr->instance_absolute, "%s%s", ++ polyptr->instance_prefix, inst_differentiation) < 0) ++ return -1; ++ ++ polyptr->instname = strrchr(polyptr->instance_absolute, '/') + 1; ++ ++ if (pam_sprintf(polyptr->instance_parent, "%s", polyptr->instance_absolute) < 0) ++ return -1; ++ ++ tmp = strrchr(polyptr->instance_parent, '/') + 1; ++ *tmp = '\0'; ++ ++ return 0; ++} ++ ++/* ++ * Set the name of the polyinstantiated instance directory + * based on the method used for polyinstantiation (user, context or level) + * In addition, the function also returns the security contexts of the + * original directory to polyinstantiate and the polyinstantiated instance + * directory. + */ + #ifdef WITH_SELINUX +-static int poly_name(const struct polydir_s *polyptr, char **i_name, +- char **i_context, char **origcon, +- struct instance_data *idata) ++static int poly_name(struct polydir_s *polyptr, char **i_context, ++ char **origcon, struct instance_data *idata) + #else +-static int poly_name(const struct polydir_s *polyptr, char **i_name, +- struct instance_data *idata) ++static int poly_name(struct polydir_s *polyptr, struct instance_data *idata) + #endif + { + int rc; ++ char *inst_differentiation = NULL; + char *hash = NULL; + enum polymethod pm; + #ifdef WITH_SELINUX + char *rawcon = NULL; + #endif + +- *i_name = NULL; + #ifdef WITH_SELINUX + *i_context = NULL; + *origcon = NULL; +@@ -1064,10 +1340,8 @@ static int poly_name(const struct polydir_s *polyptr, char **i_name, + + switch (pm) { + case USER: +- if (asprintf(i_name, "%s", idata->user) < 0) { +- *i_name = NULL; ++ if ((inst_differentiation = strdup(idata->user)) == NULL) + goto fail; +- } + break; + + #ifdef WITH_SELINUX +@@ -1077,26 +1351,23 @@ static int poly_name(const struct polydir_s *polyptr, char **i_name, + pam_syslog(idata->pamh, LOG_ERR, "Error translating directory context"); + goto fail; + } +- if (polyptr->flags & POLYDIR_SHARED) { +- if (asprintf(i_name, "%s", rawcon) < 0) { +- *i_name = NULL; +- goto fail; +- } +- } else { +- if (asprintf(i_name, "%s_%s", rawcon, idata->user) < 0) { +- *i_name = NULL; +- goto fail; +- } +- } ++ if (polyptr->flags & POLYDIR_SHARED) ++ inst_differentiation = strdup(rawcon); ++ else ++ inst_differentiation = pam_asprintf("%s_%s", rawcon, idata->user); ++ if (inst_differentiation == NULL) ++ goto fail; + break; +- + #endif /* WITH_SELINUX */ +- + case TMPDIR: ++ if ((inst_differentiation = strdup("XXXXXX")) == NULL) ++ goto fail; ++ goto success; ++ + case TMPFS: +- if ((*i_name=strdup("")) == NULL) ++ if ((inst_differentiation=strdup("")) == NULL) + goto fail; +- return PAM_SUCCESS; ++ goto success; + + default: + if (idata->flags & PAMNS_DEBUG) +@@ -1105,31 +1376,37 @@ static int poly_name(const struct polydir_s *polyptr, char **i_name, + } + + if (idata->flags & PAMNS_DEBUG) +- pam_syslog(idata->pamh, LOG_DEBUG, "poly_name %s", *i_name); ++ pam_syslog(idata->pamh, LOG_DEBUG, "poly_name %s", inst_differentiation); + +- if ((idata->flags & PAMNS_GEN_HASH) || strlen(*i_name) > NAMESPACE_MAX_DIR_LEN) { +- hash = md5hash(*i_name, idata); ++ if ((idata->flags & PAMNS_GEN_HASH) || strlen(inst_differentiation) > NAMESPACE_MAX_DIR_LEN) { ++ hash = md5hash(inst_differentiation, idata); + if (hash == NULL) { + goto fail; + } + if (idata->flags & PAMNS_GEN_HASH) { +- free(*i_name); +- *i_name = hash; ++ free(inst_differentiation); ++ inst_differentiation = hash; + hash = NULL; + } else { +- char *newname; +- if (asprintf(&newname, "%.*s_%s", NAMESPACE_MAX_DIR_LEN-1-(int)strlen(hash), +- *i_name, hash) < 0) { ++ char *newname = ++ pam_asprintf("%.*s_%s", ++ NAMESPACE_MAX_DIR_LEN - 1 - (int)strlen(hash), ++ inst_differentiation, hash); ++ if (newname == NULL) + goto fail; +- } +- free(*i_name); +- *i_name = newname; ++ free(inst_differentiation); ++ inst_differentiation = newname; + } + } +- rc = PAM_SUCCESS; + ++success: ++ if (set_polydir_paths(polyptr, inst_differentiation) == -1) ++ goto fail; ++ ++ rc = PAM_SUCCESS; + fail: + free(hash); ++ free(inst_differentiation); + #ifdef WITH_SELINUX + freecon(rawcon); + #endif +@@ -1140,186 +1417,65 @@ fail: + freecon(*origcon); + *origcon = NULL; + #endif +- free(*i_name); +- *i_name = NULL; + } + return rc; + } + +-static int protect_mount(int dfd, const char *path, struct instance_data *idata) ++/* ++ * Rmdir the given path securely, protecting against symlinks attacks ++ * and race conditions. ++ * This function is currently called only in cleanup code paths where ++ * any errors returned are not handled, so do not handle them either. ++ * Basically, try to rmdir the path on a best-effort basis. ++ */ ++static void secure_try_rmdir(const char *path) + { +- struct protect_dir_s *dir = idata->protect_dirs; +- char tmpbuf[64]; +- +- while (dir != NULL) { +- if (strcmp(path, dir->dir) == 0) { +- return 0; +- } +- dir = dir->next; +- } +- +- dir = calloc(1, sizeof(*dir)); +- +- if (dir == NULL) { +- return -1; +- } +- +- dir->dir = strdup(path); +- +- if (dir->dir == NULL) { +- free(dir); +- return -1; +- } ++ int dfd; ++ char *buf; ++ char *parent; + +- snprintf(tmpbuf, sizeof(tmpbuf), "/proc/self/fd/%d", dfd); ++ buf = strdup(path); ++ if (buf == NULL) ++ return; + +- if (idata->flags & PAMNS_DEBUG) { +- pam_syslog(idata->pamh, LOG_INFO, +- "Protect mount of %s over itself", path); +- } ++ parent = dirname(buf); + +- if (mount(tmpbuf, tmpbuf, NULL, MS_BIND, NULL) != 0) { +- int save_errno = errno; +- pam_syslog(idata->pamh, LOG_ERR, +- "Protect mount of %s failed: %m", tmpbuf); +- free(dir->dir); +- free(dir); +- errno = save_errno; +- return -1; ++ dfd = secure_opendir_stateless(parent); ++ if (dfd >= 0) { ++ unlinkat(dfd, base_name(path), AT_REMOVEDIR); ++ close(dfd); + } + +- dir->next = idata->protect_dirs; +- idata->protect_dirs = dir; +- +- return 0; ++ free(buf); + } + +-static int protect_dir(const char *path, mode_t mode, int do_mkdir, +- struct instance_data *idata) +-{ +- char *p = strdup(path); +- char *d; +- char *dir = p; +- int dfd = AT_FDCWD; +- int dfd_next; +- int save_errno; +- int flags = O_RDONLY | O_DIRECTORY; +- int rv = -1; +- struct stat st; +- +- if (p == NULL) { +- goto error; +- } +- +- if (*dir == '/') { +- dfd = open("/", flags); +- if (dfd == -1) { +- goto error; +- } +- dir++; /* assume / is safe */ +- } +- +- while ((d=strchr(dir, '/')) != NULL) { +- *d = '\0'; +- dfd_next = openat(dfd, dir, flags); +- if (dfd_next == -1) { +- goto error; +- } +- +- if (dfd != AT_FDCWD) +- close(dfd); +- dfd = dfd_next; +- +- if (fstat(dfd, &st) != 0) { +- goto error; +- } +- +- if (flags & O_NOFOLLOW) { +- /* we are inside user-owned dir - protect */ +- if (protect_mount(dfd, p, idata) == -1) +- goto error; +- } else if (st.st_uid != 0 || st.st_gid != 0 || +- (st.st_mode & S_IWOTH)) { +- /* do not follow symlinks on subdirectories */ +- flags |= O_NOFOLLOW; +- } +- +- *d = '/'; +- dir = d + 1; +- } +- +- rv = openat(dfd, dir, flags); +- +- if (rv == -1) { +- if (!do_mkdir || mkdirat(dfd, dir, mode) != 0) { +- goto error; +- } +- rv = openat(dfd, dir, flags); +- } + +- if (flags & O_NOFOLLOW) { +- /* we are inside user-owned dir - protect */ +- if (protect_mount(rv, p, idata) == -1) { +- save_errno = errno; +- close(rv); +- rv = -1; +- errno = save_errno; +- } +- } + +-error: +- save_errno = errno; +- free(p); +- if (dfd != AT_FDCWD && dfd >= 0) +- close(dfd); +- errno = save_errno; +- +- return rv; +-} +- +-static int check_inst_parent(char *ipath, struct instance_data *idata) ++static int check_inst_parent(int dfd, struct instance_data *idata) + { + struct stat instpbuf; +- char *inst_parent, *trailing_slash; +- int dfd; ++ + /* +- * stat the instance parent path to make sure it exists +- * and is a directory. Check that its mode is 000 (unless the +- * admin explicitly instructs to ignore the instance parent +- * mode by the "ignore_instance_parent_mode" argument). ++ * Stat the instance parent directory to make sure it's writable by ++ * root only (unless the admin explicitly instructs to ignore the ++ * instance parent mode by the "ignore_instance_parent_mode" argument). + */ +- inst_parent = strdup(ipath); +- if (!inst_parent) { +- pam_syslog(idata->pamh, LOG_CRIT, "Error allocating pathname string"); +- return PAM_SESSION_ERR; +- } + +- trailing_slash = strrchr(inst_parent, '/'); +- if (trailing_slash) +- *trailing_slash = '\0'; +- +- dfd = protect_dir(inst_parent, 0, 1, idata); ++ if (idata->flags & PAMNS_IGN_INST_PARENT_MODE) ++ return PAM_SUCCESS; + +- if (dfd == -1 || fstat(dfd, &instpbuf) < 0) { ++ if (fstat(dfd, &instpbuf) < 0) { + pam_syslog(idata->pamh, LOG_ERR, +- "Error creating or accessing instance parent %s, %m", inst_parent); +- if (dfd != -1) +- close(dfd); +- free(inst_parent); ++ "Error accessing instance parent, %m"); + return PAM_SESSION_ERR; + } + +- if ((idata->flags & PAMNS_IGN_INST_PARENT_MODE) == 0) { +- if ((instpbuf.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)) || instpbuf.st_uid != 0) { +- pam_syslog(idata->pamh, LOG_ERR, "Mode of inst parent %s not 000 or owner not root", +- inst_parent); +- close(dfd); +- free(inst_parent); +- return PAM_SESSION_ERR; +- } ++ if ((instpbuf.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)) || instpbuf.st_uid != 0) { ++ pam_syslog(idata->pamh, LOG_ERR, ++ "Mode of inst parent not 000 or owner not root"); ++ return PAM_SESSION_ERR; + } +- close(dfd); +- free(inst_parent); ++ + return PAM_SUCCESS; + } + +@@ -1457,11 +1613,16 @@ static int create_polydir(struct polydir_s *polyptr, + } + #endif + +- rc = protect_dir(dir, mode, 1, idata); ++ rc = secure_opendir(dir, ++ SECURE_OPENDIR_PROTECT | SECURE_OPENDIR_MKDIR | SECURE_OPENDIR_FULL_FD, ++ mode, idata); + if (rc == -1) { + pam_syslog(idata->pamh, LOG_ERR, + "Error creating directory %s: %m", dir); +- return PAM_SESSION_ERR; ++#ifdef WITH_SELINUX ++ freecon(oldcon_raw); ++#endif ++ return -1; + } + + #ifdef WITH_SELINUX +@@ -1482,9 +1643,9 @@ static int create_polydir(struct polydir_s *polyptr, + pam_syslog(idata->pamh, LOG_ERR, + "Error changing mode of directory %s: %m", dir); + close(rc); +- umount(dir); /* undo the eventual protection bind mount */ +- rmdir(dir); +- return PAM_SESSION_ERR; ++ secure_umount(dir); /* undo the eventual protection bind mount */ ++ secure_try_rmdir(dir); ++ return -1; + } + } + +@@ -1502,41 +1663,37 @@ static int create_polydir(struct polydir_s *polyptr, + pam_syslog(idata->pamh, LOG_ERR, + "Unable to change owner on directory %s: %m", dir); + close(rc); +- umount(dir); /* undo the eventual protection bind mount */ +- rmdir(dir); +- return PAM_SESSION_ERR; ++ secure_umount(dir); /* undo the eventual protection bind mount */ ++ secure_try_rmdir(dir); ++ return -1; + } + +- close(rc); +- + if (idata->flags & PAMNS_DEBUG) + pam_syslog(idata->pamh, LOG_DEBUG, + "Polydir owner %u group %u", uid, gid); + +- return PAM_SUCCESS; ++ return rc; + } + + /* +- * Create polyinstantiated instance directory (ipath). ++ * Create polyinstantiated instance directory. ++ * To protect against races, changes are done on a fd to the parent of the ++ * instance directory (dfd_iparent) and a relative path (polyptr->instname). ++ * The absolute path (polyptr->instance_absolute) is only updated when creating ++ * a tmpdir and used for logging purposes. + */ + #ifdef WITH_SELINUX +-static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat *statbuf, +- const char *icontext, const char *ocontext, +- struct instance_data *idata) ++static int create_instance(struct polydir_s *polyptr, int dfd_iparent, ++ struct stat *statbuf, const char *icontext, const char *ocontext, ++ struct instance_data *idata) + #else +-static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat *statbuf, +- struct instance_data *idata) ++static int create_instance(struct polydir_s *polyptr, int dfd_iparent, ++ struct stat *statbuf, struct instance_data *idata) + #endif + { + struct stat newstatbuf; + int fd; + +- /* +- * Check to make sure instance parent is valid. +- */ +- if (check_inst_parent(ipath, idata)) +- return PAM_SESSION_ERR; +- + /* + * Create instance directory and set its security context to the context + * returned by the security policy. Set its mode and ownership +@@ -1545,29 +1702,39 @@ static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat * + */ + + if (polyptr->method == TMPDIR) { +- if (mkdtemp(polyptr->instance_prefix) == NULL) { +- pam_syslog(idata->pamh, LOG_ERR, "Error creating temporary instance %s, %m", +- polyptr->instance_prefix); +- polyptr->method = NONE; /* do not clean up! */ +- return PAM_SESSION_ERR; +- } +- /* copy the actual directory name to ipath */ +- strcpy(ipath, polyptr->instance_prefix); +- } else if (mkdir(ipath, S_IRUSR) < 0) { ++ char s_path[PATH_MAX]; ++ /* ++ * Create the template for mkdtemp() as a magic link based on ++ * our existing fd to avoid symlink attacks and races. ++ */ ++ if (pam_sprintf(s_path, "/proc/self/fd/%d/%s", dfd_iparent, polyptr->instname) < 0 ++ || mkdtemp(s_path) == NULL) { ++ pam_syslog(idata->pamh, LOG_ERR, ++ "Error creating temporary instance dir %s, %m", ++ polyptr->instance_absolute); ++ polyptr->method = NONE; /* do not clean up! */ ++ return PAM_SESSION_ERR; ++ } ++ ++ /* Copy the actual directory name to polyptr->instname */ ++ strcpy(polyptr->instname, base_name(s_path)); ++ } else if (mkdirat(dfd_iparent, polyptr->instname, S_IRUSR) < 0) { + if (errno == EEXIST) + return PAM_IGNORE; + else { + pam_syslog(idata->pamh, LOG_ERR, "Error creating %s, %m", +- ipath); ++ polyptr->instance_absolute); + return PAM_SESSION_ERR; + } + } + +- /* Open a descriptor to it to prevent races */ +- fd = open(ipath, O_DIRECTORY | O_RDONLY); ++ /* Open a descriptor to prevent races, based on our existing fd. */ ++ fd = openat(dfd_iparent, polyptr->instname, ++ O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC); + if (fd < 0) { +- pam_syslog(idata->pamh, LOG_ERR, "Error opening %s, %m", ipath); +- rmdir(ipath); ++ pam_syslog(idata->pamh, LOG_ERR, "Error opening %s, %m", ++ polyptr->instance_absolute); ++ unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR); + return PAM_SESSION_ERR; + } + #ifdef WITH_SELINUX +@@ -1577,17 +1744,19 @@ static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat * + if (icontext) { + if (fsetfilecon(fd, icontext) < 0) { + pam_syslog(idata->pamh, LOG_ERR, +- "Error setting context of %s to %s", ipath, icontext); ++ "Error setting context of %s to %s", ++ polyptr->instance_absolute, icontext); + close(fd); +- rmdir(ipath); ++ unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR); + return PAM_SESSION_ERR; + } + } else { + if (fsetfilecon(fd, ocontext) < 0) { + pam_syslog(idata->pamh, LOG_ERR, +- "Error setting context of %s to %s", ipath, ocontext); ++ "Error setting context of %s to %s", ++ polyptr->instance_absolute, ocontext); + close(fd); +- rmdir(ipath); ++ unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR); + return PAM_SESSION_ERR; + } + } +@@ -1595,9 +1764,9 @@ static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat * + #endif + if (fstat(fd, &newstatbuf) < 0) { + pam_syslog(idata->pamh, LOG_ERR, "Error stating %s, %m", +- ipath); ++ polyptr->instance_absolute); + close(fd); +- rmdir(ipath); ++ unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR); + return PAM_SESSION_ERR; + } + if (newstatbuf.st_uid != statbuf->st_uid || +@@ -1605,17 +1774,17 @@ static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat * + if (fchown(fd, statbuf->st_uid, statbuf->st_gid) < 0) { + pam_syslog(idata->pamh, LOG_ERR, + "Error changing owner for %s, %m", +- ipath); ++ polyptr->instance_absolute); + close(fd); +- rmdir(ipath); ++ unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR); + return PAM_SESSION_ERR; + } + } + if (fchmod(fd, statbuf->st_mode & 07777) < 0) { + pam_syslog(idata->pamh, LOG_ERR, "Error changing mode for %s, %m", +- ipath); ++ polyptr->instance_absolute); + close(fd); +- rmdir(ipath); ++ unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR); + return PAM_SESSION_ERR; + } + close(fd); +@@ -1634,9 +1803,12 @@ static int ns_setup(struct polydir_s *polyptr, + struct instance_data *idata) + { + int retval; ++ int dfd_iparent = -1; ++ int dfd_ipath = -1; ++ int dfd_pptrdir = -1; + int newdir = 1; +- char *inst_dir = NULL; +- char *instname = NULL; ++ char s_ipath[MAGIC_LNK_FD_SIZE]; ++ char s_pptrdir[MAGIC_LNK_FD_SIZE]; + struct stat statbuf; + #ifdef WITH_SELINUX + char *instcontext = NULL, *origcontext = NULL; +@@ -1646,39 +1818,48 @@ static int ns_setup(struct polydir_s *polyptr, + pam_syslog(idata->pamh, LOG_DEBUG, + "Set namespace for directory %s", polyptr->dir); + +- retval = protect_dir(polyptr->dir, 0, 0, idata); +- +- if (retval < 0 && errno != ENOENT) { +- pam_syslog(idata->pamh, LOG_ERR, "Polydir %s access error: %m", +- polyptr->dir); +- return PAM_SESSION_ERR; +- } ++ dfd_pptrdir = secure_opendir(polyptr->dir, SECURE_OPENDIR_PROTECT, 0, idata); + +- if (retval < 0) { +- if ((polyptr->flags & POLYDIR_CREATE) && +- create_polydir(polyptr, idata) != PAM_SUCCESS) +- return PAM_SESSION_ERR; +- } else { +- close(retval); ++ if (dfd_pptrdir < 0) { ++ if (errno != ENOENT || !(polyptr->flags & POLYDIR_CREATE)) { ++ pam_syslog(idata->pamh, LOG_ERR, "Polydir %s access error: %m", ++ polyptr->dir); ++ return PAM_SESSION_ERR; ++ } ++ dfd_pptrdir = create_polydir(polyptr, idata); ++ if (dfd_pptrdir < 0) ++ return PAM_SESSION_ERR; + } + + if (polyptr->method == TMPFS) { +- if (mount("tmpfs", polyptr->dir, "tmpfs", polyptr->mount_flags, polyptr->mount_opts) < 0) { +- pam_syslog(idata->pamh, LOG_ERR, "Error mounting tmpfs on %s, %m", +- polyptr->dir); +- return PAM_SESSION_ERR; +- } ++ /* ++ * There is no function mount() that operate on a fd, so instead, we ++ * get the magic link corresponding to the fd and give it to mount(). ++ * This protects against potential races exploitable by an unpriv user. ++ */ ++ if (pam_sprintf(s_pptrdir, "/proc/self/fd/%d", dfd_pptrdir) < 0) { ++ pam_syslog(idata->pamh, LOG_ERR, "Error pam_sprintf s_pptrdir"); ++ goto error_out; ++ } ++ ++ if (mount("tmpfs", s_pptrdir, "tmpfs", polyptr->mount_flags, polyptr->mount_opts) < 0) { ++ pam_syslog(idata->pamh, LOG_ERR, "Error mounting tmpfs on %s, %m", ++ polyptr->dir); ++ goto error_out; ++ } + +- if (polyptr->flags & POLYDIR_NOINIT) +- return PAM_SUCCESS; ++ if (polyptr->flags & POLYDIR_NOINIT) { ++ retval = PAM_SUCCESS; ++ goto cleanup; ++ } + +- return inst_init(polyptr, "tmpfs", idata, 1); ++ retval = inst_init(polyptr, "tmpfs", idata, 1); ++ goto cleanup; + } + +- if (stat(polyptr->dir, &statbuf) < 0) { +- pam_syslog(idata->pamh, LOG_ERR, "Error stating %s: %m", +- polyptr->dir); +- return PAM_SESSION_ERR; ++ if (fstat(dfd_pptrdir, &statbuf) < 0) { ++ pam_syslog(idata->pamh, LOG_ERR, "Error stating %s: %m", polyptr->dir); ++ goto error_out; + } + + /* +@@ -1687,16 +1868,17 @@ static int ns_setup(struct polydir_s *polyptr, + * security policy. + */ + #ifdef WITH_SELINUX +- retval = poly_name(polyptr, &instname, &instcontext, +- &origcontext, idata); ++ retval = poly_name(polyptr, &instcontext, &origcontext, idata); + #else +- retval = poly_name(polyptr, &instname, idata); ++ retval = poly_name(polyptr, idata); + #endif + + if (retval != PAM_SUCCESS) { +- if (retval != PAM_IGNORE) +- pam_syslog(idata->pamh, LOG_ERR, "Error getting instance name"); +- goto cleanup; ++ if (retval != PAM_IGNORE) { ++ pam_syslog(idata->pamh, LOG_ERR, "Error getting instance name"); ++ goto error_out; ++ } ++ goto cleanup; + } else { + #ifdef WITH_SELINUX + if ((idata->flags & PAMNS_DEBUG) && +@@ -1706,22 +1888,33 @@ static int ns_setup(struct polydir_s *polyptr, + #endif + } + +- if (asprintf(&inst_dir, "%s%s", polyptr->instance_prefix, instname) < 0) +- goto error_out; +- +- if (idata->flags & PAMNS_DEBUG) +- pam_syslog(idata->pamh, LOG_DEBUG, "instance_dir %s", +- inst_dir); ++ /* ++ * Gets a fd in a secure manner (we may be operating on a path under ++ * user control), and check it's compliant. ++ * Then, we should *always* operate on *this* fd and a relative path ++ * to be protected against race conditions. ++ */ ++ dfd_iparent = secure_opendir(polyptr->instance_parent, ++ SECURE_OPENDIR_PROTECT | SECURE_OPENDIR_MKDIR, 0, idata); ++ if (dfd_iparent == -1) { ++ pam_syslog(idata->pamh, LOG_ERR, ++ "polyptr->instance_parent %s access error", ++ polyptr->instance_parent); ++ goto error_out; ++ } ++ if (check_inst_parent(dfd_iparent, idata)) { ++ goto error_out; ++ } + + /* + * Create instance directory with appropriate security + * contexts, owner, group and mode bits. + */ + #ifdef WITH_SELINUX +- retval = create_instance(polyptr, inst_dir, &statbuf, instcontext, +- origcontext, idata); ++ retval = create_instance(polyptr, dfd_iparent, &statbuf, instcontext, ++ origcontext, idata); + #else +- retval = create_instance(polyptr, inst_dir, &statbuf, idata); ++ retval = create_instance(polyptr, dfd_iparent, &statbuf, idata); + #endif + + if (retval == PAM_IGNORE) { +@@ -1733,19 +1926,48 @@ static int ns_setup(struct polydir_s *polyptr, + goto error_out; + } + ++ /* ++ * Instead of getting a new secure fd, we reuse the fd opened on directory ++ * polyptr->instance_parent to ensure we are working on the same dir as ++ * previously, and thus ensure that previous checks (e.g. check_inst_parent()) ++ * are still relevant. ++ */ ++ dfd_ipath = openat(dfd_iparent, polyptr->instname, ++ O_PATH | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC); ++ if (dfd_ipath == -1) { ++ pam_syslog(idata->pamh, LOG_ERR, "Error openat on %s, %m", ++ polyptr->instname); ++ goto error_out; ++ } ++ ++ if (pam_sprintf(s_ipath, "/proc/self/fd/%d", dfd_ipath) < 0) { ++ pam_syslog(idata->pamh, LOG_ERR, "Error pam_sprintf s_ipath"); ++ goto error_out; ++ } ++ ++ if (pam_sprintf(s_pptrdir, "/proc/self/fd/%d", dfd_pptrdir) < 0) { ++ pam_syslog(idata->pamh, LOG_ERR, "Error pam_sprintf s_pptrdir"); ++ goto error_out; ++ } ++ + /* + * Bind mount instance directory on top of the polyinstantiated + * directory to provide an instance of polyinstantiated directory + * based on polyinstantiated method. ++ * ++ * Operates on magic links created from two fd obtained securely ++ * to protect against race conditions and symlink attacks. Indeed, ++ * the source and destination can be in a user controled path. + */ +- if (mount(inst_dir, polyptr->dir, NULL, MS_BIND, NULL) < 0) { +- pam_syslog(idata->pamh, LOG_ERR, "Error mounting %s on %s, %m", +- inst_dir, polyptr->dir); ++ if(mount(s_ipath, s_pptrdir, NULL, MS_BIND, NULL) < 0) { ++ pam_syslog(idata->pamh, LOG_ERR, ++ "Error mounting %s on %s (%s on %s), %m", ++ s_ipath, s_pptrdir, polyptr->instance_absolute, polyptr->dir); + goto error_out; + } + + if (!(polyptr->flags & POLYDIR_NOINIT)) +- retval = inst_init(polyptr, inst_dir, idata, newdir); ++ retval = inst_init(polyptr, polyptr->instance_absolute, idata, newdir); + + goto cleanup; + +@@ -1757,8 +1979,12 @@ error_out: + retval = PAM_SESSION_ERR; + + cleanup: +- free(inst_dir); +- free(instname); ++ if (dfd_iparent != -1) ++ close(dfd_iparent); ++ if (dfd_ipath != -1) ++ close(dfd_ipath); ++ if (dfd_pptrdir != -1) ++ close(dfd_pptrdir); + #ifdef WITH_SELINUX + freecon(instcontext); + freecon(origcontext); +@@ -1797,6 +2023,7 @@ static int cleanup_tmpdirs(struct instance_data *idata) + { + struct polydir_s *pptr; + pid_t rc, pid; ++ int dfd = -1; + struct sigaction newsa, oldsa; + int status; + +@@ -1808,20 +2035,40 @@ static int cleanup_tmpdirs(struct instance_data *idata) + } + + for (pptr = idata->polydirs_ptr; pptr; pptr = pptr->next) { +- if (pptr->method == TMPDIR && access(pptr->instance_prefix, F_OK) == 0) { ++ if (pptr->method == TMPDIR) { ++ ++ dfd = secure_opendir_stateless(pptr->instance_parent); ++ if (dfd == -1) ++ continue; ++ ++ if (faccessat(dfd, pptr->instname, F_OK, AT_SYMLINK_NOFOLLOW) != 0) { ++ close(dfd); ++ continue; ++ } ++ + pid = fork(); + if (pid == 0) { +- static char *envp[] = { NULL }; ++ static char *envp[] = { NULL }; + #ifdef WITH_SELINUX +- if (idata->flags & PAMNS_SELINUX_ENABLED) { ++ if (idata->flags & PAMNS_SELINUX_ENABLED) { + if (setexeccon(NULL) < 0) + _exit(1); + } + #endif ++ if (fchdir(dfd) == -1) { ++ pam_syslog(idata->pamh, LOG_ERR, "Failed fchdir to %s: %m", ++ pptr->instance_absolute); ++ _exit(1); ++ } ++ + close_fds_pre_exec(idata); +- if (execle("/bin/rm", "/bin/rm", "-rf", pptr->instance_prefix, NULL, envp) < 0) +- _exit(1); +- } else if (pid > 0) { ++ execle("/bin/rm", "/bin/rm", "-rf", pptr->instname, NULL, envp); ++ _exit(1); ++ } else if (pid > 0) { ++ ++ if (dfd != -1) ++ close(dfd); ++ + while (((rc = waitpid(pid, &status, 0)) == (pid_t)-1) && + (errno == EINTR)); + if (rc == (pid_t)-1) { +@@ -1834,6 +2081,10 @@ static int cleanup_tmpdirs(struct instance_data *idata) + "Error removing %s", pptr->instance_prefix); + } + } else if (pid < 0) { ++ ++ if (dfd != -1) ++ close(dfd); ++ + pam_syslog(idata->pamh, LOG_ERR, + "Cannot fork to cleanup temporary directory, %m"); + rc = PAM_SESSION_ERR; +@@ -1857,6 +2108,7 @@ out: + static int setup_namespace(struct instance_data *idata, enum unmnt_op unmnt) + { + int retval = 0, need_poly = 0, changing_dir = 0; ++ int dfd = -1; + char *cptr, *fptr, poly_parent[PATH_MAX]; + struct polydir_s *pptr; + +@@ -1972,20 +2224,28 @@ static int setup_namespace(struct instance_data *idata, enum unmnt_op unmnt) + strcpy(poly_parent, "/"); + else if (cptr) + *cptr = '\0'; +- if (chdir(poly_parent) < 0) { ++ ++ dfd = secure_opendir_stateless(poly_parent); ++ if (dfd == -1) { + pam_syslog(idata->pamh, LOG_ERR, +- "Can't chdir to %s, %m", poly_parent); ++ "Failed opening %s to fchdir: %m", poly_parent); + } ++ else if (fchdir(dfd) == -1) { ++ pam_syslog(idata->pamh, LOG_ERR, ++ "Failed fchdir to %s: %m", poly_parent); ++ } ++ if (dfd != -1) ++ close(dfd); + } + +- if (umount(pptr->rdir) < 0) { +- int saved_errno = errno; +- pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m", +- pptr->rdir); +- if (saved_errno != EINVAL) { +- retval = PAM_SESSION_ERR; +- goto out; +- } ++ if (secure_umount(pptr->rdir) < 0) { ++ int saved_errno = errno; ++ pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m", ++ pptr->rdir); ++ if (saved_errno != EINVAL) { ++ retval = PAM_SESSION_ERR; ++ goto out; ++ } + } else if (idata->flags & PAMNS_DEBUG) + pam_syslog(idata->pamh, LOG_DEBUG, "Umount succeeded %s", + pptr->rdir); +@@ -2048,7 +2308,7 @@ static int orig_namespace(struct instance_data *idata) + "Unmounting instance dir for user %d & dir %s", + idata->uid, pptr->dir); + +- if (umount(pptr->dir) < 0) { ++ if (secure_umount(pptr->dir) < 0) { + pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m", + pptr->dir); + return PAM_SESSION_ERR; +diff --git a/modules/pam_namespace/pam_namespace.h b/modules/pam_namespace/pam_namespace.h +index fd393d17..b1c31e1f 100644 +--- a/modules/pam_namespace/pam_namespace.h ++++ b/modules/pam_namespace/pam_namespace.h +@@ -126,6 +126,13 @@ + #define NAMESPACE_POLYDIR_DATA "pam_namespace:polydir_data" + #define NAMESPACE_PROTECT_DATA "pam_namespace:protect_data" + ++/* ++ * Operation mode for function secure_opendir() ++ */ ++#define SECURE_OPENDIR_PROTECT 0x00000001 ++#define SECURE_OPENDIR_MKDIR 0x00000002 ++#define SECURE_OPENDIR_FULL_FD 0x00000004 ++ + /* + * Polyinstantiation method options, based on user, security context + * or both +@@ -163,6 +170,9 @@ struct polydir_s { + char dir[PATH_MAX]; /* directory to polyinstantiate */ + char rdir[PATH_MAX]; /* directory to unmount (based on RUSER) */ + char instance_prefix[PATH_MAX]; /* prefix for instance dir path name */ ++ char instance_absolute[PATH_MAX]; /* absolute path to the instance dir (instance_parent + instname) */ ++ char instance_parent[PATH_MAX]; /* parent dir of the instance dir */ ++ char *instname; /* last segment of the path to the instance dir */ + enum polymethod method; /* method used to polyinstantiate */ + unsigned int num_uids; /* number of override uids */ + uid_t *uid; /* list of override uids */ +-- +2.49.0 + diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix index 03bbf3299520..52aec1393dcb 100644 --- a/pkgs/by-name/li/linux-pam/package.nix +++ b/pkgs/by-name/li/linux-pam/package.nix @@ -3,6 +3,7 @@ stdenv, buildPackages, fetchurl, + fetchpatch, flex, db4, gettext, @@ -24,6 +25,13 @@ stdenv.mkDerivation rec { patches = [ ./suid-wrapper-path.patch + # required for fixing CVE-2025-6020 + (fetchpatch { + url = "https://github.com/linux-pam/linux-pam/commit/10b80543807e3fc5af5f8bcfd8bb6e219bb3cecc.patch"; + hash = "sha256-VS3D3wUbDxDXRriIuEvvgeZixzDA58EfiLygfFeisGg="; + }) + # Manually cherry-picked from 475bd60c552b98c7eddb3270b0b4196847c0072e + ./CVE-2025-6020.patch ]; # Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569 diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 5e4b95ac8c51..5b09ad492418 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.17-11"; - hash_aarch64-darwin = "sha256-z3QkWwzYrHw3l8Qm+FfnrfdtfhdpkLo67XTE/t2ji5Y="; - version_x86_64-linux = "0.3.17-11"; - hash_x86_64-linux = "sha256-CCsGkhh5OSAhyt2CHKIEIh5OzllRWxm6ERuGqQW/0JE="; + version_aarch64-darwin = "0.3.18-3"; + hash_aarch64-darwin = "sha256-U720DYnywuqzZuYewzDSIqKoA5+AV7IsupmQwxOG84k="; + version_x86_64-linux = "0.3.18-3"; + hash_x86_64-linux = "sha256-KnOu1fUcx1HIaijnq5K5jfALWXuU4PISPT2bF4xP9NA="; 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/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 3e7a33fea314..7a127bed79a2 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.6.2"; + version = "1.6.5"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ct5INzqSNbGVSlpQsAuAXFlcZHmN/L4eLCZ4/Di5apQ="; + hash = "sha256-SomQYgc3F7w5DB0+j4peYTLSdHsrg9fw3h15gU3DTKU="; }; strictDeps = true; diff --git a/pkgs/by-name/lt/lttng-tools/package.nix b/pkgs/by-name/lt/lttng-tools/package.nix index 445f47be4e96..7acdae15a541 100644 --- a/pkgs/by-name/lt/lttng-tools/package.nix +++ b/pkgs/by-name/lt/lttng-tools/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, pkg-config, + babeltrace2, popt, libuuid, liburcu, @@ -13,15 +14,16 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.15"; + version = "2.14.0"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-lupCNR7hEsGdrZ/ceq6TtYPZ8XIrIXVmSjgdLTN3A8Q="; + sha256 = "sha256-2MOcJs7BO3vYJVHNUqIu/DWLiI4268+cG2DvHDo8L9M="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ + babeltrace2 popt libuuid liburcu diff --git a/pkgs/by-name/lt/lttng-ust/package.nix b/pkgs/by-name/lt/lttng-ust/package.nix index 4b5cb17a9c7f..0455146aaed8 100644 --- a/pkgs/by-name/lt/lttng-ust/package.nix +++ b/pkgs/by-name/lt/lttng-ust/package.nix @@ -1,11 +1,16 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, pkg-config, + asciidoc, + xmlto, liburcu, numactl, python3, + testers, + nix-update-script, }: # NOTE: @@ -19,13 +24,15 @@ # # Debian builds with std.h (systemtap). -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lttng-ust"; - version = "2.13.8"; + version = "2.14.0"; - src = fetchurl { - url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; - sha256 = "sha256-1O+Y2rmjetT1JMyv39UK9PJmA5tSjdWvq8545JAk2Tc="; + src = fetchFromGitHub { + owner = "lttng"; + repo = "lttng-ust"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9WZDjOGfflEc6BUUO3W70KeLcZnTaePkF8eg8Ns/lQc="; }; outputs = [ @@ -35,35 +42,64 @@ stdenv.mkDerivation rec { "devdoc" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + asciidoc + xmlto + ]; + + propagatedBuildInputs = [ liburcu ]; + buildInputs = [ numactl python3 ]; + postPatch = '' + # to build the manpages, xmlto uses xmllint which tries to fetch a dtd schema + # from the internet - just don't validate to work around this + substituteInPlace doc/man/Makefile.am \ + --replace-fail '$(XMLTO)' '$(XMLTO) --skip-validation' + ''; + preConfigure = '' patchShebangs . ''; - hardeningDisable = [ "trivialautovarinit" ]; - configureFlags = [ "--disable-examples" ]; - propagatedBuildInputs = [ liburcu ]; + doCheck = true; + + strictDeps = true; enableParallelBuilding = true; - meta = with lib; { + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(.+)" + ]; + }; + }; + + meta = { description = "LTTng Userspace Tracer libraries"; mainProgram = "lttng-gen-tp"; homepage = "https://lttng.org/"; - license = with licenses; [ + changelog = "https://github.com/lttng/lttng-ust/blob/v${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ lgpl21Only gpl2Only mit ]; - platforms = lib.intersectLists platforms.linux liburcu.meta.platforms; - maintainers = [ maintainers.bjornfor ]; + platforms = lib.intersectLists lib.platforms.linux liburcu.meta.platforms; + pkgConfigModules = [ + "lttng-ust-ctl" + "lttng-ust" + ]; + maintainers = [ lib.maintainers.bjornfor ]; }; - -} +}) diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index b57ebef04bd6..358e9e60e5a6 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.681"; + version = "0.682"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-pqKvh08AybuVATNQOzV14wI0GsOVzxskgeol1JA9dg8="; + hash = "sha256-yHmcUDBgNKcOg6ZW/fP7ZatdkCgG1y1ECRUbnZ7wHZY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 1bf6c97de0e5..2c7e9fa48c1b 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-ipGB+A/B0N7Ws3Y1qWUlBj+Syo7H8UHU3dBDkHfatB4UNL053koT9EVxyPuGpU7YMjPDLuczuCsNaSTNuL/2bQ=="; + hash = "sha512-2ShSTAyFQtGDDQsBSqg7ZPZDZWpx/T3H3yuYUn/WMkcMJOXqQO+qyth73WjZYoa6hOqc1yp5OzE7H9lLGLIW/g=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 102698250980..022eb700ecb5 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.218"; + version = "1.218.1"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-TGl4J4r7ueAahrTgsJH0DlucuT2OrW3NzR1jQGwQA7E="; + hash = "sha256-ZWotvGj2LpQbi3t6mVBL8kE19JC4X6VqkIXSQSuyjR0="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index 6f84e60cb1de..dd5286e659bd 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.18.1", - "hash": "sha256-B4klaET6YT955p606aSky5tePGhpinRCqc3gMB+uaZY=" + "version": "5.18.3", + "hash": "sha256-we4mWtMemszIpTehk74hbqjisX1vTk94tLdGGNiz4c8=" }, "beta": { - "version": "5.18.1", - "hash": "sha256-B4klaET6YT955p606aSky5tePGhpinRCqc3gMB+uaZY=" + "version": "5.18.3", + "hash": "sha256-we4mWtMemszIpTehk74hbqjisX1vTk94tLdGGNiz4c8=" } } diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix index 35c9b5460f4d..fb38a764e41a 100644 --- a/pkgs/by-name/ma/mackerel-agent/package.nix +++ b/pkgs/by-name/ma/mackerel-agent/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, makeWrapper, iproute2, - nettools, + net-tools, }: buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { }; nativeBuildInputs = [ makeWrapper ]; - nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ nettools ]; + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ net-tools ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ]; vendorHash = "sha256-Q3HsfLA6xqzwXVfRc0bOb15kW2tdwj14DvJEZoRy0/4="; diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix index 93de75693573..252841b90a58 100644 --- a/pkgs/by-name/ma/mackup/package.nix +++ b/pkgs/by-name/ma/mackup/package.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/*.py" ]; + enabledTestPaths = [ "tests/*.py" ]; # Disabling tests failing on darwin due to a missing pgrep binary on procps disabledTests = [ "test_is_process_running" ]; diff --git a/pkgs/by-name/ma/macpm/package.nix b/pkgs/by-name/ma/macpm/package.nix index ea9dca568992..ec4d36618bd9 100644 --- a/pkgs/by-name/ma/macpm/package.nix +++ b/pkgs/by-name/ma/macpm/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { pname = "macpm"; version = "0.24-unstable-2024-11-19"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "visualcjy"; @@ -17,6 +17,16 @@ python3Packages.buildPythonApplication { hash = "sha256-jqaPPvYbuL8q6grmBLyZLf8aDmjugYxMOWAh1Ix82jc="; }; + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + dashing + humanize + psutil + ]; + # has no tests doCheck = false; @@ -25,11 +35,7 @@ python3Packages.buildPythonApplication { ln -rs $out/bin/macpm $out/bin/asitop ''; - dependencies = with python3Packages; [ - dashing - humanize - psutil - ]; + pythonImportsCheck = [ "macpm" ]; meta = { description = "Perf monitoring CLI tool for Apple Silicon; previously named 'asitop'"; diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix index cdea13a209a5..581d85c0db86 100644 --- a/pkgs/by-name/ma/maigret/package.nix +++ b/pkgs/by-name/ma/maigret/package.nix @@ -80,9 +80,9 @@ python3.pkgs.buildPythonApplication rec { pythonRemoveDeps = [ "future-annotations" ]; - pytestFlagsArray = [ + pytestFlags = [ # DeprecationWarning: There is no current event loop - "-W ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; disabledTests = diff --git a/pkgs/by-name/ma/mailutils/package.nix b/pkgs/by-name/ma/mailutils/package.nix index 41ba0f19a981..238724f7a63f 100644 --- a/pkgs/by-name/ma/mailutils/package.nix +++ b/pkgs/by-name/ma/mailutils/package.nix @@ -16,7 +16,7 @@ guile, libmysqlclient, mailcap, - nettools, + net-tools, pam, readline, ncurses, @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { gsasl libxcrypt ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ nettools ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ net-tools ] ++ lib.optionals pythonSupport [ python3 ] ++ lib.optionals guileSupport [ guile ]; diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index e6575e811d33..9b01f2851989 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "mapproxy"; version = "5.0.0"; - format = "setuptools"; + pyproject = true; disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { @@ -22,6 +22,10 @@ python3Packages.buildPythonApplication rec { substituteInPlace mapproxy/util/ext/serving.py --replace-warn "args = [sys.executable] + sys.argv" "args = sys.argv" ''; + build-system = with python3Packages; [ setuptools ]; + + pythonRemoveDeps = [ "future" ]; + dependencies = with python3Packages; [ boto3 # needed for caches service jsonschema @@ -31,7 +35,6 @@ python3Packages.buildPythonApplication rec { shapely gdal lxml - setuptools werkzeug ]; @@ -40,6 +43,8 @@ python3Packages.buildPythonApplication rec { # https://github.com/mapproxy/mapproxy/blob/master/requirements-tests.txt doCheck = false; + pythonImportsCheck = [ "mapproxy" ]; + meta = { description = "Open source proxy for geospatial data"; homepage = "https://mapproxy.org/"; diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index fcdc9ea4f24f..c71ff3bda690 100644 --- a/pkgs/by-name/ma/mark/package.nix +++ b/pkgs/by-name/ma/mark/package.nix @@ -8,16 +8,16 @@ # https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996 buildGoModule rec { pname = "mark"; - version = "14.1.0"; + version = "14.1.1"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = "${version}"; - sha256 = "sha256-TQU49rPpHCDQEOIfC3R89kdtVMVJrisOXF5DhbRgJQ0="; + sha256 = "sha256-jKc5QugqfdjSQjK7SbLG02a9+YdFcweS+91LhdR0Dzg="; }; - vendorHash = "sha256-y5WCpL0bJE48iVUO2hPy7AvAx9KEVQJUK6vVwFfob/M="; + vendorHash = "sha256-AHtIVp2n5v4YoYfWAsE7eD1QcEFKdjSqzGIlR7+mnxg="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/mastodon-archive/package.nix b/pkgs/by-name/ma/mastodon-archive/package.nix index 7825493545d9..0eb10039b414 100644 --- a/pkgs/by-name/ma/mastodon-archive/package.nix +++ b/pkgs/by-name/ma/mastodon-archive/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mastodon-archive"; version = "1.4.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kensanata"; @@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-b4bYQshz7mwxEfpRYV7ze4C8hz58R9cVp58wHvGFb0A="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ html2text mastodon-py progress @@ -25,6 +29,8 @@ python3.pkgs.buildPythonApplication rec { # There is no test doCheck = false; + pythonImportsCheck = [ "mastodon_archive" ]; + meta = with lib; { description = "Utility for backing up your Mastodon content"; mainProgram = "mastodon-archive"; diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix index 39b60f60c8bc..4b81872a65d8 100644 --- a/pkgs/by-name/ma/mattermost/tests.nix +++ b/pkgs/by-name/ma/mattermost/tests.nix @@ -8,7 +8,7 @@ mariadb, redis, curl, - nettools, + net-tools, runtimeShell, }: @@ -30,7 +30,7 @@ mattermost.overrideAttrs ( mariadb redis curl - nettools + net-tools gotestsum ]; diff --git a/pkgs/by-name/md/md-tangle/package.nix b/pkgs/by-name/md/md-tangle/package.nix index b5d5d7650888..9f530492496e 100644 --- a/pkgs/by-name/md/md-tangle/package.nix +++ b/pkgs/by-name/md/md-tangle/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonPackage rec { pname = "md-tangle"; version = "1.4.4"; - format = "setuptools"; + pyproject = true; # By some strange reason, fetchPypi fails miserably src = fetchFromGitHub { @@ -17,10 +17,14 @@ python3.pkgs.buildPythonPackage rec { hash = "sha256-PkOKSsyY8uwS4mhl0lB+KGeUvXfEc7PUDHZapHMYv4c="; }; + build-system = with python3.pkgs; [ setuptools ]; + # Pure Python application, uses only standard modules and comes without # testing suite doCheck = false; + pythonImportsCheck = [ "md_tangle" ]; + meta = with lib; { homepage = "https://github.com/joakimmj/md-tangle/"; description = "Generates (\"tangles\") source code from Markdown documents"; diff --git a/pkgs/by-name/md/mdslides/package.nix b/pkgs/by-name/md/mdslides/package.nix index 6932e8a4a526..7b97eacd102d 100644 --- a/pkgs/by-name/md/mdslides/package.nix +++ b/pkgs/by-name/md/mdslides/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "mdslides"; version = "unstable-2022-12-15"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dadoomer"; @@ -16,8 +16,12 @@ python3Packages.buildPythonApplication { sha256 = "sha256-31ALsy1P/vfI+H6Onmg4TXLeKbVAQ1FlnFs4k6ZOgHQ="; }; + build-system = with python3Packages; [ setuptools ]; + doCheck = false; + pythonImportsCheck = [ "mdslides" ]; + meta = with lib; { longDescription = "Using markdown, write simple but beautiful presentations with math, animations and media, which can be visualized in a web browser or exported to PDF."; homepage = "https://github.com/dadoomer/markdown-slides"; diff --git a/pkgs/by-name/me/me_cleaner/package.nix b/pkgs/by-name/me/me_cleaner/package.nix index 3d5419fd5b56..d0996351fc6f 100644 --- a/pkgs/by-name/me/me_cleaner/package.nix +++ b/pkgs/by-name/me/me_cleaner/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonPackage rec { pname = "me_cleaner"; version = "1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "corna"; @@ -16,6 +16,8 @@ python3.pkgs.buildPythonPackage rec { sha256 = "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4"; }; + build-system = with python3.pkgs; [ setuptools ]; + meta = with lib; { inherit (src.meta) homepage; description = "Tool for partial deblobbing of Intel ME/TXE firmware images"; diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index 2ddf086f8b9d..74e135d7f36f 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "melange"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "melange"; rev = "v${version}"; - hash = "sha256-nyrR9RxoZzQQ4OqV4FtW9534PQAyGnBCEqCJReMkCIQ="; + hash = "sha256-GQvsq9PJA4dbi69ZAMcyPwbsSSbsNm4ZyBj+W6c0VV4="; # 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; diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix index af9ed54a0c36..bb40119382f7 100644 --- a/pkgs/by-name/me/memcached/package.nix +++ b/pkgs/by-name/me/memcached/package.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "1.6.37"; + version = "1.6.38"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-dKBik3D2v2CHOTfkOc1ZZZ+9eoTyTBCVvAgtoMhAaWk="; + sha256 = "sha256-M015IpTjdzh5a1sDN1xHu22yg7EVLi6kzLcgFS3RfGY="; }; configureFlags = [ diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index f5285035ad3a..97e48f88b0d9 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -62,6 +62,7 @@ let inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/web"; hash = "sha256-AyQYY1vtBB6DTcieC7nw5aOOVuwESJSDs8qU6PGyaTw="; + fetcherVersion = 1; }; pnpmRoot = "web"; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix index 05ac47765a1f..dbcdc70c739f 100644 --- a/pkgs/by-name/me/memray/package.nix +++ b/pkgs/by-name/me/memray/package.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "memray" ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = [ # Import issue diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index 80810756d3e6..d3e6a5bf9b85 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication { pytestCheckHook ]; - pytestFlagsArray = [ "-v" ]; + pytestFlags = [ "-v" ]; pythonImportsCheck = [ "memtree" ]; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index a1abc3ab407d..b41bb53baee4 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -31,6 +31,12 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; + cargoBuildFlags = [ + # don't install the `mgf_dev` + "--bin" + "mergiraf" + ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 723580f0db45..7674462985cc 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.8.0"; + version = "1.8.2"; format = "setuptools"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; tag = version; - hash = "sha256-Y1G3kHSv1krlJjR7oHcN8GavzYj2C25GLq8lvYpnMKA="; + hash = "sha256-xH3JPlXXkLKKT8Gay6qHG/JXTT1UcUCQaSC65Vxhfl0="; }; patches = [ diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index 5aa5b7ed3c02..7d9fd6de0e6d 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -63,9 +63,9 @@ mesonCheckPhase() { flagsArray+=("--timeout-multiplier=0") fi - # Parallel building is enabled by default. + # Parallel checking is enabled by default. local buildCores=1 - if [ "${enableParallelBuilding-1}" ]; then + if [ "${enableParallelChecking-1}" ]; then buildCores="$NIX_BUILD_CORES" fi diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix index 2c67abb0968a..40977ad93a5c 100644 --- a/pkgs/by-name/me/mesonlsp/package.nix +++ b/pkgs/by-name/me/mesonlsp/package.nix @@ -165,7 +165,7 @@ stdenv'.mkDerivation (finalAttrs: { changelog = "https://github.com/JCWasmx86/mesonlsp/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Plus; mainProgram = "mesonlsp"; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; # ../src/liblog/log.cpp:41:7: error: call to 'format' is ambiguous broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index e3fedba48c11..9ebf3530a5e9 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-Ct/YLnpZb0YBXVaghd5W1bmDcjVRladwQNRoLagHgJo="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/mi/mimeo/package.nix b/pkgs/by-name/mi/mimeo/package.nix index 95f41f74a50f..4c655035b62d 100644 --- a/pkgs/by-name/mi/mimeo/package.nix +++ b/pkgs/by-name/mi/mimeo/package.nix @@ -12,30 +12,25 @@ in python3Packages.buildPythonApplication { pname = "mimeo"; inherit version; - format = "setuptools"; + pyproject = true; src = fetchurl { url = "https://xyne.dev/projects/mimeo/src/mimeo-${version}.tar.xz"; hash = "sha256-CahvSypwR1aHVDHTdtty1ZfaKBWPolxc73uZ5OyeqZA="; }; - buildInputs = [ - file - desktop-file-utils - ]; + build-system = [ python3Packages.setuptools ]; - propagatedBuildInputs = [ python3Packages.pyxdg ]; + dependencies = [ python3Packages.pyxdg ]; - preConfigure = '' + postPatch = '' substituteInPlace Mimeo.py \ - --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \ - "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \ - --replace "EXE_FILE = 'file'" \ - "EXE_FILE = '${file}/bin/file'" + --replace-fail "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \ + "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \ + --replace-fail "EXE_FILE = 'file'" \ + "EXE_FILE = '${file}/bin/file'" ''; - installPhase = "install -Dm755 Mimeo.py $out/bin/mimeo"; - doInstallCheck = true; installCheckPhase = '' $out/bin/mimeo --help > /dev/null diff --git a/pkgs/by-name/mi/mininet/package.nix b/pkgs/by-name/mi/mininet/package.nix index 8980443d16b0..bc9d921bfea3 100644 --- a/pkgs/by-name/mi/mininet/package.nix +++ b/pkgs/by-name/mi/mininet/package.nix @@ -11,7 +11,7 @@ inetutils, iperf, iproute2, - nettools, + net-tools, socat, }: @@ -34,7 +34,7 @@ let socat # mn errors out without a telnet binary # pkgs.inetutils brings an undesired ifconfig into PATH see #43105 - nettools + net-tools telnet ]; diff --git a/pkgs/by-name/mi/minio-certgen/package.nix b/pkgs/by-name/mi/minio-certgen/package.nix index 3ab53dbac9ad..05e0c8b784c3 100644 --- a/pkgs/by-name/mi/minio-certgen/package.nix +++ b/pkgs/by-name/mi/minio-certgen/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "minio-certgen"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "minio"; repo = "certgen"; rev = "v${version}"; - sha256 = "sha256-bYZfQeqPqroMkqJOqHri3l7xscEK9ml/oNLVPBVSDKk="; + sha256 = "sha256-Fuuq48+/ry6h9iA4WBXnahJp6EP640St84Tu6B86weI="; }; vendorHash = null; diff --git a/pkgs/by-name/mi/miredo/package.nix b/pkgs/by-name/mi/miredo/package.nix index 2ac01fede0ec..f07457e82bac 100644 --- a/pkgs/by-name/mi/miredo/package.nix +++ b/pkgs/by-name/mi/miredo/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - nettools, + net-tools, iproute2, judy, }: @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace misc/client-hook.bsd \ - --replace '/sbin/route' '${nettools}/bin/route' \ - --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' + --replace '/sbin/route' '${net-tools}/bin/route' \ + --replace '/sbin/ifconfig' '${net-tools}/bin/ifconfig' substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute2}/bin/ip' ''; diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 5c3838396187..7bb5af68c058 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.148.0", + "version": "3.149.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.148.0/mirrord_linux_x86_64", - "hash": "sha256-nQtpilOmYqji0hswq5KfG4mP5Jvtll+WTr5vcd/x1m8=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.149.0/mirrord_linux_x86_64", + "hash": "sha256-sRg0p9A8azjSSQLTltgfi62GaA0VI2bLKuL2P2hB2E8=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.148.0/mirrord_linux_aarch64", - "hash": "sha256-HOdX97d29VAiUy2W2bpnpvity+Kc3MD/+JwFgPCZfXI=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.149.0/mirrord_linux_aarch64", + "hash": "sha256-gbDNJh1rycJ/WzBA/wy6eLscjNQ7ktCV+CrlorCF95A=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.148.0/mirrord_mac_universal", - "hash": "sha256-fMlsuoqKv+9URHAfmhaCznHedknz9bFX4SCg3qU19JY=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.149.0/mirrord_mac_universal", + "hash": "sha256-vUPuTc69yn71tLzSH6DdzWKc/yoHergglF7iL+R7PLE=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.148.0/mirrord_mac_universal", - "hash": "sha256-fMlsuoqKv+9URHAfmhaCznHedknz9bFX4SCg3qU19JY=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.149.0/mirrord_mac_universal", + "hash": "sha256-vUPuTc69yn71tLzSH6DdzWKc/yoHergglF7iL+R7PLE=" } } } diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index 9ff75fefa6a9..515893a91bd3 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.14.4"; + version = "1.14.5"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-HLGBQugGg66wH3NFPDvFRRGdDscd+Vz6LHG8CYHqgYw="; + hash = "sha256-faIjS3B019eYefOIklJMuUVcCzkM3bHu/HJ1kaERtUA="; }; - vendorHash = "sha256-GY3eRMj7YtuP/Bibf2e4fAOwGNe9TTadmOBpOxK4S6c="; + vendorHash = "sha256-mh66gH4ln/D2OWaD+VISTysszjpPGg2dHF29BD1i6z8="; ldflags = [ "-s" diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 6fe2fe4d4be5..24eedc13aa62 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -3,7 +3,6 @@ lib, nixosTests, fetchFromGitHub, - fetchpatch, nodejs, pnpm_9, makeWrapper, @@ -13,42 +12,33 @@ ffmpeg-headless, writeShellScript, xcbuild, - ... + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "misskey"; - - version = "2024.11.0"; + version = "2025.6.3"; src = fetchFromGitHub { owner = "misskey-dev"; repo = "misskey"; - rev = finalAttrs.version; - hash = "sha256-uei5Ojx39kCbS8DCjHZ5PoEAsqJ5vC6SsFqIEIJ16n8="; + tag = finalAttrs.version; + hash = "sha256-6UZcIZlfcYcQgjR/jrNhsoLNQGml2tjK3LYLI0fdgMU="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - # https://github.com/misskey-dev/misskey/security/advisories/GHSA-w98m-j6hq-cwjm - name = "CVE-2025-24896.patch"; - url = "https://github.com/misskey-dev/misskey/commit/ba9f295ef2bf31cc90fa587e20b9a7655b7a1824.patch"; - hash = "sha256-jNl2AdLaG3v8QB5g/UPTupdyP1yGR0WcWull7EA7ogs="; - }) - ]; - nativeBuildInputs = [ nodejs pnpm_9.configHook makeWrapper python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI="; + hash = "sha256-T8LwpEjeWNmkIo3Dn1BCFHBsTzA/Dt6/pk/NMtvT0N4="; + fetcherVersion = 1; }; buildPhase = '' @@ -123,13 +113,15 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit (finalAttrs) pnpmDeps; tests.misskey = nixosTests.misskey; + updateScript = nix-update-script { }; }; meta = { - description = "🌎 An interplanetary microblogging platform 🚀"; + description = "Open source, federated social media platform"; homepage = "https://misskey-hub.net/"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.feathecutie ]; + teams = [ lib.teams.ngi ]; platforms = lib.platforms.unix; mainProgram = "misskey"; }; diff --git a/pkgs/by-name/ml/mlarchive2maildir/package.nix b/pkgs/by-name/ml/mlarchive2maildir/package.nix index 73de65a83b06..7089c79fdf68 100644 --- a/pkgs/by-name/ml/mlarchive2maildir/package.nix +++ b/pkgs/by-name/ml/mlarchive2maildir/package.nix @@ -7,16 +7,19 @@ python3.pkgs.buildPythonApplication rec { pname = "mlarchive2maildir"; version = "0.0.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs"; }; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; + build-system = with python3.pkgs; [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ beautifulsoup4 click click-log @@ -24,6 +27,8 @@ python3.pkgs.buildPythonApplication rec { six ]; + pythonImportsCheck = [ "mlarchive2maildir" ]; + meta = with lib; { homepage = "https://github.com/flokli/mlarchive2maildir"; description = "Imports mail from (pipermail) archives into a maildir"; diff --git a/pkgs/by-name/ml/mloader/package.nix b/pkgs/by-name/ml/mloader/package.nix index 6691d11440fa..9e61c8f8134d 100644 --- a/pkgs/by-name/ml/mloader/package.nix +++ b/pkgs/by-name/ml/mloader/package.nix @@ -7,19 +7,18 @@ python3Packages.buildPythonApplication rec { pname = "mloader"; version = "1.1.12"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-0o4FvhuFudNSEL6fwBVqxldaNePbbidY9utDqXiLRNc="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "protobuf~=3.6" "protobuf" - ''; + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ + pythonRelaxDeps = [ "protobuf" ]; + + dependencies = with python3Packages; [ click protobuf requests diff --git a/pkgs/by-name/ml/mlxbf-bootctl/package.nix b/pkgs/by-name/ml/mlxbf-bootctl/package.nix index 8db85e010dd5..cad1b8a116f2 100644 --- a/pkgs/by-name/ml/mlxbf-bootctl/package.nix +++ b/pkgs/by-name/ml/mlxbf-bootctl/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mlxbf-bootctl"; - version = "1.1-6"; + version = "unstable-2025-01-16"; src = fetchFromGitHub { owner = "Mellanox"; repo = "mlxbf-bootctl"; - rev = "mlxbf-bootctl-${version}"; - hash = "sha256-F49ZZtty+NARXA/doAFLhsQn4XkPW6GWLXGy4waIaM0="; + rev = "278160ca8e08251cff5e7989e5a1010bd247a6ae"; + hash = "sha256-qS35wCb8zvuF2Zs/5hPZkoZAapr7fwKQ/0ZOBPtrkRQ="; }; installPhase = '' @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { # This package is supposed to only run on a BlueField. Thus aarch64-linux # is the only relevant platform. platforms = [ "aarch64-linux" ]; - maintainers = with lib.maintainers; [ nikstur ]; + maintainers = with lib.maintainers; [ + nikstur + thillux + ]; }; } diff --git a/pkgs/by-name/ml/mlxbf-bootimages/package.nix b/pkgs/by-name/ml/mlxbf-bootimages/package.nix index 63a8317bc572..d95122cef9e9 100644 --- a/pkgs/by-name/ml/mlxbf-bootimages/package.nix +++ b/pkgs/by-name/ml/mlxbf-bootimages/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mlxbf-bootimages"; - version = "4.10.0-13520"; + version = "4.11.0-13611"; src = fetchurl { url = "https://linux.mellanox.com/public/repo/bluefield/${version}/bootimages/prod/${pname}-signed_${version}_arm64.deb"; - hash = "sha256-lPclxhKmn1hvGXWI1A+Q1yXK7FZzKUcOtBoXG6KRsCA="; + hash = "sha256-bZpZ6qnC3Q/BuOngS4ZoU6vjeekPjVom0KdDoJF5iko="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix new file mode 100644 index 000000000000..08ee5b69824a --- /dev/null +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -0,0 +1,117 @@ +{ + lib, + stdenvNoCC, + bun, + fetchFromGitHub, + nix-update-script, + writableTmpDirAsHomeHook, +}: + +let + models-dev-node-modules-hash = { + "aarch64-darwin" = "sha256-2EVW5zQTcqH9zBYAegWj/Wtb0lYHZwA7Bbqs3gRjcx0="; + "aarch64-linux" = "sha256-nJgFnszwvknqA21uaqlGQQ1x+4ztKx0/tEvcNrv1LJg="; + "x86_64-darwin" = "sha256-Un6UxmvsmBuDdUwcWnu4qb0nPN1V1PFJi4VGVkNh/YU="; + "x86_64-linux" = "sha256-nlL+Ayacxz4fm404cABORSVGQcNxb3cB4mOezkrI90U="; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "models-dev"; + version = "0-unstable-2025-07-14"; + src = fetchFromGitHub { + owner = "sst"; + repo = "models.dev"; + rev = "2b0849aa20d48c28e2bac1fa3762aec867a2e7c7"; + hash = "sha256-SC2yOy+6xjiGgRuRJY6wCtzWjFJm/DUy+gSlMXXDgAk="; + }; + + node_modules = stdenvNoCC.mkDerivation { + pname = "models-dev-node_modules"; + inherit (finalAttrs) version src; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + + bun install \ + --force \ + --frozen-lockfile \ + --no-progress + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/node_modules + cp -R ./node_modules $out + + runHook postInstall + ''; + + # Required else we get errors that our fixed-output derivation references store paths + dontFixup = true; + + outputHash = models-dev-node-modules-hash.${stdenvNoCC.hostPlatform.system}; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + + nativeBuildInputs = [ bun ]; + + configurePhase = '' + runHook preConfigure + + cp -R ${finalAttrs.node_modules}/node_modules . + + runHook postConfigure + ''; + + preBuild = '' + patchShebangs packages/web/script/build.ts + ''; + + buildPhase = '' + runHook preBuild + + cd packages/web + bun run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/dist + cp -R ./dist $out + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Comprehensive open-source database of AI model specifications, pricing, and capabilities"; + homepage = "https://github.com/sst/models-dev"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ delafthi ]; + }; +}) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 856faa41b314..747b703ae64c 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -37,6 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index ec88f0ce9394..85c09132b6ae 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mold"; - version = "2.40.1"; + version = "2.40.2"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; tag = "v${finalAttrs.version}"; - hash = "sha256-161ATZkgoipFMRcI4x4TNqxbyWxM75Cmo/rL4Hn1JFQ="; + hash = "sha256-Db2IxHCQWb6JdJROi+nOi0pV4zb+8/TcFrJWUCdH6N8="; }; nativeBuildInputs = [ @@ -130,9 +130,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; mainProgram = "mold"; - maintainers = with lib.maintainers; [ - azahi - paveloom - ]; + maintainers = with lib.maintainers; [ azahi ]; }; }) diff --git a/pkgs/by-name/mo/mongoaudit/package.nix b/pkgs/by-name/mo/mongoaudit/package.nix index 9c043d092ebe..8a9ad93c2fa7 100644 --- a/pkgs/by-name/mo/mongoaudit/package.nix +++ b/pkgs/by-name/mo/mongoaudit/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mongoaudit"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -18,7 +18,11 @@ python3.pkgs.buildPythonApplication rec { sha256 = "17k4vw5d3kr961axl49ywid4cf3n7zxvm885c4lv15w7s2al1425"; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ pymongo setuptools urwid diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index ba0571bf782d..e6467727e4e8 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.18"; + version = "11.20"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-RkxnV9b7gzZgRl5YaMwwVkOJwdtEFwyZRvQw/B1CciM="; + hash = "sha256-grZji+s1nffeSMdvsJBsmY0tW4yul2a7gYnenOtGa8g="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/moodle-dl/package.nix b/pkgs/by-name/mo/moodle-dl/package.nix index b63b672ac8ca..4356aeaae407 100644 --- a/pkgs/by-name/mo/moodle-dl/package.nix +++ b/pkgs/by-name/mo/moodle-dl/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "moodle-dl"; version = "2.3.13"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "C0D3D3V"; @@ -17,7 +17,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-6arwc72gu7XyT6HokSEs2TkvE2FG7mIvy4F+/i/0eJg="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ aiodns aiofiles aiohttp @@ -35,6 +37,8 @@ python3Packages.buildPythonApplication rec { # upstream has no tests doCheck = false; + pythonImportsCheck = [ "moodle_dl" ]; + passthru.updateScript = gitUpdater { }; meta = with lib; { diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix index 2923cf1db51c..f28324dac034 100644 --- a/pkgs/by-name/mo/moonfire-nvr/package.nix +++ b/pkgs/by-name/mo/moonfire-nvr/package.nix @@ -33,6 +33,7 @@ let inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/ui"; hash = "sha256-7fMhUFlV5lz+A9VG8IdWoc49C2CTdLYQlEgBSBqJvtw="; + fetcherVersion = 1; }; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix index c5341bd1bc91..12e4a6d63dab 100644 --- a/pkgs/by-name/mo/moonlight/package.nix +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ nodejs_22 ]; hash = "sha256-vrSfrAnLc30kba+8VOPawdp8KaQVUhsD6mUq+YdAJTY="; + fetcherVersion = 1; }; env = { diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 4550ba0ea206..76885e8baaf8 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -8,13 +8,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "morewaita-icon-theme"; - version = "48.3"; + version = "48.3.1"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; tag = "v${finalAttrs.version}"; - hash = "sha256-ywZSRNXVxjs5l5UO4yvNZ7q7PRlaLNi/2+HSNhe8e5w="; + hash = "sha256-Gi73Cn/FwI055Inodo8huHeaWGTy9IR3qPMbjAHBsPw="; }; postPatch = '' diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix index b4575cb3f5ca..9fcf2a103684 100644 --- a/pkgs/by-name/mo/movit/package.nix +++ b/pkgs/by-name/mo/movit/package.nix @@ -45,9 +45,13 @@ stdenv.mkDerivation rec { libepoxy ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_LDFLAGS = "-framework OpenGL"; - }; + env = + { + NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-framework OpenGL"; + }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/by-name/mp/mpc-qt/package.nix similarity index 57% rename from pkgs/applications/video/mpc-qt/default.nix rename to pkgs/by-name/mp/mpc-qt/package.nix index 7868257ffda7..1d4ebaf8bf68 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/by-name/mp/mpc-qt/package.nix @@ -3,30 +3,27 @@ stdenv, fetchFromGitHub, pkg-config, - qmake, - qttools, - qtbase, + qt6Packages, mpv, - wrapQtAppsHook, gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpc-qt"; version = "24.12.1-flatpak"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gn94kVs3Lbd+ggj4jTacHpmnVO2lH/QDhFk+hJC1N/c="; }; nativeBuildInputs = [ pkg-config - qmake - qttools - wrapQtAppsHook + qt6Packages.qmake + qt6Packages.qttools + qt6Packages.wrapQtAppsHook ]; buildInputs = [ @@ -34,26 +31,26 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace lconvert.pri --replace "qtPrepareTool(LCONVERT, lconvert)" "qtPrepareTool(LCONVERT, lconvert, , , ${qttools}/bin)" + substituteInPlace lconvert.pri --replace "qtPrepareTool(LCONVERT, lconvert)" "qtPrepareTool(LCONVERT, lconvert, , , ${qt6Packages.qttools}/bin)" ''; postConfigure = '' - substituteInPlace Makefile --replace ${qtbase}/bin/lrelease ${qttools.dev}/bin/lrelease + substituteInPlace Makefile --replace ${qt6Packages.qtbase}/bin/lrelease ${qt6Packages.qttools.dev}/bin/lrelease ''; qmakeFlags = [ - "MPCQT_VERSION=${version}" + "MPCQT_VERSION=${finalAttrs.version}" ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "Media Player Classic Qute Theater"; homepage = "https://mpc-qt.github.io"; - license = licenses.gpl2; - platforms = platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; - maintainers = with maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; mainProgram = "mpc-qt"; }; -} +}) diff --git a/pkgs/by-name/mp/mpfr/package.nix b/pkgs/by-name/mp/mpfr/package.nix index 9874292c6f8a..7dc402720c8a 100644 --- a/pkgs/by-name/mp/mpfr/package.nix +++ b/pkgs/by-name/mp/mpfr/package.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { # mpfr.h requires gmp.h propagatedBuildInputs = [ gmp ]; + hardeningDisable = [ + # causes tests tset_ld & tsprintf to fail + "trivialautovarinit" + ]; + configureFlags = lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++ lib.optional stdenv.hostPlatform.is64bit "--with-pic" diff --git a/pkgs/by-name/mp/mpfshell/package.nix b/pkgs/by-name/mp/mpfshell/package.nix index f89827a72c35..41d93206afd8 100644 --- a/pkgs/by-name/mp/mpfshell/package.nix +++ b/pkgs/by-name/mp/mpfshell/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonPackage { pname = "mpfshell-unstable"; version = "2020-04-11"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "wendlers"; @@ -16,10 +16,13 @@ python3Packages.buildPythonPackage { sha256 = "0md6ih9vp65dacqy8gki3b2p4v76xb9ijqmxymk4b4f9z684x2m7"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pyserial colorama websocket-client + standard-telnetlib # Python no longer provides telnetlib since python313 ]; doCheck = false; diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix new file mode 100644 index 000000000000..a7af6d3bb7d8 --- /dev/null +++ b/pkgs/by-name/ms/msedit/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, + icu, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "msedit"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "edit"; + tag = "v${finalAttrs.version}"; + hash = "sha256-G5U5ervW1NAQY/fnwOWv1FNuKcP+HYcAW5w87XHqgA8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ceAaaR+N03Dq2MHYel4sHDbbYUOr/ZrtwqJwhaUbC2o="; + # Requires nightly features + env.RUSTC_BOOTSTRAP = 1; + + buildInputs = [ + icu + ]; + + # https://github.com/microsoft/edit/blob/f8bea2be191d00baa2a4551817541ea3f8c5b03e/src/icu.rs#L834 + # Required for Ctrl+F searching to work + postFixup = + let + rpathAppend = lib.makeLibraryPath [ icu ]; + in + lib.optionalString stdenv.hostPlatform.isElf '' + patchelf $out/bin/edit \ + --add-rpath ${rpathAppend} + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + ${stdenv.cc.targetPrefix}install_name_tool -add_rpath ${rpathAppend} $out/bin/edit + ''; + + # Disabled for now, microsoft/edit#194 + doInstallCheck = false; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/edit"; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple editor for simple needs"; + longDescription = '' + This editor pays homage to the classic MS-DOS Editor, + but with a modern interface and input controls similar to VS Code. + The goal is to provide an accessible editor that even users largely + unfamiliar with terminals can easily use. + ''; + mainProgram = "edit"; + homepage = "https://github.com/microsoft/edit"; + changelog = "https://github.com/microsoft/edit/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ RossSmyth ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/mu/munin/package.nix b/pkgs/by-name/mu/munin/package.nix index fdf82910c6dc..7041ac25a64c 100644 --- a/pkgs/by-name/mu/munin/package.nix +++ b/pkgs/by-name/mu/munin/package.nix @@ -10,7 +10,7 @@ python3, ruby, jre8, - nettools, + net-tools, bc, nixosTests, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { which coreutils rrdtool - nettools + net-tools perlPackages.perl perlPackages.ModuleBuild perlPackages.HTMLTemplate diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix index 57a5618bb775..c0c6f9939584 100644 --- a/pkgs/by-name/mu/mutmut/package.nix +++ b/pkgs/by-name/mu/mutmut/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "mutmut"; version = "3.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { repo = "mutmut"; @@ -24,7 +24,9 @@ python3Packages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ click parso junit-xml @@ -32,6 +34,8 @@ python3Packages.buildPythonApplication rec { textual ]; + pythonImportsCheck = [ "mutmut" ]; + meta = { description = "mutation testing system for Python, with a strong focus on ease of use"; mainProgram = "mutmut"; diff --git a/pkgs/by-name/mu/mutt-ics/package.nix b/pkgs/by-name/mu/mutt-ics/package.nix index 5e9a6d985f57..bf8f91015263 100644 --- a/pkgs/by-name/mu/mutt-ics/package.nix +++ b/pkgs/by-name/mu/mutt-ics/package.nix @@ -4,11 +4,10 @@ fetchPypi, }: -with python3.pkgs; -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "mutt-ics"; version = "0.9.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -16,7 +15,11 @@ buildPythonApplication rec { sha256 = "d44d4bec4e71c7f14df01b90fdb9563cdc784ece4250abfea5b0b675cfe85a50"; }; - propagatedBuildInputs = [ icalendar ]; + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ icalendar ]; + + pythonImportsCheck = [ "mutt_ics" ]; meta = with lib; { homepage = "https://github.com/dmedvinsky/mutt-ics"; diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index aadec9a67011..840ed7f1d55e 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "48.3.1"; + version = "48.4"; outputs = [ "out" @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-BvimrX/0+HOa9q8uF1PJHfp7mDl+UpRmMloQGMeVCmo="; + hash = "sha256-EYnPfmPMh8/dHzqG6PFNl8M9ap2iVPI+gWVVSbbFDZM="; }; mesonFlags = [ diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 3b4472c0e11b..d7e11080cd7e 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -6,7 +6,7 @@ cmake, ninja, - removeReferencesTo, + sanitiseHeaderPathsHook, folly, gflags, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - removeReferencesTo + sanitiseHeaderPathsHook ]; buildInputs = [ @@ -123,21 +123,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - postFixup = '' - # Sanitize header paths to avoid runtime dependencies leaking in - # through `__FILE__`. - ( - shopt -s globstar - for header in "$dev/include"/**/*.h; do - sed -i "1i#line 1 \"$header\"" "$header" - remove-references-to -t "$dev" "$header" - done - ) - - # TODO: Do this in `gtest` rather than downstream. - remove-references-to -t ${gtest.dev} $out/lib/* - ''; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/my/mymcplus/package.nix b/pkgs/by-name/my/mymcplus/package.nix index 9c69614b3b24..69bf95eae1f2 100644 --- a/pkgs/by-name/my/mymcplus/package.nix +++ b/pkgs/by-name/my/mymcplus/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "mymcplus"; version = "3.0.5"; - format = "setuptools"; + pyproject = true; src = fetchFromSourcehut { owner = "~thestr4ng3r"; @@ -21,11 +21,15 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook3 ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pyopengl wxpython ]; + pythonImportsCheck = [ "mymcplus" ]; + meta = with lib; { homepage = "https://git.sr.ht/~thestr4ng3r/mymcplus"; description = "PlayStation 2 memory card manager"; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index f64716e62444..591307ed01be 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-HzJej2Mt110n+1KX0wzuAn6j69zQOzI42EGxQB6PYbc="; + fetcherVersion = 1; }; nativeBuildInputs = diff --git a/pkgs/by-name/na/nagstamon/package.nix b/pkgs/by-name/na/nagstamon/package.nix index 2145411fee4a..067d23986057 100644 --- a/pkgs/by-name/na/nagstamon/package.nix +++ b/pkgs/by-name/na/nagstamon/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "nagstamon"; version = "3.16.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "HenriWahl"; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 983cd0aa9263..02e72c095745 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.428"; + version = "0.0.429"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-W2IUEr7jN6GN03Gm7dJY8hl558eaMNdp0j33i+d8Qqs="; + hash = "sha256-O/GS//bEEkqg0Wu2I4pyEPB/lURtfMB0vjam7Uk/mNA="; }; vendorHash = "sha256-5cZy89dJbekxba7BTxKtJkicRPUsl4PyLiNZnG564U4="; diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index c1078773bb1a..0fad8a9d816d 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "48.2"; + version = "48.3"; outputs = [ "out" @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-oDD2Fj+KaAZPrlqeieN/Gcuyk94uEqGd1eIQlW0N9LU="; + hash = "sha256-IaKuoAUWDbCDx6HU0sCYm4RcxyLATvnrtgElp+xbOT0="; }; patches = [ diff --git a/pkgs/by-name/nb/nbstripout/package.nix b/pkgs/by-name/nb/nbstripout/package.nix index 8f957f53e2e2..d378808b4e0c 100644 --- a/pkgs/by-name/nb/nbstripout/package.nix +++ b/pkgs/by-name/nb/nbstripout/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { version = "0.8.1"; - format = "setuptools"; + pyproject = true; pname = "nbstripout"; src = fetchPypi { @@ -25,7 +25,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-OSJLrWkYQIhcdyofS3Bo39ppsU6K3A4546UKB8Q1GGg="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ nbformat ]; @@ -53,6 +57,8 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace tests/test_end_to_end.py --replace "tests/e2e_notebooks" "$TMPDIR/e2e_notebooks" ''; + pythonImportsCheck = [ "nbstripout" ]; + meta = { description = "Strip output from Jupyter and IPython notebooks"; homepage = "https://github.com/kynan/nbstripout"; diff --git a/pkgs/by-name/nb/nbutools/package.nix b/pkgs/by-name/nb/nbutools/package.nix index 83993b160ea4..a8113651b66c 100644 --- a/pkgs/by-name/nb/nbutools/package.nix +++ b/pkgs/by-name/nb/nbutools/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication { pname = "nbutools"; version = "unstable-2023-06-06"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "airbus-seclab"; @@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication { hash = "sha256-YOiFlTIDpeTFOHPU37v0pYf8s3HdaE/4pnd9qrsFtSI="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ aiodns aiohttp beautifulsoup4 diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 84ddcf446fa3..78e6958f4acf 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -33,16 +33,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ncspot"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; tag = "v${finalAttrs.version}"; - hash = "sha256-4zeBTi1WBy9tXowsehUo4qou6bhznWPeCXFg+R3akho="; + hash = "sha256-FSMQv2443oPQjMSv68ppfI2ZTUG79b+GcXmHNAmjPZk="; }; - cargoHash = "sha256-c16qw2khbMXTA8IbYQnMKqivO63DwyAWKfV2P1aD7dU="; + cargoHash = "sha256-Qjsn3U9KZr5qZliJ/vbudfkH1uOng1N5c8dAyH+Y5vQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix index b01280747f8b..737582298805 100644 --- a/pkgs/by-name/ne/necesse-server/package.nix +++ b/pkgs/by-name/ne/necesse-server/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.32.1-18336931"; + version = "0.33.0-19201409"; urlVersion = lib.replaceStrings [ "." ] [ "-" ] version; in @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { src = fetchzip { url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip"; - hash = "sha256-vvTbwEcfpzLIWSjbkUqKBOyAsT2fFk27v9UB9V+fTfw="; + hash = "sha256-VpBWQ/Sl6uCRyR2WQYkZcIcSX89+AshHdRCqbKneqvM="; }; # removing packaged jre since we use our own diff --git a/pkgs/by-name/ne/nemo-emblems/package.nix b/pkgs/by-name/ne/nemo-emblems/package.nix index 08d8886022d2..ece3a9f62f1b 100644 --- a/pkgs/by-name/ne/nemo-emblems/package.nix +++ b/pkgs/by-name/ne/nemo-emblems/package.nix @@ -8,6 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "nemo-emblems"; version = "6.4.0"; + pyproject = true; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -17,18 +18,18 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y="; }; - format = "setuptools"; - sourceRoot = "${src.name}/nemo-emblems"; postPatch = '' substituteInPlace setup.py \ - --replace "/usr/share" "share" + --replace-fail "/usr/share" "share" substituteInPlace nemo-extension/nemo-emblems.py \ - --replace "/usr/share/locale" "${cinnamon-translations}/share/locale" + --replace-fail "/usr/share/locale" "${cinnamon-translations}/share/locale" ''; + build-system = with python3.pkgs; [ setuptools ]; + meta = with lib; { homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-emblems"; description = "Change a folder or file emblem in Nemo"; diff --git a/pkgs/by-name/ne/neovim-remote/package.nix b/pkgs/by-name/ne/neovim-remote/package.nix index 29737cc3cdc7..ac9a703a8086 100644 --- a/pkgs/by-name/ne/neovim-remote/package.nix +++ b/pkgs/by-name/ne/neovim-remote/package.nix @@ -1,16 +1,16 @@ { lib, + stdenv, fetchFromGitHub, python3, neovim, fetchpatch, }: -with python3.pkgs; -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "neovim-remote"; version = "2.5.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mhinz"; @@ -27,15 +27,16 @@ buildPythonApplication rec { }) ]; - propagatedBuildInputs = [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ pynvim psutil - setuptools ]; nativeCheckInputs = [ neovim - pytestCheckHook + python3.pkgs.pytestCheckHook ]; doCheck = !stdenv.hostPlatform.isDarwin; @@ -44,6 +45,8 @@ buildPythonApplication rec { export HOME="$(mktemp -d)" ''; + pythonImportsCheck = [ "nvr" ]; + meta = with lib; { description = "Tool that helps controlling nvim processes from a terminal"; homepage = "https://github.com/mhinz/neovim-remote/"; diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 2c22d7a2a4de..39aa18c513bf 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation ( in { pname = "neovim-unwrapped"; - version = "0.11.2"; + version = "0.11.3"; __structuredAttrs = true; @@ -103,7 +103,7 @@ stdenv.mkDerivation ( owner = "neovim"; repo = "neovim"; tag = "v${finalAttrs.version}"; - hash = "sha256-sNunEdIFrSMqYaNg0hbrSXALRQXxFkdDOl/hhX1L1WA="; + hash = "sha256-B/An+SiRWC3Ea0T/sEk8aNBS1Ab9OENx/l4Z3nn8xE4="; }; patches = [ diff --git a/pkgs/by-name/ne/net-snmp/package.nix b/pkgs/by-name/ne/net-snmp/package.nix index c1ad4ea5d064..06341c78eeea 100644 --- a/pkgs/by-name/ne/net-snmp/package.nix +++ b/pkgs/by-name/ne/net-snmp/package.nix @@ -6,7 +6,7 @@ file, openssl, perl, - nettools, + net-tools, autoreconfHook, withPerlTools ? false, }: @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-mnttab=/proc/mounts"; postPatch = '' - substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" + substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${net-tools}/bin/netstat" ''; postConfigure = '' @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - nettools + net-tools file autoreconfHook ]; diff --git a/pkgs/by-name/ne/netexec/package.nix b/pkgs/by-name/ne/netexec/package.nix index 747103618c22..4cdb4e13e0ce 100644 --- a/pkgs/by-name/ne/netexec/package.nix +++ b/pkgs/by-name/ne/netexec/package.nix @@ -2,11 +2,11 @@ lib, stdenv, fetchFromGitHub, - python3, + python312, writableTmpDirAsHomeHook, }: let - python = python3.override { + python = python312.override { self = python; packageOverrides = self: super: { impacket = super.impacket.overridePythonAttrs { diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index fdbf18dfffad..c943ebba7215 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-gDBjAwut217mdbWyk/dSU4JOkoRbOk4Czlb/lXhWqRU="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nimble/package.nix b/pkgs/by-name/ni/nimble/package.nix index 42c0ccf50833..1f1c2ff6fd68 100644 --- a/pkgs/by-name/ni/nimble/package.nix +++ b/pkgs/by-name/ni/nimble/package.nix @@ -12,13 +12,13 @@ buildNimPackage ( final: prev: { pname = "nimble"; - version = "0.18.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nimble"; rev = "v${final.version}"; - hash = "sha256-wgzFhModFkwB8st8F5vSkua7dITGGC2cjoDvgkRVZMs="; + hash = "sha256-XcXdhEtwnsHZGBTt1xU7HaJK2qyJ0s2xxk2O3XkbTXQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ni/nix-bisect/package.nix b/pkgs/by-name/ni/nix-bisect/package.nix index 421b2e035a9f..1e4873227e62 100644 --- a/pkgs/by-name/ni/nix-bisect/package.nix +++ b/pkgs/by-name/ni/nix-bisect/package.nix @@ -10,7 +10,7 @@ let in python3.pkgs.buildPythonApplication { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "timokau"; @@ -19,7 +19,9 @@ python3.pkgs.buildPythonApplication { hash = "sha256-zyeE1jYo/9NEG8fB4gQBAR01siP4tyLvjjHN1yUS4Ug="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ appdirs numpy pexpect @@ -27,6 +29,8 @@ python3.pkgs.buildPythonApplication { doCheck = false; + pythonImportsCheck = [ "nix_bisect" ]; + meta = with lib; { description = "Bisect nix builds"; homepage = "https://github.com/timokau/nix-bisect"; diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix index 0996d4a98b41..90ea52a3f504 100644 --- a/pkgs/by-name/ni/nix-fast-build/package.nix +++ b/pkgs/by-name/ni/nix-fast-build/package.nix @@ -6,6 +6,7 @@ nix-eval-jobs, nix-output-monitor, nix-update-script, + bashInteractive, }: python3Packages.buildPythonApplication rec { @@ -28,6 +29,7 @@ python3Packages.buildPythonApplication rec { [ nix-eval-jobs nix-eval-jobs.nix + bashInteractive ] ++ lib.optional (lib.meta.availableOn stdenv.buildPlatform nix-output-monitor.compiler) nix-output-monitor ) diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index c53db6681ff0..dd659a0aeebc 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk="; }; + # Submitted upstream: https://github.com/nix-community/nix-ld/pull/169 + patches = [ ./rust-1.88.patch ]; + useFetchCargoVendor = true; cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc="; diff --git a/pkgs/by-name/ni/nix-ld/rust-1.88.patch b/pkgs/by-name/ni/nix-ld/rust-1.88.patch new file mode 100644 index 000000000000..dac1fcfa1c8b --- /dev/null +++ b/pkgs/by-name/ni/nix-ld/rust-1.88.patch @@ -0,0 +1,33 @@ +diff --git a/src/arch.rs b/src/arch.rs +index a998697..45ec2cb 100644 +--- a/src/arch.rs ++++ b/src/arch.rs +@@ -140,7 +140,7 @@ cfg_match! { + target_arch = "x86_64" => { + pub const ENTRY_TRAMPOLINE: Option !> = Some(entry_trampoline); + +- #[naked] ++ #[unsafe(naked)] + unsafe extern "C" fn entry_trampoline() -> ! { + core::arch::naked_asm!( + "lea r10, [rip + {context}]", +@@ -159,7 +159,7 @@ cfg_match! { + target_arch = "aarch64" => { + pub const ENTRY_TRAMPOLINE: Option !> = Some(entry_trampoline); + +- #[naked] ++ #[unsafe(naked)] + unsafe extern "C" fn entry_trampoline() -> ! { + core::arch::naked_asm!( + "adrp x8, {context}", +diff --git a/src/sys.rs b/src/sys.rs +index 109d809..bf085d9 100644 +--- a/src/sys.rs ++++ b/src/sys.rs +@@ -181,6 +181,5 @@ pub fn new_slice_leak(size: usize) -> Option<&'static mut [u8]> { + + #[cfg(not(test))] + #[lang = "eh_personality"] +-#[no_mangle] + pub extern fn rust_eh_personality() { + } diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index 423e33b0afdc..e7aa5f3d3ff4 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -83,7 +83,7 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - pytestFlagsArray = [ "-vv" ]; + pytestFlags = [ "-vv" ]; makeWrapperArgs = lib.optionals (withTmpdir != null) [ "--set TMPDIR ${withTmpdir}" diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 4208fb3dc1d5..59ba3fd340da 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -281,7 +281,7 @@ def execute(argv: list[str]) -> None: copy_flags = common_flags | vars(args_groups["copy_flags"]) if args.upgrade or args.upgrade_all: - nix.upgrade_channels(bool(args.upgrade_all)) + nix.upgrade_channels(args.upgrade_all, args.sudo) action = Action(args.action) # Only run shell scripts from the Nixpkgs tree if the action is diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 3cee183c96b1..9a2d6a131580 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -693,16 +693,26 @@ def switch_to_configuration( ) -def upgrade_channels(all_channels: bool = False) -> None: +def upgrade_channels(all_channels: bool = False, sudo: bool = False) -> None: """Upgrade channels for classic Nix. It will either upgrade just the `nixos` channel (including any channel that has a `.update-on-nixos-rebuild` file) or all. """ + if not sudo and os.geteuid() != 0: + raise NixOSRebuildError( + "if you pass the '--upgrade' or '--upgrade-all' flag, you must " + "also pass '--sudo' or run the command as root (e.g., with sudo)" + ) + for channel_path in Path("/nix/var/nix/profiles/per-user/root/channels/").glob("*"): if channel_path.is_dir() and ( all_channels or channel_path.name == "nixos" or (channel_path / ".update-on-nixos-rebuild").exists() ): - run_wrapper(["nix-channel", "--update", channel_path.name], check=False) + run_wrapper( + ["nix-channel", "--update", channel_path.name], + check=False, + sudo=sudo, + ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 601eea1da212..9833aade3b99 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -836,17 +836,34 @@ def test_switch_to_configuration_with_systemd_run( ], ) @patch("pathlib.Path.is_dir", autospec=True, return_value=True) -def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: - with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: - n.upgrade_channels(False) - mock_run.assert_called_once_with(["nix-channel", "--update", "nixos"], check=False) +@patch("os.geteuid", autospec=True, return_value=1000) +@patch(get_qualified_name(n.run_wrapper, n), autospec=True) +def test_upgrade_channels( + mock_run: Mock, + mock_geteuid: Mock, + mock_is_dir: Mock, + mock_glob: Mock, +) -> None: + with pytest.raises(m.NixOSRebuildError) as e: + n.upgrade_channels(all_channels=False, sudo=False) + assert str(e.value) == ( + "error: if you pass the '--upgrade' or '--upgrade-all' flag, you must " + "also pass '--sudo' or run the command as root (e.g., with sudo)" + ) - with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: - n.upgrade_channels(True) + n.upgrade_channels(all_channels=False, sudo=True) + mock_run.assert_called_once_with( + ["nix-channel", "--update", "nixos"], check=False, sudo=True + ) + + mock_geteuid.return_value = 0 + n.upgrade_channels(all_channels=True, sudo=False) mock_run.assert_has_calls( [ - call(["nix-channel", "--update", "nixos"], check=False), - call(["nix-channel", "--update", "nixos-hardware"], check=False), - call(["nix-channel", "--update", "home-manager"], check=False), + call(["nix-channel", "--update", "nixos"], check=False, sudo=False), + call( + ["nix-channel", "--update", "nixos-hardware"], check=False, sudo=False + ), + call(["nix-channel", "--update", "home-manager"], check=False, sudo=False), ] ) diff --git a/pkgs/by-name/no/norminette/package.nix b/pkgs/by-name/no/norminette/package.nix index 87c6998f1ca7..a7a639f0eacf 100644 --- a/pkgs/by-name/no/norminette/package.nix +++ b/pkgs/by-name/no/norminette/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "norminette"; version = "3.3.58"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "42School"; @@ -16,13 +16,20 @@ python3Packages.buildPythonApplication rec { hash = "sha256-6hBBbfW2PQFb8rcDihvtWK0df7WcvOk0il1E82GOxaU="; }; + build-system = with python3Packages; [ + poetry-core + ]; + + pythonRemoveDeps = [ + # Can be removed once https://github.com/42school/norminette/issues/565 is addressed + "argparse" + ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - preCheck = '' - export PYTHONPATH=norminette:$PYTHONPATH - ''; + pythonImportsCheck = [ "norminette" ]; meta = with lib; { description = "Open source norminette to apply 42's norme to C files"; diff --git a/pkgs/by-name/no/nototools/package.nix b/pkgs/by-name/no/nototools/package.nix index 8ec68eecefdb..c2676f413011 100644 --- a/pkgs/by-name/no/nototools/package.nix +++ b/pkgs/by-name/no/nototools/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "nototools"; version = "0.2.20"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; @@ -17,11 +17,10 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-id4UhyWOFHrtmBZHhnaY2jHDIK0s7rcGBpg4QsBTLKs="; }; - postPatch = '' - sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py - ''; - - build-system = with python3Packages; [ setuptools-scm ]; + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; pythonRemoveDeps = [ # https://github.com/notofonts/nototools/pull/901 @@ -72,6 +71,8 @@ python3Packages.buildPythonApplication rec { cp -r third_party $out ''; + pythonImportsCheck = [ "nototools" ]; + meta = with lib; { description = "Noto fonts support tools and scripts plus web site generation"; homepage = "https://github.com/googlefonts/nototools"; diff --git a/pkgs/by-name/no/nox/package.nix b/pkgs/by-name/no/nox/package.nix index e1db0d13a542..80d608fd122d 100644 --- a/pkgs/by-name/no/nox/package.nix +++ b/pkgs/by-name/no/nox/package.nix @@ -2,14 +2,12 @@ lib, python3Packages, fetchurl, - git, }: python3Packages.buildPythonApplication rec { pname = "nox"; version = "0.0.6"; - format = "setuptools"; - namePrefix = ""; + pyproject = true; src = fetchurl { url = "mirror://pypi/n/nix-nox/nix-nox-${version}.tar.gz"; @@ -18,19 +16,21 @@ python3Packages.buildPythonApplication rec { patches = [ ./nox-review-wip.patch ]; - buildInputs = [ - python3Packages.pbr - git + build-system = with python3Packages; [ + setuptools + pbr ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ dogpile-cache click requests characteristic - setuptools + setuptools # pkg_resources is imported during runtime ]; + pythonImportsCheck = [ "nox" ]; + meta = { homepage = "https://github.com/madjar/nox"; description = "Tools to make nix nicer to use"; diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix index ece36548399e..e12c88d607c8 100644 --- a/pkgs/by-name/np/npm-lockfile-fix/package.nix +++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "npm-lockfile-fix"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jeslie0"; @@ -17,8 +17,12 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-P93OowrVkkOfX5XKsRsg0c4dZLVn2ZOonJazPmHdD7g="; }; - propagatedBuildInputs = [ - python3.pkgs.requests + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ + requests ]; doCheck = false; # no tests diff --git a/pkgs/by-name/nt/ntfy/package.nix b/pkgs/by-name/nt/ntfy/package.nix index 2cfbace33ecf..5d2d50e9ae06 100644 --- a/pkgs/by-name/nt/ntfy/package.nix +++ b/pkgs/by-name/nt/ntfy/package.nix @@ -27,7 +27,7 @@ python.pkgs.buildPythonApplication rec { pname = "ntfy"; version = "2.7.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dschep"; @@ -73,9 +73,11 @@ python.pkgs.buildPythonApplication rec { postPatch = '' # We disable the Darwin specific things because it relies on pyobjc, which we don't have. substituteInPlace setup.py \ - --replace "':sys_platform == \"darwin\"'" "'darwin'" + --replace-fail "':sys_platform == \"darwin\"'" "'darwin'" ''; + build-system = with python.pkgs; [ setuptools ]; + dependencies = with python.pkgs; ( @@ -123,6 +125,8 @@ python.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d) ''; + pythonImportsCheck = [ "ntfy" ]; + meta = with lib; { description = "Utility for sending notifications, on demand and when commands finish"; homepage = "https://ntfy.readthedocs.io/en/latest/"; diff --git a/pkgs/by-name/nt/ntfy/webpush.nix b/pkgs/by-name/nt/ntfy/webpush.nix index 0669562b1d42..b7674de5791d 100644 --- a/pkgs/by-name/nt/ntfy/webpush.nix +++ b/pkgs/by-name/nt/ntfy/webpush.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pywebpush, py-vapid, }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "ntfy-webpush"; version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dschep"; @@ -21,10 +22,12 @@ buildPythonPackage rec { postPatch = '' # break dependency loop substituteInPlace setup.py \ - --replace "'ntfy', " "" + --replace-fail "'ntfy', " "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pywebpush py-vapid ]; diff --git a/pkgs/by-name/nt/ntlmrecon/package.nix b/pkgs/by-name/nt/ntlmrecon/package.nix index 94f47b691f32..ed11fac64873 100644 --- a/pkgs/by-name/nt/ntlmrecon/package.nix +++ b/pkgs/by-name/nt/ntlmrecon/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "ntlmrecon"; version = "0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pwnfoo"; @@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0rrx49li2l9xlcax84qxjf60nbzp3fgq77c36yqmsp0pc9i89ah6"; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ colorama iptools requests diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index eb4d98ad8b08..1f92222f31e7 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; version = "1.5.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "XuehaiPan"; @@ -17,6 +17,8 @@ python3Packages.buildPythonApplication rec { hash = "sha256-FQbY9j6eJtupBiYTSCEJHAAlpDltb6U5hgWet42AKho="; }; + build-system = with python3Packages; [ setuptools ]; + pythonRelaxDeps = [ "nvidia-ml-py" ]; dependencies = with python3Packages; [ @@ -30,6 +32,8 @@ python3Packages.buildPythonApplication rec { ]; versionCheckProgramArg = "--version"; + pythonImportsCheck = [ "nvitop" ]; + meta = { description = "Interactive NVIDIA-GPU process viewer, the one-stop solution for GPU process management"; homepage = "https://github.com/XuehaiPan/nvitop"; diff --git a/pkgs/by-name/nv/nvpy/package.nix b/pkgs/by-name/nv/nvpy/package.nix index 2a8c539328da..d17d640701a7 100644 --- a/pkgs/by-name/nv/nvpy/package.nix +++ b/pkgs/by-name/nv/nvpy/package.nix @@ -8,9 +8,9 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "2.3.1"; - format = "setuptools"; pname = "nvpy"; + version = "2.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "cpbotha"; @@ -19,7 +19,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "sha256-guNdLu/bCk89o5M3gQU7J0W4h7eZdLHM0FG5IAPLE7c="; }; - propagatedBuildInputs = with pythonPackages; [ + build-system = with pythonPackages; [ setuptools ]; + + dependencies = with pythonPackages; [ markdown docutils simplenote @@ -37,6 +39,8 @@ pythonPackages.buildPythonApplication rec { install -m644 README.rst "$out/share/doc/nvpy/README" ''; + pythonImportsCheck = [ "nvpy" ]; + meta = with pkgs.lib; { description = "Simplenote-syncing note-taking tool inspired by Notational Velocity"; homepage = "https://github.com/cpbotha/nvpy"; diff --git a/pkgs/by-name/nw/nwg-clipman/package.nix b/pkgs/by-name/nw/nwg-clipman/package.nix index 0d8a4ccf7ca0..30e97da20f82 100644 --- a/pkgs/by-name/nw/nwg-clipman/package.nix +++ b/pkgs/by-name/nw/nwg-clipman/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonPackage rec { pname = "nwg-clipman"; - version = "0.2.6"; - format = "setuptools"; + version = "0.2.7"; + pyproject = true; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-clipman"; tag = "v${version}"; - hash = "sha256-FB+NerU3CfGru7vDBQflAzgtO7gt8cjgyC9O3zCa2ss="; + hash = "sha256-EBxt1OSwddlMIwEqc89rzak3jhPwOhZ61Rz5l2LU2kY="; }; build-system = [ python3Packages.setuptools ]; @@ -55,6 +55,8 @@ python3Packages.buildPythonPackage rec { strictDeps = true; + pythonImportsCheck = [ "nwg_clipman" ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix index 13f7f529a92f..ae21c462c22d 100644 --- a/pkgs/by-name/nw/nwg-panel/package.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.10.8"; + version = "0.10.10"; format = "setuptools"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; tag = "v${version}"; - hash = "sha256-DU9G11lR0nENE29yAsix946mmexLFK3eoqjZcyKYOH8="; + hash = "sha256-fZjjfblXFyB4npcv5xKXGqnqNCAdmvJTErI+0PcuaPk="; }; # No tests diff --git a/pkgs/by-name/nw/nwg-wrapper/package.nix b/pkgs/by-name/nw/nwg-wrapper/package.nix index 8a7bfa40ed5c..8ea443fc3f67 100644 --- a/pkgs/by-name/nw/nwg-wrapper/package.nix +++ b/pkgs/by-name/nw/nwg-wrapper/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { pname = "nwg-wrapper"; version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "nwg-piotr"; @@ -31,7 +31,9 @@ python3Packages.buildPythonPackage rec { gtk-layer-shell ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ i3ipc pygobject3 ]; diff --git a/pkgs/by-name/ny/nyx/package.nix b/pkgs/by-name/ny/nyx/package.nix index 093869d0ede0..cfc82671f18f 100644 --- a/pkgs/by-name/ny/nyx/package.nix +++ b/pkgs/by-name/ny/nyx/package.nix @@ -4,23 +4,25 @@ fetchPypi, }: -with python3Packages; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "nyx"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "02rrlllz2ci6i6cs3iddyfns7ang9a54jrlygd2jw1f9s6418ll8"; }; - propagatedBuildInputs = [ stem ]; + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ stem ]; # ./run_tests.py returns `TypeError: testFailure() takes exactly 1 argument` doCheck = false; + pythonImportsCheck = [ "nyx" ]; + meta = with lib; { description = "Command-line monitor for Tor"; mainProgram = "nyx"; diff --git a/pkgs/by-name/oc/ocis/package.nix b/pkgs/by-name/oc/ocis/package.nix index 41669e7cf9f8..a03c50f4734f 100644 --- a/pkgs/by-name/oc/ocis/package.nix +++ b/pkgs/by-name/oc/ocis/package.nix @@ -51,6 +51,7 @@ buildGoModule rec { inherit pname version src; sourceRoot = "${src.name}/services/idp"; hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs="; + fetcherVersion = 1; }; pnpmRoot = "services/idp"; diff --git a/pkgs/by-name/oc/ocis/web.nix b/pkgs/by-name/oc/ocis/web.nix index def8a16b351d..14b407470371 100644 --- a/pkgs/by-name/oc/ocis/web.nix +++ b/pkgs/by-name/oc/ocis/web.nix @@ -37,6 +37,7 @@ stdenvNoCC.mkDerivation rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M="; + fetcherVersion = 1; }; meta = { diff --git a/pkgs/by-name/oc/ocl-icd/package.nix b/pkgs/by-name/oc/ocl-icd/package.nix index 3c44fa98db25..f09d08ed9125 100644 --- a/pkgs/by-name/oc/ocl-icd/package.nix +++ b/pkgs/by-name/oc/ocl-icd/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ocl-icd"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "OCL-dev"; repo = "ocl-icd"; rev = "v${version}"; - sha256 = "sha256-nx9Zz5DpS29g1HRIwPAQi6i+d7Blxd53WQ7Sb1a3FHg="; + sha256 = "sha256-pt2ISb+xROgkBnbRvESsuaqzBIRKB1NCzAauRW15L8M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix index 21eb3657b331..775586a951ff 100644 --- a/pkgs/by-name/ol/olivetin/package.nix +++ b/pkgs/by-name/ol/olivetin/package.nix @@ -81,18 +81,18 @@ buildGoModule ( { pname = "olivetin"; - version = "2025.6.22"; + version = "2025.7.13"; src = fetchFromGitHub { owner = "OliveTin"; repo = "OliveTin"; tag = finalAttrs.version; - hash = "sha256-fNE8x0d0lnKVxy4fk3h5QrcWnMKBcxhrxpDbZYTXimc="; + hash = "sha256-/KylnGxamyhrvLNHAIcBUcDWU+Agizg7tlMOv6qnpCI="; }; modRoot = "service"; - vendorHash = "sha256-8rPJoB75de2Y56iyIwdI9HPk7OlCgfMPy28TW1i7+sU="; + vendorHash = "sha256-mI17WV+U4wbcZhSymX4NnxwvHqQNehubrvH9CxXe4/o="; ldflags = [ "-s" diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix index b15b225060ef..740b2ce33766 100644 --- a/pkgs/by-name/op/open-fprintd/package.nix +++ b/pkgs/by-name/op/open-fprintd/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonPackage rec { pname = "open-fprintd"; - version = "0.6"; + version = "0.7"; format = "setuptools"; src = fetchFromGitHub { owner = "uunicorn"; repo = "open-fprintd"; rev = version; - hash = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; + hash = "sha256-4TraOKvBc7ddqcY73aCuKgfwx4fNoaPHVG8so8Dc5Bw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/open-web-calendar/package.nix b/pkgs/by-name/op/open-web-calendar/package.nix index c56fbbb4285c..1579e8cdf8a4 100644 --- a/pkgs/by-name/op/open-web-calendar/package.nix +++ b/pkgs/by-name/op/open-web-calendar/package.nix @@ -63,7 +63,7 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; - pytestFlagsArray = [ "open_web_calendar/test" ]; + enabledTestPaths = [ "open_web_calendar/test" ]; pythonImportsCheck = [ "open_web_calendar.app" ]; diff --git a/pkgs/by-name/op/openalSoft/package.nix b/pkgs/by-name/op/openalSoft/package.nix index c51300ebfb79..76430b24fede 100644 --- a/pkgs/by-name/op/openalSoft/package.nix +++ b/pkgs/by-name/op/openalSoft/package.nix @@ -14,17 +14,18 @@ pulseSupport ? !stdenv.hostPlatform.isDarwin, libpulseaudio, nix-update-script, + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openal-soft"; - version = "1.24.2"; + version = "1.24.3"; src = fetchFromGitHub { owner = "kcat"; repo = "openal-soft"; - rev = version; - sha256 = "sha256-ECrIkxMACPsWehtJWwTmoYj6hGcsdxwVuTiQywG36Y8="; + tag = finalAttrs.version; + hash = "sha256-VQa3FD9NyvDv/+VbU+5lmV0LteiioJHpRkr1lnCn1g4="; }; strictDeps = true; @@ -41,32 +42,32 @@ stdenv.mkDerivation rec { ++ lib.optional pipewireSupport pipewire ++ lib.optional pulseSupport libpulseaudio; - cmakeFlags = - [ - # Automatically links dependencies without having to rely on dlopen, thus - # removes the need for NIX_LDFLAGS. - "-DALSOFT_DLOPEN=OFF" + cmakeFlags = [ + # Automatically links dependencies without having to rely on dlopen, thus + # removes the need for NIX_LDFLAGS. + (lib.cmakeBool "ALSOFT_DLOPEN" false) + # allow oal-soft to find its own data files (e.g. HRTF profiles) + (lib.cmakeBool "ALSOFT_SEARCH_INSTALL_DATADIR" true) + ]; - # allow oal-soft to find its own data files (e.g. HRTF profiles) - "-DALSOFT_SEARCH_INSTALL_DATADIR=1" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - # https://github.com/NixOS/nixpkgs/issues/183774 - "-DALSOFT_BACKEND_OSS=OFF" - ]; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "^(\\d+\\.\\d+\\.\\d+)$" - ]; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^(\\d+\\.\\d+\\.\\d+)$" + ]; + }; }; - meta = with lib; { + meta = { description = "OpenAL alternative"; homepage = "https://openal-soft.org/"; - license = licenses.lgpl2; - maintainers = with maintainers; [ ftrvxmtrx ]; - platforms = platforms.unix; + changelog = "https://github.com/kcat/openal-soft/blob/master/ChangeLog"; + license = lib.licenses.lgpl2; + pkgConfigModules = [ "openal" ]; + maintainers = with lib.maintainers; [ ftrvxmtrx ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index b89fa6f55ead..0671d2dddee0 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -16,7 +16,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; - hash = "sha256-yseRO1tClLTRpQj5BzMscElUlgLEzj1u8ndT1+di2+Y="; + hash = "sha256-NW7HK2B9h5JprK3JcIGi/OHcyoa5VTs/P0s3BZr+4FU="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 38b2c3b12e95..943bc71569ce 100644 --- a/pkgs/by-name/op/opencloud/package.nix +++ b/pkgs/by-name/op/opencloud/package.nix @@ -28,13 +28,13 @@ let in buildGoModule rec { pname = "opencloud"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${version}"; - hash = "sha256-hWd/x+HRuU39j4F2bC0RbhFJEyjlKIknAYGArcdGEoM="; + hash = "sha256-QHx97pEsAIj0F46vAPv/fuSc0sfUP7BYfMVCE1mE3co="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index a140684baed3..296fd81f55fb 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -9,18 +9,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-1LcOvpVVhBkY2ek67ME2rHqdYo5Ud2oWQC6rjxQX3Ng="; + hash = "sha256-nFiYnZ+um1J0pf0Dr0P1ZBeTeZnxOQc0ILEyhFF2kQw="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-7wwviWveMf+xnYmO05MI3XuPVZ/pcSqQi4sGjrEdjGc="; + hash = "sha256-vxZxwbJByTk45GDD2FNphMMdeLlF8uxyrlc9x42crNA="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 0177c0224b4a..712e796f75f0 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -12,10 +12,10 @@ let opencode-node-modules-hash = { - "aarch64-darwin" = "sha256-+eXXWskZg0CIY12+Ee4Y3uwpB5I92grDiZ600Whzx/I="; - "aarch64-linux" = "sha256-rxLPrYAIiKDh6de/GACPfcYXY7nIskqAu1Xi12y5DpU="; - "x86_64-darwin" = "sha256-LOz7N6gMRaZLPks+y5fDIMOuUCXTWpHIss1v0LHPnqw="; - "x86_64-linux" = "sha256-GKLR+T+lCa7GFQr6HqSisfa4uf8F2b79RICZmePmCBE="; + "aarch64-darwin" = "sha256-uk8HQfHCKTAW54rNHZ1Rr0piZzeJdx6i4o0+xKjfFZs="; + "aarch64-linux" = "sha256-gDQh8gfFKl0rAujtos1XsCUnxC2Vjyq9xH5FLZoNW5s="; + "x86_64-darwin" = "sha256-H5+qa7vxhwNYRXUo4v8IFUToVXtyXzU3veIqu4idAbU="; + "x86_64-linux" = "sha256-1ZxetDrrRdNNOfDOW2uMwMwpEs5S3BLF+SejWcRdtik="; }; bun-target = { "aarch64-darwin" = "bun-darwin-arm64"; @@ -26,12 +26,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.1.194"; + version = "0.2.33"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-51Mc0Qrg3C0JTpXl2OECKEUvle+6X+j9+/Blu8Nu9Ao="; + hash = "sha256-l/V9YHwuIPN73ieMT++enL1O5vecA9L0qBDGr8eRVxY="; }; tui = buildGoModule { @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) version; src = "${finalAttrs.src}/packages/tui"; - vendorHash = "sha256-hxtQHlaV2Em8CyTK3BNaoo/LgnGbMjj5XafbleF+p9I="; + vendorHash = "sha256-0vf4fOk32BLF9/904W8g+5m0vpe6i6tUFRXqDHVcMIQ="; subPackages = [ "cmd/opencode" ]; @@ -113,7 +113,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ bun ]; - patches = [ ./fix-models-macro.patch ]; + patches = [ + # Patch `packages/opencode/src/provider/models-macro.ts` to load the prefetched `models.dev/api.json` + # from the `MODELS_JSON` environment variable instead of fetching it at build time. + ./fix-models-macro.patch + ]; configurePhase = '' runHook preConfigure @@ -144,7 +148,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/bin install -Dm755 opencode $out/bin/opencode runHook postInstall diff --git a/pkgs/by-name/op/openfec/package.nix b/pkgs/by-name/op/openfec/package.nix index 613cc2fec671..1fbed3dfc591 100644 --- a/pkgs/by-name/op/openfec/package.nix +++ b/pkgs/by-name/op/openfec/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "openfec"; - version = "1.4.2.11"; + version = "1.4.2.12"; src = fetchzip { url = "https://github.com/roc-streaming/openfec/archive/refs/tags/v${version}.tar.gz"; - hash = "sha256-lBR8vz8whEdPVHAGVq9eRriKtmS5tUAvtoyXwO4AuEs="; + hash = "sha256-KOP3LqCZHdEgm+XhzBdNxnJipGC4gpvA57T7mIeSyaE="; }; outputs = [ diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix index 2605eb20d5fe..b7d9675c52ea 100644 --- a/pkgs/by-name/op/openimageio/package.nix +++ b/pkgs/by-name/op/openimageio/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openimageio"; - version = "3.0.8.0"; + version = "3.0.8.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; tag = "v${finalAttrs.version}"; - hash = "sha256-94DGol32IPAu9QKRMFjAoGLMfV7x6eXGGqpOxzYh/Ww="; + hash = "sha256-GbjkFij8d5a/pxNYckCs+McMAHh+NiGAaxAaZYjj7jY="; }; outputs = [ diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix index 693c50cc69cf..28a8aff7ea19 100644 --- a/pkgs/by-name/op/openlist/frontend.nix +++ b/pkgs/by-name/op/openlist/frontend.nix @@ -33,6 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-PTZ+Vhg3hNnORnulkzuVg6TF/jY0PvUWYja9z7S4GdM="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/op/openobserve/build.rs.patch b/pkgs/by-name/op/openobserve/build.rs.patch index 1cfb91c7c12b..70e89ec2c873 100644 --- a/pkgs/by-name/op/openobserve/build.rs.patch +++ b/pkgs/by-name/op/openobserve/build.rs.patch @@ -1,11 +1,11 @@ diff --git a/build.rs b/build.rs index 0f66ace..be74fad 100644 ---- a/build.rs -+++ b/build.rs -@@ -99,24 +99,5 @@ fn main() -> Result<()> { - &["proto"], - )?; - +--- a/src/config/build.rs ++++ b/src/config/build.rs +@@ -20,24 +20,5 @@ use chrono::{DateTime, SecondsFormat, Utc}; + fn main() -> Result<()> { + println!("cargo:rerun-if-changed=build.rs"); + - // build information - let output = Command::new("git") - .args(["describe", "--tags", "--abbrev=0"]) diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix index 6684c7d4f1e9..8472b1700e23 100644 --- a/pkgs/by-name/op/openobserve/package.nix +++ b/pkgs/by-name/op/openobserve/package.nix @@ -15,12 +15,12 @@ }: let - version = "0.14.0"; + version = "0.14.7"; src = fetchFromGitHub { owner = "openobserve"; repo = "openobserve"; tag = "v${version}"; - hash = "sha256-rTp+DkADqYkJg1zJog1yURE082V5kCqgid/oUd81SN8="; + hash = "sha256-+YcVTn/jcEbaqTycMCYn6B0z2HsvgrCY1gHnkRajwSs="; }; web = buildNpmPackage { inherit src version; @@ -28,7 +28,7 @@ let sourceRoot = "${src.name}/web"; - npmDepsHash = "sha256-awfQR1wZBX3ggmD0uJE9Fur4voPydeygrviRijKnBTE="; + npmDepsHash = "sha256-1MUmAWkeYUEL6WZGq1Jg5W2uKa2xj0oZbGlIbvZWT1E="; preBuild = '' # Patch vite config to not open the browser to visualize plugin composition @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage { ''; useFetchCargoVendor = true; - cargoHash = "sha256-FWMUPghx9CxuzP7jFZYSIwZsylApWzQsfx8DuwS4GTo="; + cargoHash = "sha256-vfc6B+Uc8RXQD8vGC1yV9w5YAefkYJMpCH2frqjrSWk="; nativeBuildInputs = [ pkg-config @@ -96,6 +96,7 @@ rustPlatform.buildRustPackage { checkFlags = [ "--skip=handler::http::router::tests::test_get_proxy_routes" "--skip=tests::e2e_test" + "--skip=service::organization::tests::test_organization" ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index cb6c21ceb2f3..3cc6e76e7aea 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -13,18 +13,18 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.11.9"; + version = "0.11.10"; src = fetchFromGitea { domain = "codeberg.org"; owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; - hash = "sha256-kT/egkOBOomUX+fwT3OeRSZOnGeuFRLKKAXtW8nN4rw="; + hash = "sha256-1sm/zaKhUPMGdYg8sX/IXAI4vIRRZezSD89rljG4S/Y="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mZZ8veY3iqsgScfFAGYo496qxTew24R5NxYf3WjnHco="; + cargoHash = "sha256-S+TOSUh/sr647aUBjo+aaZgVrrOubwa+XVFcwNBOxmI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/op/openresolv/package.nix b/pkgs/by-name/op/openresolv/package.nix index f1bbd9640491..752bed7ffb1d 100644 --- a/pkgs/by-name/op/openresolv/package.nix +++ b/pkgs/by-name/op/openresolv/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "openresolv"; - version = "3.13.2"; + version = "3.16.5"; src = fetchFromGitHub { owner = "NetworkConfiguration"; repo = "openresolv"; rev = "v${version}"; - sha256 = "sha256-rpfzAIzuiO+QTFhN+tHND+OQOyX/GUPvLLX3CSSwqA4="; + sha256 = "sha256-EkplO5XWWqABzCSrmTxWSxX6PawpcVZAeKZG5l1FTUE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/op/opentsdb/package.nix b/pkgs/by-name/op/opentsdb/package.nix index 83c8681f1ff1..250566cdb84a 100644 --- a/pkgs/by-name/op/opentsdb/package.nix +++ b/pkgs/by-name/op/opentsdb/package.nix @@ -10,7 +10,7 @@ git, jdk8, makeWrapper, - nettools, + net-tools, python3, }: @@ -324,7 +324,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl jdk - nettools + net-tools python3 git ]; diff --git a/pkgs/by-name/op/opentype-sanitizer/package.nix b/pkgs/by-name/op/opentype-sanitizer/package.nix index fdd207cbef2e..afb658d7e757 100644 --- a/pkgs/by-name/op/opentype-sanitizer/package.nix +++ b/pkgs/by-name/op/opentype-sanitizer/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QRbF2GUDQsp8i6qVYlafSb9HaaozRuJ8dn1mhMMLeLc="; }; - mesonFlags = [ "-Dcpp_std=c++14" ]; + mesonFlags = [ "-Dcpp_std=c++17" ]; # required by gtest buildInputs = [ freetype diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix index 8b2099a10274..6ec7af87decf 100644 --- a/pkgs/by-name/or/orthanc/package.nix +++ b/pkgs/by-name/or/orthanc/package.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "orthanc"; - version = "1.12.7"; + version = "1.12.8"; src = fetchhg { url = "https://orthanc.uclouvain.be/hg/orthanc/"; rev = "Orthanc-${finalAttrs.version}"; - hash = "sha256-aWUA8cCnWff5Tl8PWGJJtERlGh4GX4a8hTG9E2ADG9k="; + hash = "sha256-ktfTqCid/0aYAp5HPB7niZ1sw+zMNmd5mhZrXRbMGyk="; }; outputs = [ diff --git a/pkgs/by-name/ot/otpw/package.nix b/pkgs/by-name/ot/otpw/package.nix index c83b44e472d2..8814b6ffee54 100644 --- a/pkgs/by-name/ot/otpw/package.nix +++ b/pkgs/by-name/ot/otpw/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "ls -lu /etc/. /tmp/. / /usr/. /bin/. /usr/bin/." "${coreutils}/bin/ls -lu /etc/. /tmp/. / /usr/. /bin/. /usr/bin/." \ --replace "PATH=/usr/ucb:/bin:/usr/bin;ps lax" "PATH=/usr/ucb:/bin:/usr/bin;${unixtools.procps}/bin/ps lax" \ --replace "last | head -50" "${util-linux}/bin/last | ${coreutils}/bin/head -50" \ - --replace "uptime;netstat -n;hostname;date;w" "${coreutils}/bin/uptime; ${unixtools.nettools}/bin/netstat -n; ${unixtools.nettools}/bin/hostname; ${coreutils}/bin/date; ${procps}/bin/w" + --replace "uptime;netstat -n;hostname;date;w" "${coreutils}/bin/uptime; ${unixtools.net-tools}/bin/netstat -n; ${unixtools.net-tools}/bin/hostname; ${coreutils}/bin/date; ${procps}/bin/w" ''; buildInputs = [ diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix index 4b6f82a184cc..8aa00be38990 100644 --- a/pkgs/by-name/ov/overlayed/package.nix +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -36,6 +36,7 @@ rustPlatform.buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 65d1729540ef..18ce88812f6e 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -10,18 +10,18 @@ }: let - ocamlPackages = ocaml-ng.ocamlPackages_5_1; + ocamlPackages = ocaml-ng.ocamlPackages_5_2; in ocamlPackages.buildDunePackage rec { pname = "owi"; - version = "0.2-unstable-2025-05-05"; + version = "0.2-unstable-2025-07-08"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "e4c2e85f1364714a77a925ec29321cf9b8fe90f4"; + rev = "bcd7d362ed165c542deb2d49da1d45296aa03277"; fetchSubmodules = true; - hash = "sha256-ewaAkSyxtiiE8WcHusOyZDesqI61kCEN3pMb99R7Dkw="; + hash = "sha256-611k9CQx0C3QKR4NZpnr77LoBZSFBEdU0uRnZshO1cc="; }; nativeBuildInputs = with ocamlPackages; [ @@ -32,9 +32,9 @@ ocamlPackages.buildDunePackage rec { llvmPackages.clang-unwrapped # lld + llc isn't included in unwrapped, so we pull it in here llvmPackages.bintools-unwrapped + makeWrapper rustc zig - makeWrapper ]; buildInputs = with ocamlPackages; [ @@ -46,14 +46,11 @@ ocamlPackages.buildDunePackage rec { dune-site hc integers - menhir menhirLib ocaml_intrinsics patricia-tree prelude processor - pyml - re2 scfg sedlex smtml diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix index b75d39b34f57..f1c97c12cdad 100644 --- a/pkgs/by-name/pa/pahole/package.nix +++ b/pkgs/by-name/pa/pahole/package.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.29"; + version = "1.30"; src = fetchzip { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz"; - hash = "sha256-ke7WIIz0ZURw3Pgmt7WNL9WPbcv5B998Rflw/8/JQ8U="; + hash = "sha256-JF4KnI05uOlPuunJuetX/fX3ZRT6TDXdjCNG9/ufkgI="; }; nativeBuildInputs = [ @@ -35,11 +35,6 @@ stdenv.mkDerivation rec { musl-obstack ]; - patches = [ - # https://github.com/acmel/dwarves/pull/51 / https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org - ./threading-reproducibility.patch - ]; - # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/by-name/pa/pahole/threading-reproducibility.patch b/pkgs/by-name/pa/pahole/threading-reproducibility.patch deleted file mode 100644 index 0cc9a6154407..000000000000 --- a/pkgs/by-name/pa/pahole/threading-reproducibility.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/pahole.c -+++ b/pahole.c -@@ -3705,6 +3705,10 @@ int main(int argc, char *argv[]) - goto out; - } - -+ /* This being set means whoever called us tries to do a reproducible build */ -+ if (getenv("SOURCE_DATE_EPOCH")) -+ conf_load.reproducible_build = true; -+ - if (show_running_kernel_vmlinux) { - const char *vmlinux = vmlinux_path__find_running_kernel(); - diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 075efaee7d4d..e3a29e4f5e05 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -70,6 +70,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit pname version src; hash = "sha256-VtYYwpMXPAC3g1OESnw3dzLTwiGqJBQcicFZskEucok="; + fetcherVersion = 1; }; nativeBuildInputs = @@ -162,7 +163,17 @@ python.pkgs.buildPythonApplication rec { concurrent-log-handler dateparser django - django-allauth + # django-allauth version 65.9.X not yet supported + # See https://github.com/paperless-ngx/paperless-ngx/issues/10336 + (django-allauth.overrideAttrs ( + new: prev: rec { + version = "65.7.0"; + src = prev.src.override { + tag = version; + hash = "sha256-1HmEJ5E4Vp/CoyzUegqQXpzKUuz3dLx2EEv7dk8fq8w="; + }; + } + )) django-auditlog django-celery-results django-compression-middleware @@ -268,7 +279,7 @@ python.pkgs.buildPythonApplication rec { # manually managed in postPatch dontUsePytestXdist = false; - pytestFlagsArray = [ + enabledTestPaths = [ "src" ]; diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix index cca97919e092..169568127b97 100644 --- a/pkgs/by-name/pa/parallel-disk-usage/package.nix +++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage rec { pname = "parallel-disk-usage"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "KSXGitHub"; repo = "parallel-disk-usage"; rev = version; - hash = "sha256-Wj19lWepCrZe36njX+NMdpwXeRRh3ml9jKbbi7irrpg="; + hash = "sha256-gzjNi7ujYe7OZKYyrYk1xqqo/k8yBJdIwRoNASm5Db4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UK+jonM/ZBGoCKFcQlCo5OqYtKeU0VIWtx83oBh3lJQ="; + cargoHash = "sha256-3U61AkCicX7VNh1bf0IHPH5YX7qAtp4PvWi8FRKoBQI="; meta = with lib; { description = "Highly parallelized, blazing fast directory tree analyzer"; diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix index eafeb89fd3b2..7a32df1ea4f0 100644 --- a/pkgs/by-name/pa/parca/package.nix +++ b/pkgs/by-name/pa/parca/package.nix @@ -25,6 +25,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src version; hash = "sha256-gczEkCU9xESn9T1eVOmGAufh+24mOsYCMO6f5tcbdmQ="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/passes/package.nix b/pkgs/by-name/pa/passes/package.nix index 5d0e37b8d651..60fda3dff640 100644 --- a/pkgs/by-name/pa/passes/package.nix +++ b/pkgs/by-name/pa/passes/package.nix @@ -13,7 +13,7 @@ pkg-config, python3, wrapGAppsHook4, - zint, + libzint, }: stdenv.mkDerivation (finalAttrs: { @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/model/meson.build \ - --replace-fail /app/lib ${lib.getLib zint}/lib + --replace-fail /app/lib ${lib.getLib libzint}/lib ''; strictDeps = true; @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 libadwaita - zint + libzint ]; meta = with lib; { diff --git a/pkgs/by-name/pc/pciutils/package.nix b/pkgs/by-name/pc/pciutils/package.nix index 8224369d0992..d91fa4c6e8ad 100644 --- a/pkgs/by-name/pc/pciutils/package.nix +++ b/pkgs/by-name/pc/pciutils/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pciutils"; - version = "3.13.0"; # with release-date database + version = "3.14.0"; # with release-date database src = fetchFromGitHub { owner = "pciutils"; repo = "pciutils"; rev = "v${version}"; - hash = "sha256-buhq7SN6eH+sckvT5mJ8eP4C1EP/4CUFt3gooJohJW0="; + hash = "sha256-8wSvu8BGzETD1RfwL6/DfSCZcmuj1I+zNH033f48qNQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix index b9c8c0f3880c..7310b25301d5 100644 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pcsx2-bin"; - version = "2.3.180"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-FsYVTqQ9Se6SoSbHGUw8eLd6Y9ywaedlBy9fu/FYr7g="; + hash = "sha256-nExKu5WwBVxUA8P3DZ7SVln5zORXcR3lM/gWjFxgAV8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh index 8748a75a3bbc..943d2693d201 100755 --- a/pkgs/by-name/pc/pcsx2-bin/update.sh +++ b/pkgs/by-name/pc/pcsx2-bin/update.sh @@ -6,7 +6,7 @@ set -euo pipefail cd "$(dirname "$0")" || exit 1 # Grab latest version, ignoring "latest" and "preview" tags -LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases" | jq -r '.[0].tag_name' | sed 's/^v//')" +LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases/latest" | jq -r '.tag_name' | sed 's/^v//')" CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)" if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then diff --git a/pkgs/by-name/pd/pds/package.nix b/pkgs/by-name/pd/pds/package.nix index 17651e7959ba..5fdc7aaea121 100644 --- a/pkgs/by-name/pd/pds/package.nix +++ b/pkgs/by-name/pd/pds/package.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot ; hash = "sha256-KyHa7pZaCgyqzivI0Y7E6Y4yBRllYdYLnk1s0o0dyHY="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index a6153c9ae14c..191f3e1907df 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -41,12 +41,12 @@ let in stdenv.mkDerivation rec { pname = "peergos"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "Peergos"; repo = "web-ui"; rev = "v${version}"; - hash = "sha256-gafFkHgTDBBon5fxjZwDGhEPyk6bp2XL4DxAWKtpWzo="; + hash = "sha256-bvuJ/Z/GVBohUX7dgpx77QdWUEW0eI8FUAGUibOmaM0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix index 107c0c2fb3df..7dc9a44a034f 100644 --- a/pkgs/by-name/pg/pgrok/package.nix +++ b/pkgs/by-name/pg/pgrok/package.nix @@ -34,6 +34,7 @@ buildGoModule { env.pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-o6wxO8EGRmhcYggJnfxDkH+nbt+isc8bfHji8Hu9YKg="; + fetcherVersion = 1; }; vendorHash = "sha256-nIxsG1O5RG+PDSWBcUWpk+4aFq2cYaxpkgOoDqLjY90="; diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix index 138cc3f2d1a2..c8e61fc2963d 100644 --- a/pkgs/by-name/pg/pgroll/package.nix +++ b/pkgs/by-name/pg/pgroll/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "pgroll"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "xataio"; repo = "pgroll"; tag = "v${version}"; - hash = "sha256-8yrChHTNcj0Hphme5PuECkkxmppk16y8+NoC2yJ/B7Y="; + hash = "sha256-5g9adfp0kJ/Qou7TnTb6Pu04u2LXPfUct8Xkkodf1S8="; }; proxyVendor = true; diff --git a/pkgs/by-name/ph/phase-cli/package.nix b/pkgs/by-name/ph/phase-cli/package.nix index 6ed7381e5e49..9e41fc909a56 100644 --- a/pkgs/by-name/ph/phase-cli/package.nix +++ b/pkgs/by-name/ph/phase-cli/package.nix @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/*.py" ]; diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index aa0ca52f32d8..9c54b6b68acd 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -10,16 +10,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "12.2.5"; + version = "12.2.7"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-xpIpcjteIC9rpDxySqcDwJu1e3oMs6qC8u0zYlInxMw="; + hash = "sha256-pSmxvDGsD2NFKwP0tA8LTBxfZEXDJFwLACdmK//6Ks8="; }; - vendorHash = "sha256-G67bYh61xTtqg2dj2laxYed/wXVIRZsG31mZETxohjM="; + vendorHash = "sha256-py1mJRNb8Wcsw9sq0sGZc7lHzi52Ui4HmTUeAvTaXwY="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix index d55a7f99273b..c963506d0d01 100644 --- a/pkgs/by-name/pi/pihole/package.nix +++ b/pkgs/by-name/pi/pihole/package.nix @@ -19,7 +19,7 @@ locale, ncurses, netcat, - nettools, + net-tools, pihole-ftl, procps, resholve, @@ -119,7 +119,7 @@ locale ncurses netcat - nettools + net-tools pihole-ftl procps sqlite diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix index 3502f59f4f37..374063af3be6 100644 --- a/pkgs/by-name/pi/piped/package.nix +++ b/pkgs/by-name/pi/piped/package.nix @@ -29,6 +29,7 @@ buildNpmPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-WtZfRZFRV9I1iBlAoV69GGFjdiQhTSBG/iiEadPVcys="; + fetcherVersion = 1; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix index 0846cd93bbdf..da0beca7c733 100644 --- a/pkgs/by-name/pi/pixman/package.nix +++ b/pkgs/by-name/pi/pixman/package.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "pixman"; - version = "0.46.0"; + version = "0.46.2"; src = fetchurl { - urls = with finalAttrs; [ - "mirror://xorg/individual/lib/${pname}-${version}.tar.gz" - "https://cairographics.org/releases/${pname}-${version}.tar.gz" + urls = [ + "mirror://xorg/individual/lib/pixman-${finalAttrs.version}.tar.gz" + "https://cairographics.org/releases/pixman-${finalAttrs.version}.tar.gz" ]; - hash = "sha256-Atn/e4RY72FzHD01X4VLv0Yf0KTTVjxR8cHHsAY4BQ0="; + hash = "sha256-Pg3lum41aRaUaj2VgZLxVQXcq4UTR3G/6rTOTim71zM="; }; # Raise test timeout, 120s can be slightly exceeded on slower hardware diff --git a/pkgs/by-name/pl/plutovg/package.nix b/pkgs/by-name/pl/plutovg/package.nix index 7e795b499e6e..b6bea9349aec 100644 --- a/pkgs/by-name/pl/plutovg/package.nix +++ b/pkgs/by-name/pl/plutovg/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plutovg"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sammycage"; repo = "plutovg"; tag = "v${finalAttrs.version}"; - hash = "sha256-989MA60nc1Tzp/4RzT0iYHz4JBJkU9zgEjEswa4vDpk="; + hash = "sha256-+LJhQb8uZ7iPNcdhL40LLk/6mR97VCgDtYgnj2R8vno="; }; cmakeFlags = [ diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 81b1010a6c7e..2a84d1d207e2 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeWrapper, copyDesktopItems, - electron_36, + electron_37, nodejs, pnpm_10, makeDesktopItem, @@ -18,11 +18,11 @@ }: let - electron = electron_36; + electron = electron_37; in stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; - version = "1.19.2"; + version = "1.20.1"; passthru.updateScript = _experimental-update-script-combinators.sequence [ (nix-update-script { }) @@ -55,12 +55,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "containers"; repo = "podman-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-Yw4HPHtMMxaI7MLamZy+MglvHHpO6h4/kHY2TBXWErg="; + hash = "sha256-diqlooa4SsFtmzl3A25PEaV0ALnghoj7htBGRgXn6As="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-6xXTzqEeWpDKhZN6z4dSHrU7qWK9AAlD2DXnr7ac0So="; + hash = "sha256-8lNmCLfuAkXK1Du4iYYasRTozZf0HoAttf8Dfc6Jglw="; + fetcherVersion = 1; }; patches = [ @@ -70,10 +71,6 @@ stdenv.mkDerivation (finalAttrs: { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - # Don't attempt to sign the darwin app bundle. - # It's impure and may fail in some restricted environments. - CSC_IDENTITY_AUTO_DISCOVERY = lib.optionals stdenv.hostPlatform.isDarwin "false"; - nativeBuildInputs = [ nodejs @@ -94,9 +91,13 @@ stdenv.mkDerivation (finalAttrs: { chmod -R u+w electron-dist pnpm build + + # Explicitly set identity to null to avoid signing on arm64 macs with newer electron-builder. + # See: https://github.com/electron-userland/electron-builder/pull/9007 ./node_modules/.bin/electron-builder \ --dir \ --config .electron-builder.config.cjs \ + -c.mac.identity=null \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index 287aa1238df4..5597149b9c86 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "podman-tui"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-U+oQUdqOhF6p52bEvMBqoxn4Z5WexsYe97XFOEMSFpk="; + hash = "sha256-WNaHpr5Ujq2xiA0LJV7KHRT3qGHojYex4LZhiFTGusk="; }; vendorHash = null; diff --git a/pkgs/by-name/po/porn-vault/package.nix b/pkgs/by-name/po/porn-vault/package.nix index 4f529aade0b6..7dd5e251116c 100644 --- a/pkgs/by-name/po/porn-vault/package.nix +++ b/pkgs/by-name/po/porn-vault/package.nix @@ -52,6 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-Xr9tRiP1hW+aFs9FnPvPkeJ0/LtJI57cjWY5bZQaRTQ="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index 10098cccb472..5a1c84fba77c 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-iYQNGRWqXYBU+WIH/Xm8qndgOQ6RKYCtAyi93kb7xrQ="; + fetcherVersion = 1; }; cargoRoot = "src-tauri"; diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index d3fe6c9f57ce..0910b550be66 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -103,7 +103,7 @@ python3Packages.buildPythonApplication rec { patchShebangs pre_commit/resources/hook-tmpl ''; - pytestFlagsArray = [ + pytestFlags = [ "--forked" ]; diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 3e270de606b9..2e9ba73dbba0 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -14,13 +14,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "presenterm"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-vBEHk0gQe4kUTtH4qtc0jVfDvYGabnkJrwPxmxt10hs="; + hash = "sha256-6ziPuWbPOsSwlnqVN1cKaOvxVk3axFnPBsnCIZz2iTg="; }; nativeBuildInputs = @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; useFetchCargoVendor = true; - cargoHash = "sha256-u0wOWKAfzi1Fxmx6x2ckrIv/PKgtqKrDiDauD4/BY24="; + cargoHash = "sha256-UOPX5+RnnAStrsvBbL211m5NzYFjqbpIG/sdvoej1Rc="; env = lib.optionalAttrs (isDarwin && isx86_64) { NIX_CFLAGS_LINK = "-fuse-ld=lld"; diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 921ca91fe103..6ddcc6fad71a 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -248,9 +248,8 @@ python.pkgs.buildPythonApplication rec { ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ - "--reruns" - "3" + pytestFlags = [ + "--reruns=3" ]; disabledTests = [ diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index d82d9a8fa5ff..3bcae8fba8be 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-dhEpn0oaqZqeiRMfcSiaqhud/RsKd6Wm5RR5iyQp1I8="; + fetcherVersion = 1; }; patchPhase = '' diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index 244e14ebf756..8c2c72aaa74f 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-tools"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "probe-rs"; repo = "probe-rs"; tag = "v${version}"; - hash = "sha256-5EppB6XVUHM7TrvpdqdvojuFbjw8RTDOudpypVdLPbQ="; + hash = "sha256-/gP9abygktYSzg/054o1PEcQywiPFTtKNdUdI3hCYyc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sdMRauSaDYMgpfAYhEBEqz0s9WHAZJLjijdvQqO6fMs="; + cargoHash = "sha256-txHl0+HDCVdmbZppGsFqPjsEbPBCJVEB3XZWZJBBoOk="; buildAndTestSubdir = pname; diff --git a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix index 8e7913871c85..032b3d222d83 100644 --- a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "prometheus-solaredge-exporter"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "paepckehh"; repo = "solaredge_exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-vo0WaiigwjSEA+wEUs8Wdko+UHq5OXXcVcfgna/QVHE="; + hash = "sha256-vk2e9OeTt1T0f8H3uLHbd2fBO2KVse0IYrSFCu68Wgk="; }; ldflags = [ @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-ltCjuihbm0/bj2SPkiITTHzYmcQsX12xvt+OpYROivU="; + vendorHash = "sha256-Utydte6V07BN5Lz3Js54DqPV+cdnH2p1J5gYliFQYlU="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 7233511b79b7..0ac7dfdb5b38 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.50.1"; + version = "0.50.4"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${version}"; - hash = "sha256-Ol0l+9pkMDmb09a6gsDxP9KIpIIeDNHp9cGBbfWHBNA="; + hash = "sha256-X448S7eGx60CgpZkV81bVuxAc6HuIRNeHJgKW4min/E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-kc/NC1WGOChdPXq1q83j5GBrcYTEpPCauIZ/q02caUU="; + cargoHash = "sha256-PUNBq4VWufCeFdhI7zThEyDMA4UHpL95uVdv4uouxBQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 4a6e1c0c0a41..bab83e3a3fb2 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-8"; + version = "GE-Proton10-9"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-cbmOQYWEP/uB2ZoMAbtbeXbOJjxZui0n2U+Tr/OLKjA="; + hash = "sha256-DJ7bRjzJehSFIyBo+oJyyWui+a3udGxc38P9Hw+xU9U="; }; dontUnpack = true; diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix index fc56159e4148..c3c68cc2a845 100644 --- a/pkgs/by-name/pr/protonplus/package.nix +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonplus"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "Vysp3r"; repo = "protonplus"; tag = "v${finalAttrs.version}"; - hash = "sha256-99RD1M6i/titM0dzyNPZGdWyNAUo7ZBj2QEw/qDl5nM="; + hash = "sha256-Ss+9p6mQQNYcY+5gAD1CtM+TpNRC/kVqV8fmfowydBk="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - mainProgram = "com.vysp3r.ProtonPlus"; + mainProgram = "protonplus"; description = "Simple Wine and Proton-based compatibility tools manager"; homepage = "https://github.com/Vysp3r/ProtonPlus"; changelog = "https://github.com/Vysp3r/ProtonPlus/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/pr/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch index 61cb744101ff..cf6328920254 100644 --- a/pkgs/by-name/pr/proxysql/makefiles.patch +++ b/pkgs/by-name/pr/proxysql/makefiles.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index dd6b8c44..7a703858 100644 +index b9ad6f71..60e71a86 100644 --- a/Makefile +++ b/Makefile -@@ -73,10 +73,7 @@ endif +@@ -81,10 +81,7 @@ endif export MAKEOPT := -j${NPROCS} ### systemd @@ -14,16 +14,7 @@ index dd6b8c44..7a703858 100644 ### check user/group USERCHECK := $(shell getent passwd proxysql) -@@ -238,7 +235,7 @@ build_tap_test_debug: build_tap_tests_debug - build_tap_tests_debug: build_src_debug - cd test/tap && OPTZ="${O0} -ggdb -DDEBUG" CC=${CC} CXX=${CXX} ${MAKE} debug - --# ClickHouse build targets are now default build targets. -+# ClickHouse build targets are now default build targets. - # To maintain backward compatibility, ClickHouse targets are still available. - .PHONY: build_deps_clickhouse - build_deps_clickhouse: build_deps_default -@@ -382,16 +379,10 @@ cleanbuild: +@@ -415,16 +412,10 @@ cleanbuild: .PHONY: install install: src/proxysql @@ -44,10 +35,10 @@ index dd6b8c44..7a703858 100644 install -m 0755 etc/init.d/proxysql /etc/init.d ifeq ($(DISTRO),"CentOS Linux") diff --git a/deps/Makefile b/deps/Makefile -index 25bcc603..8fafc224 100644 +index 7c8fcc85..4ae0aba1 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -54,10 +54,7 @@ default: $(targets) +@@ -61,27 +61,22 @@ default: $(targets) ### deps targets libinjection/libinjection/src/libinjection.a: @@ -57,21 +48,17 @@ index 25bcc603..8fafc224 100644 - cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch endif - ifeq ($(SYS_KERN),Darwin) -@@ -71,11 +68,7 @@ libinjection: libinjection/libinjection/src/libinjection.a + ifeq ($(UNAME_S),Darwin) + sed -i '' 's/CC=/CC?=/' libinjection/libinjection/src/Makefile + else + sed -i -e 's/CC=/CC?=/' libinjection/libinjection/src/Makefile + endif + cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE} + libinjection: libinjection/libinjection/src/libinjection.a - libssl/openssl/libssl.a: -- cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true -- cd libssl && tar -zxf openssl-*.tar.gz - cd libssl && ./verify-bio_st-match.sh --# cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch --# cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch - cd libssl/openssl && ./config no-ssl3 no-tests - cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE} - cd libssl/openssl && ln -fs ./ lib # curl wants this path -@@ -84,8 +77,6 @@ libssl: libssl/openssl/libssl.a - + include ../common_mk/openssl_flags.mk + include ../common_mk/openssl_version_check.mk libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a - cd libhttpserver && rm -rf libhttpserver-*/ || true @@ -79,7 +66,7 @@ index 25bcc603..8fafc224 100644 cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch cd libhttpserver/libhttpserver && patch -p1 < ../final_val_post_process.patch -@@ -103,8 +94,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a +@@ -99,58 +94,49 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a libev/libev/.libs/libev.a: @@ -88,16 +75,30 @@ index 25bcc603..8fafc224 100644 cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch cd libev/libev && ./configure cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE} -@@ -121,8 +110,6 @@ coredumper/coredumper/src/libcoredumper.a: + + ev: libev/libev/.libs/libev.a + + + coredumper/coredumper/src/libcoredumper.a: + cd coredumper && rm -rf coredumper-*/ || true + cd coredumper && tar -zxf coredumper-*.tar.gz + cd coredumper/coredumper && patch -p1 < ../includes.patch + cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug + cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE} coredumper: coredumper/coredumper/src/libcoredumper.a - curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a + curl/curl/lib/.libs/libcurl.a: - cd curl && rm -rf curl-*/ || true - cd curl && tar -zxf curl-*.tar.gz # cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} cd curl/curl && autoreconf -fi - ifeq ($(SYS_KERN),Darwin) -@@ -134,9 +121,6 @@ curl: curl/curl/lib/.libs/libcurl.a + ifeq ($(UNAME_S),Darwin) + cd curl/curl && patch configure < ../configure.patch + endif + cd curl/curl && CPPFLAGS="-I$(SSL_IDIR)" LDFLAGS="$(LIB_SSL_PATH) $(LIB_CRYPTO_PATH)" ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl --enable-shared=yes + cd curl/curl && CFLAGS=-fPIC CC=${CC} CXX=${CXX} ${MAKE} + + curl: curl/curl/lib/.libs/libcurl.a libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: @@ -107,7 +108,15 @@ index 25bcc603..8fafc224 100644 cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a -@@ -152,8 +136,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a + + + cityhash/cityhash/src/.libs/libcityhash.a: + cd cityhash && rm -rf cityhash-*/ || true + cd cityhash && tar -zxf cityhash-*.tar.gz + cd cityhash/cityhash && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub + cd cityhash/cityhash && ./configure && CC=${CC} CXX=${CXX} ${MAKE} + + cityhash: cityhash/cityhash/src/.libs/libcityhash.a lz4/lz4/lib/liblz4.a: @@ -116,7 +125,7 @@ index 25bcc603..8fafc224 100644 cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/lib/liblz4.a -@@ -171,8 +153,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s +@@ -168,8 +154,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: @@ -125,8 +134,8 @@ index 25bcc603..8fafc224 100644 cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} -@@ -256,8 +236,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o - +@@ -253,18 +237,13 @@ sqlite3/sqlite3/sqlite3.o: + sqlite3: sqlite3/sqlite3/sqlite3.o libconfig/libconfig/lib/.libs/libconfig++.a: - cd libconfig && rm -rf libconfig-*/ || true @@ -134,7 +143,7 @@ index 25bcc603..8fafc224 100644 cd libconfig/libconfig && ./configure --disable-examples cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} -@@ -265,9 +243,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a + libconfig: libconfig/libconfig/lib/.libs/libconfig++.a prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: @@ -144,7 +153,7 @@ index 25bcc603..8fafc224 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch -@@ -296,8 +271,6 @@ re2: re2/re2/obj/libre2.a +@@ -293,17 +272,13 @@ re2: re2/re2/obj/libre2.a pcre/pcre/.libs/libpcre.a: @@ -153,8 +162,17 @@ index 25bcc603..8fafc224 100644 cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch cd pcre/pcre && ./configure cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE} -@@ -334,4 +307,3 @@ cleanall: - cd cityhash && rm -rf cityhash-*/ || true - cd coredumper && rm -rf coredumper-*/ || true + + pcre: pcre/pcre/.libs/libpcre.a + + postgresql/postgresql/src/interfaces/libpq/libpq.a: +- cd postgresql && rm -rf postgresql-*/ || true +- cd postgresql && tar -zxf postgresql-*.tar.gz + cd postgresql/postgresql && patch -p0 < ../get_result_from_pgconn.patch + cd postgresql/postgresql && patch -p0 < ../handle_row_data.patch + #cd postgresql/postgresql && LD_LIBRARY_PATH="$(shell pwd)/libssl/openssl" ./configure --with-ssl=openssl --with-includes="$(shell pwd)/libssl/openssl/include/" --with-libraries="$(shell pwd)/libssl/openssl/" --without-readline --enable-debug CFLAGS="-ggdb -O0 -fno-omit-frame-pointer" CPPFLAGS="-g -O0" +@@ -360,4 +335,3 @@ cleanall: + cd libusual && rm -rf libusual-*/ || true + cd libscram && rm -rf lib/* obj/* || true .PHONY: cleanall - diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix index 50f2ff5d0c83..0d9012a2054a 100644 --- a/pkgs/by-name/pr/proxysql/package.nix +++ b/pkgs/by-name/pr/proxysql/package.nix @@ -7,6 +7,7 @@ automake, bison, cmake, + pkg-config, libtool, civetweb, coreutils, @@ -29,17 +30,20 @@ prometheus-cpp, zlib, texinfo, + postgresql_16, + icu, + libevent, }: stdenv.mkDerivation (finalAttrs: { pname = "proxysql"; - version = "2.7.1"; + version = "3.0.1"; src = fetchFromGitHub { owner = "sysown"; repo = "proxysql"; - rev = finalAttrs.version; - hash = "sha256-Ouz1SSc35gQaJcVQO95azkxNgLxuY712ELAwM5buEtY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-yGxn46Vm8YdtIvvoTlOHQ1aAP2J/h/kFqr4ehruDsTw="; }; patches = [ @@ -53,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { cmake libtool perl + pkg-config python3 texinfo # for makeinfo ]; @@ -62,8 +67,11 @@ stdenv.mkDerivation (finalAttrs: { curl flex gnutls + icu + libevent libgcrypt libuuid + openssl zlib ]; @@ -140,10 +148,6 @@ stdenv.mkDerivation (finalAttrs: { f = "libmicrohttpd"; p = libmicrohttpd; } - { - f = "libssl"; - p = openssl; - } { f = "lz4"; p = lz4; @@ -167,6 +171,10 @@ stdenv.mkDerivation (finalAttrs: { } ); } + { + f = "postgresql"; + p = postgresql_16; + } ] ) } @@ -185,8 +193,6 @@ stdenv.mkDerivation (finalAttrs: { replace_dep . "${civetweb.src}" civetweb popd - sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config - pushd libmicrohttpd/libmicrohttpd autoreconf popd diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 16e639d15260..a3b9034d80ae 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.246.0"; + version = "0.247.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-w9R11v9OheK4JJnRyhYVBqGlThZ4eJtwFWH8NdrTSyI="; + sha256 = "sha256-/ZBGeZTrtRUCqoS1cgDHglogpVOzOLroOWgJC3j9Zxg="; }; - vendorHash = "sha256-IekHvDhLTcRYrse81CQ+TJAi3VRUhgZRDfrSe7Wp4WM="; + vendorHash = "sha256-w1abfm7wSywu+KXIACfYtHZoW/uSzW/2M0vR9gXrj34="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index 5ce8b7bfca68..37ea38de462a 100644 --- a/pkgs/by-name/pu/publicsuffix-list/package.nix +++ b/pkgs/by-name/pu/publicsuffix-list/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2025-03-12"; + version = "0-unstable-2025-06-10"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "b85018227bf5620427fc719c80fd652d52fd945f"; - hash = "sha256-IV9k14VQlr92hzcApLCYA6rHdVRQL9kgRTJzyz37TRY="; + rev = "9f9c1865c17a23edce0491aa6e697cc987fcdafa"; + hash = "sha256-BX8pFGtqTTlWgsZ5IJP7hApG4ysSYHTibT3+hwugSHA="; }; dontBuild = true; diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix index 626b4e16f7d1..8789344023e5 100644 --- a/pkgs/by-name/pv/pvs-studio/package.nix +++ b/pkgs/by-name/pv/pvs-studio/package.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/py/pybibget/package.nix b/pkgs/by-name/py/pybibget/package.nix index 4aad76fdc760..b8cad1e423fb 100644 --- a/pkgs/by-name/py/pybibget/package.nix +++ b/pkgs/by-name/py/pybibget/package.nix @@ -4,19 +4,19 @@ fetchPypi, }: -let +python3.pkgs.buildPythonApplication rec { pname = "pybibget"; version = "0.1.0"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-M6CIctTOVn7kIPmsoHQmYl2wQaUzfel7ryw/3ebQitg="; }; -in -python3.pkgs.buildPythonApplication { - inherit pname version src; - pyproject = true; + build-system = [ + python3.pkgs.setuptools + ]; propagatedBuildInputs = with python3.pkgs; [ lxml diff --git a/pkgs/by-name/py/pyright/package-lock.json b/pkgs/by-name/py/pyright/package-lock.json index 56612ad5d0f0..221d0e3ff742 100644 --- a/pkgs/by-name/py/pyright/package-lock.json +++ b/pkgs/by-name/py/pyright/package-lock.json @@ -18,9 +18,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index e3faf22ee015..103afd11c679 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.400"; + version = "1.1.402"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-ZpJTBHNi6mz/QSb5Lqvww4WNnjdcK9dxTR1bKnp8kqQ="; + hash = "sha256-gB3psPkWVHUrXGQuuqMzy64Ir7hIRpMZ4dkZqusa1mo="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -27,7 +27,7 @@ let pname = "pyright-root"; inherit version src; sourceRoot = "${src.name}"; # required for update.sh script - npmDepsHash = "sha256-FqEh212Npa2Sye7qeKQJQukNc/nhNVCUp2HoypGGoOA="; + npmDepsHash = "sha256-1OrUBARwNvT8pTH66W7GAKG8B5fX8/6jtOOYVU6IgSw="; dontNpmBuild = true; postPatch = '' cp ${patchedPackageJSON} ./package.json @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-vVR3ByO/B970Zi7ac95hFq+tzLjSb/h62LYhDA8Troo="; + npmDepsHash = "sha256-3eFxGufA41RwuLrwy6Y4Q25mTbfDjm1Ddo2XOwL9lAk="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-qYNQp5UHkAAAgGbHOVtvUVqP/odxbFPV5tDCJkDGhec="; + npmDepsHash = "sha256-HxvVBnvM0ocwc1ck0YEj5q5ea4bAfRmftZauJrnhHck="; postPatch = '' chmod +w ../../ diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/by-name/qm/qmapshack/package.nix similarity index 51% rename from pkgs/applications/gis/qmapshack/default.nix rename to pkgs/by-name/qm/qmapshack/package.nix index 1c6e0b27b4ff..d8644c2aadbb 100644 --- a/pkgs/applications/gis/qmapshack/default.nix +++ b/pkgs/by-name/qm/qmapshack/package.nix @@ -3,42 +3,44 @@ stdenv, fetchFromGitHub, cmake, - wrapQtAppsHook, - qtscript, - qtwebengine, + qt6, + qt6Packages, + alglib, gdal, proj, routino, - quazip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qmapshack"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "Maproom"; repo = "qmapshack"; - rev = "V_${version}"; - hash = "sha256-wqztKmaUxY3qd7IgPM7kV7x0BsrTMTX3DbcdM+lsarI="; + tag = "V_${finalAttrs.version}"; + hash = "sha256-+M76EZeZOsBQ7RXtVplsrbrDgU0plRAht4/jz/GpIhM="; }; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - qtscript - qtwebengine + alglib gdal proj routino - quazip + qt6.qtwebengine + qt6Packages.quazip ]; cmakeFlags = [ - "-DROUTINO_XML_PATH=${routino}/share/routino" + (lib.cmakeFeature "ALGLIB_INCLUDE_DIRS" "${alglib}/include/alglib") + (lib.cmakeFeature "ALGLIB_LIBRARIES" "alglib3") + (lib.cmakeFeature "ROUTINO_XML_PATH" "${routino}/share/routino") ]; qtWrapperArgs = [ @@ -53,12 +55,12 @@ stdenv.mkDerivation rec { meta = { description = "Consumer grade GIS software"; homepage = "https://github.com/Maproom/qmapshack"; - changelog = "https://github.com/Maproom/qmapshack/blob/V_${version}/changelog.txt"; + changelog = "https://github.com/Maproom/qmapshack/blob/V_${finalAttrs.version}/changelog.txt"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dotlambda sikmir ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix index c175469262c6..6a622cb21655 100644 --- a/pkgs/by-name/qu/quantframe/package.nix +++ b/pkgs/by-name/qu/quantframe/package.nix @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE="; + fetcherVersion = 1; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/r1/r128gain/package.nix b/pkgs/by-name/r1/r128gain/package.nix index 4c0ba8d99749..f487be2b4cfd 100644 --- a/pkgs/by-name/r1/r128gain/package.nix +++ b/pkgs/by-name/r1/r128gain/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "r128gain"; version = "1.0.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "desbma"; @@ -26,12 +26,15 @@ python3Packages.buildPythonApplication rec { }) ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ]; + nativeCheckInputs = with python3Packages; [ requests sox @@ -41,6 +44,8 @@ python3Packages.buildPythonApplication rec { # sandbox to be disabled. doCheck = false; + pythonImportsCheck = [ "r128gain" ]; + passthru.updateScript = gitUpdater { }; meta = with lib; { diff --git a/pkgs/by-name/ra/raiseorlaunch/package.nix b/pkgs/by-name/ra/raiseorlaunch/package.nix index 80d5dba11cea..f1a8a9d51bab 100644 --- a/pkgs/by-name/ra/raiseorlaunch/package.nix +++ b/pkgs/by-name/ra/raiseorlaunch/package.nix @@ -7,14 +7,15 @@ python3Packages.buildPythonApplication rec { pname = "raiseorlaunch"; version = "2.3.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-L/hu0mYCAxHkp5me96a6HlEY6QsuJDESpTNhlzVRHWs="; }; - nativeBuildInputs = [ python3Packages.setuptools-scm ]; + build-system = with python3Packages; [ setuptools ]; + pythonPath = with python3Packages; [ i3ipc ]; # no tests diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index c73584db7f5f..3f8ebd58600f 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -11,7 +11,7 @@ gnutar, libsForQt5, makeDesktopItem, - nettools, + net-tools, protobuf, python312Packages, system-config-printer, @@ -156,7 +156,7 @@ python3Packages.buildPythonApplication rec { + lib.optionalString stdenv.hostPlatform.isLinux '' --prefix PATH : ${ lib.makeBinPath [ - nettools + net-tools system-config-printer ] } diff --git a/pkgs/by-name/rd/rdiff-backup/package.nix b/pkgs/by-name/rd/rdiff-backup/package.nix index 7045656a10c8..facc5b257e8e 100644 --- a/pkgs/by-name/rd/rdiff-backup/package.nix +++ b/pkgs/by-name/rd/rdiff-backup/package.nix @@ -12,22 +12,27 @@ in pypkgs.buildPythonApplication rec { pname = "rdiff-backup"; version = "2.2.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-0HeDVyZrxlE7t/daRXCymySydgNIu/YHur/DpvCUWM8"; }; - nativeBuildInputs = with pypkgs; [ setuptools-scm ]; + build-system = with pypkgs; [ + setuptools + setuptools-scm + ]; buildInputs = [ librsync ]; - propagatedBuildInputs = with pypkgs; [ pyyaml ]; + dependencies = with pypkgs; [ pyyaml ]; # no tests from pypi doCheck = false; + pythonImportsCheck = [ "rdiff_backup" ]; + meta = with lib; { description = "Backup system trying to combine best a mirror and an incremental backup system"; homepage = "https://rdiff-backup.net"; diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 38f12482d17c..3639341555ac 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -40,6 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-lez75n3dIM4efpP+qPuDteCfMnC6wPD+L2173iJbTZM="; + fetcherVersion = 1; }; pnpmRoot = "../.."; diff --git a/pkgs/by-name/re/redfishtool/package.nix b/pkgs/by-name/re/redfishtool/package.nix index 51a1c781d4a8..029617a616a9 100644 --- a/pkgs/by-name/re/redfishtool/package.nix +++ b/pkgs/by-name/re/redfishtool/package.nix @@ -10,18 +10,22 @@ let in python3.pkgs.buildPythonApplication { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-X/G6osOHCBidKZG/Y2nmHadifDacJhjBIc7WYrUCPn8="; }; + build-system = with python3.pkgs; [ setuptools ]; + propagatedBuildInputs = with python3.pkgs; [ requests python-dateutil ]; + pythonImportsCheck = [ "redfishtoollib" ]; + meta = { description = "Python34 program that implements a command line tool for accessing the Redfish API"; homepage = "https://github.com/DMTF/Redfishtool"; diff --git a/pkgs/by-name/re/redisTestHook/redis-test-hook.sh b/pkgs/by-name/re/redisTestHook/redis-test-hook.sh index f2f0dd529583..f411e53e3227 100644 --- a/pkgs/by-name/re/redisTestHook/redis-test-hook.sh +++ b/pkgs/by-name/re/redisTestHook/redis-test-hook.sh @@ -7,7 +7,7 @@ redisStart() { redisTestPort=6379 fi - mkdir "$NIX_BUILD_TOP/run" + mkdir -p "$NIX_BUILD_TOP/run" if [[ "${REDIS_SOCKET:-}" == "" ]]; then REDIS_SOCKET="$NIX_BUILD_TOP/run/redis.sock" diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 9f8c88f2b136..9e60587cda32 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "redisinsight"; - version = "2.68.0"; + version = "2.70.0"; src = fetchFromGitHub { owner = "RedisInsight"; repo = "RedisInsight"; rev = finalAttrs.version; - hash = "sha256-rXp3C/Ui3vMBscsxlwU9fRF1bmvMrvXLtmJfGzfh1Rk="; + hash = "sha256-b97/hBhXqSFDzcyrQKu5Ebu1Ud3wpWEjyzUehj0PP9w="; }; patches = [ @@ -42,21 +42,21 @@ stdenv.mkDerivation (finalAttrs: { baseOfflineCache = fetchYarnDeps { name = "redisinsight-${finalAttrs.version}-base-offline-cache"; inherit (finalAttrs) src patches; - hash = "sha256-ORVftwl/8Yrug2MeqWfZTsHNTRJlpKGn2P7JCHUf3do="; + hash = "sha256-m3relh3DZGReEi4dVOJcIXU9QVClisXw+f7K5i25x24="; }; innerOfflineCache = fetchYarnDeps { name = "redisinsight-${finalAttrs.version}-inner-offline-cache"; inherit (finalAttrs) src patches; postPatch = "cd redisinsight"; - hash = "sha256-yFfkpWV/GD2CcAzb0D3lNZwmqzEN6Bi1MjPyRwClaQ0="; + hash = "sha256-rqmrETlc2XoZDM4GP1+qI4eK4oGmtpmc6TVvAam2+W8="; }; apiOfflineCache = fetchYarnDeps { name = "redisinsight-${finalAttrs.version}-api-offline-cache"; inherit (finalAttrs) src patches; postPatch = "cd redisinsight/api"; - hash = "sha256-go7IR1UsW8TrWjaFSlC6/biUvb9cHo3PgJa16tF0XHo="; + hash = "sha256-KFtmq3iYAnsAi5ysvGCzBk9RHV7EE7SIPbzPza7vBdA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index b5c569a9f01f..de988ae8e4a9 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -4,6 +4,7 @@ nixosTests, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "redlib"; @@ -61,8 +62,9 @@ rustPlatform.buildRustPackage rec { SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; }; - passthru.tests = { - inherit (nixosTests) redlib; + passthru = { + tests = nixosTests.redlib; + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; }; meta = { diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index ce3a194c4cc7..06e7d1baf782 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "25.1.6"; + version = "25.1.7"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-Cl2coxcK2f53uJnC5CBkqJ/oAQ+jpvjo2vknKqx7FXQ="; + sha256 = "sha256-GRWLEzf0YfSk96oDCuthMNmu0C1KJCk10Uz7eApS4mk="; }; in buildGoModule rec { diff --git a/pkgs/by-name/re/regexploit/package.nix b/pkgs/by-name/re/regexploit/package.nix index 62576425b164..8e9ecc549f05 100644 --- a/pkgs/by-name/re/regexploit/package.nix +++ b/pkgs/by-name/re/regexploit/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "regexploit"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -18,7 +18,11 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0z3fghsyw0ll36in7ihc0qi3gy7mqi6cw1mi8m8c8xb1nlwpfr0y"; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ pyyaml ]; diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix index 519029d052ba..231036543d19 100644 --- a/pkgs/by-name/re/rehex/package.nix +++ b/pkgs/by-name/re/rehex/package.nix @@ -15,29 +15,25 @@ lua53Packages, perlPackages, gtk3, + nix-update-script, + wrapGAppsHook3, }: stdenv.mkDerivation rec { pname = "rehex"; - version = "0.63.0"; + version = "0.63.2"; src = fetchFromGitHub { owner = "solemnwarning"; repo = "rehex"; tag = version; - hash = "sha256-wFVAytrcRu3Ezy/VcbmXwl+X96QMa5KimjUoP07hmFg="; + hash = "sha256-de92lBnn0tp7Awm6PLJw12GfYohXY9m59XPmw7npvOg="; }; - patches = [ - (fetchpatch { - url = "https://github.com/solemnwarning/rehex/commit/0cfe145e034019952383ad28a431f552a5567f89.patch"; - hash = "sha256-PmqvjAXjqZM1BuqHHyQC5qXubTDYlE3VR1DiCCx3aeU="; - }) - ]; - nativeBuildInputs = [ pkg-config which + wrapGAppsHook3 zip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; @@ -71,6 +67,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Reverse Engineers' Hex Editor"; longDescription = '' diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 14bbd4886fd1..daff959eeca6 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-XOlFJFFyzbx8Bg92HXhVFFCI51j2GUK7+LJKfqVOQyU="; + fetcherVersion = 1; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/pkgs/by-name/re/replacement/package.nix b/pkgs/by-name/re/replacement/package.nix index 104ad16a2f2f..60443b2d2400 100644 --- a/pkgs/by-name/re/replacement/package.nix +++ b/pkgs/by-name/re/replacement/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "replacement"; version = "0.4.4"; - format = "setuptools"; + pyproject = true; disabled = python3Packages.isPy27; @@ -18,7 +18,11 @@ python3Packages.buildPythonApplication rec { sha256 = "0j4lvn3rx1kqvxcsd8nhc2lgk48jyyl7qffhlkvakhy60f9lymj3"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ ruamel-yaml ]; diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index 3558f0464421..f4aba15634f4 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-7N3xxSkVBYg7JOLab+YYbykQ4Zvlcmmlr/5wn1RtlXo="; + hash = "sha256-kqbVQCXLxcDYtKJt34gzhvgXdpF786uk5N2j2W4pcRg="; }; - npmDepsHash = "sha256-msF68DUgD8Nt//fGf7bBHCovUYZv5DJ/eqMFm77CrTA="; + npmDepsHash = "sha256-Ewyfhx1VwbUVM045KcDvgTzTCEVEssMVQrNbbnwnz+8="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 708a2ee0375a..796761afc7ae 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -25,17 +25,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; tag = "v${finalAttrs.version}"; - hash = "sha256-4hNutU9WpzxOjQe+0t5teSjMhuoprR0INQo6H/wOygc="; + hash = "sha256-0p3pH2lQnb3oOsGtKP8olVUefobGa3DsnB2LMx06+no="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/ng8ONIszRgmfgRBKn65kcJFaTp1T0lNdZQb3t9Gol0="; + cargoHash = "sha256-9EeS599rZLLKkdBS1bTX7y7CTmeTBlgHZ8c0WBlbZmk="; env = { PROTOC = lib.getExe protobuf; @@ -52,6 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "-C force-unwind-tables" "--cfg uuid_unstable" "--cfg tokio_unstable" + "--cfg tokio_taskdump" ]; "aarch64-unknown-linux-gnu" = self.build ++ [ @@ -132,7 +133,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - description = "Platform for developing distributed fault-tolerant applications."; + description = "Platform for developing distributed fault-tolerant applications"; homepage = "https://restate.dev"; changelog = "https://github.com/restatedev/restate/releases/tag/v${finalAttrs.version}"; mainProgram = "restate"; diff --git a/pkgs/by-name/re/revive/package.nix b/pkgs/by-name/re/revive/package.nix index 37ecaa4f11bb..dc80ce610e23 100644 --- a/pkgs/by-name/re/revive/package.nix +++ b/pkgs/by-name/re/revive/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "revive"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "mgechev"; repo = "revive"; rev = "v${version}"; - hash = "sha256-pQ6Gc9gCpU4GTy+4ipWH/kccadTCveM9KD74sOHpwmQ="; + hash = "sha256-89BlSc2tgxAJUGZM951fF+0H+SOsl0+xz/G18neRZxI="; # 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; @@ -24,7 +24,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-LrZMpq8ck9G5aXzXW3HZWiQ3KN7ze9WO/pmMGDLUXRw="; + vendorHash = "sha256-ZxTBGcGSRWlYFBz0+5wR/9d8p7lvjJjyId5VNIVW9rQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/rf/rfc-bibtex/package.nix b/pkgs/by-name/rf/rfc-bibtex/package.nix index e594574388bc..3ca11ac923cf 100644 --- a/pkgs/by-name/rf/rfc-bibtex/package.nix +++ b/pkgs/by-name/rf/rfc-bibtex/package.nix @@ -4,11 +4,10 @@ python3, }: -with python3.pkgs; -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "rfc-bibtex"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "iluxonchik"; @@ -17,7 +16,9 @@ buildPythonApplication rec { hash = "sha256-bPCNQqiG50vWVFA6J2kyxftwsXunHTNBdSkoIRYkb0s="; }; - nativeCheckInputs = [ + build-system = with python3.pkgs; [ setuptools ]; + + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook vcrpy ]; diff --git a/pkgs/by-name/ri/rime-moegirl/package.nix b/pkgs/by-name/ri/rime-moegirl/package.nix index 8a7073c89d43..0de2dead0202 100644 --- a/pkgs/by-name/ri/rime-moegirl/package.nix +++ b/pkgs/by-name/ri/rime-moegirl/package.nix @@ -5,10 +5,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-moegirl"; - version = "20250610"; + version = "20250711"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml"; - hash = "sha256-ctAxF/H4gnmAvHyLsC4oUNCdGFbi5X7+Db/Lwmknlsw="; + hash = "sha256-gs/JhdSeLFkBKvBdVRxk3RhqlkOhly18w4Pz63GG814="; }; dontUnpack = true; diff --git a/pkgs/by-name/ri/ripe-atlas-tools/package.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix index 196b7983e2aa..180750393089 100644 --- a/pkgs/by-name/ri/ripe-atlas-tools/package.nix +++ b/pkgs/by-name/ri/ripe-atlas-tools/package.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "ripe-atlas-tools"; version = "3.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "RIPE-NCC"; @@ -24,13 +24,17 @@ python3.pkgs.buildPythonApplication rec { echo "include ripe/atlas/tools/user-agent" >> MANIFEST.in ''; - nativeBuildInputs = with python3.pkgs; [ - sphinx-rtd-theme - sphinxHook + nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + sphinx-rtd-theme + sphinxHook + ]; + + dependencies = with python3.pkgs; [ ipy pyopenssl python-dateutil diff --git a/pkgs/by-name/ri/rivalcfg/package.nix b/pkgs/by-name/ri/rivalcfg/package.nix index 669883f0a83b..7618d7e3a65e 100644 --- a/pkgs/by-name/ri/rivalcfg/package.nix +++ b/pkgs/by-name/ri/rivalcfg/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec { pname = "rivalcfg"; version = "4.15.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "flozz"; @@ -16,29 +16,33 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-UqVogJLv+sNhAxdMjBEvhBQw6LU+QUq1IekvWpeeMqk="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ hidapi - setuptools + setuptools # pkg_resources is imported during runtime ]; - checkInputs = [ python3Packages.pytest ]; - checkPhase = "pytest"; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; # tests are broken doCheck = false; postInstall = '' - set -x mkdir -p $out/lib/udev/rules.d tmpl_udev="$out/lib/udev/rules.d/99-rivalcfg.rules" tmpudev="''${tmpl_udev}.in" finaludev="$tmpl_udev" "$out/bin/rivalcfg" --print-udev > "$tmpudev" substitute "$tmpudev" "$out/lib/udev/rules.d/99-rivalcfg.rules" \ - --replace MODE=\"0666\" "MODE=\"0664\", GROUP=\"input\"" + --replace-fail MODE=\"0666\" "MODE=\"0664\", GROUP=\"input\"" rm "$tmpudev" ''; + pythonImportsCheck = [ "rivalcfg" ]; + meta = with lib; { description = "Utility program that allows you to configure SteelSeries Rival gaming mice"; homepage = "https://github.com/flozz/rivalcfg"; diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix index b410d3bd6670..092e902763d2 100644 --- a/pkgs/by-name/rm/rmapi/package.nix +++ b/pkgs/by-name/rm/rmapi/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.30"; + version = "0.0.31"; src = fetchFromGitHub { owner = "ddvk"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-TD8edRMZEn05HHvSwwPpeA6AzXMNkNz6mrQl4zF8Kfk="; + sha256 = "sha256-8OzDXOyyz0VTeJg0P6jOBTA9OZbCLSK8SASSEHsrBxc="; }; vendorHash = "sha256-Qisfw+lCFZns13jRe9NskCaCKVj5bV1CV8WPpGBhKFc="; diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix index 30a1709b67a5..da58d05dbad6 100644 --- a/pkgs/by-name/rm/rmfakecloud/package.nix +++ b/pkgs/by-name/rm/rmfakecloud/package.nix @@ -29,6 +29,7 @@ buildGoModule rec { sourceRoot = "${src.name}/ui"; pnpmLock = "${src}/ui/pnpm-lock.yaml"; hash = "sha256-VNmCT4um2W2ii8jAm+KjQSjixYEKoZkw7CeRwErff/o="; + fetcherVersion = 1; }; preBuild = lib.optionals enableWebui '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 4da10f4c476f..fc6f025c68cd 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-06-21"; + version = "0-unstable-2025-07-12"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "1aee62f52cb02cbdb054c233a350f4f07d828e48"; - hash = "sha256-5gK2JTct89HrjJHAVAPxEUyKf6ukHExFgNb3Os4kv9M="; + rev = "8fc70859aaef7cc20181ac6d115a6ff8ca5a9162"; + hash = "sha256-MbbjiLa24PxaD7ZizR2CbTPy6yDFZTAV3QurFyYb3r8="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/rofi-mpd/package.nix b/pkgs/by-name/ro/rofi-mpd/package.nix index 806b6a2169d4..7fa82ef3b53a 100644 --- a/pkgs/by-name/ro/rofi-mpd/package.nix +++ b/pkgs/by-name/ro/rofi-mpd/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "rofi-mpd"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "JakeStanger"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec { sha256 = "0jabyn6gqh8ychn2a06xws3avz0lqdnx3qvqkavfd2xr6sp2q7lg"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ mutagen mpd2 toml diff --git a/pkgs/by-name/ro/routersploit/package.nix b/pkgs/by-name/ro/routersploit/package.nix index 1bb8da28873a..02a5c29df245 100644 --- a/pkgs/by-name/ro/routersploit/package.nix +++ b/pkgs/by-name/ro/routersploit/package.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "routersploit" ]; - pytestFlagsArray = [ + enabledTestPaths = [ # Run the same tests as upstream does in the first round "tests/core/" "tests/test_exploit_scenarios.py" diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index 0c4f9ac5edf2..a1fcb7c53e1d 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -65,6 +65,7 @@ rustPlatform.buildRustPackage rec { ; postPatch = "cd ${pnpmRoot}"; hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs="; + fetcherVersion = 1; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/rs/rshim-user-space/package.nix b/pkgs/by-name/rs/rshim-user-space/package.nix index 347958bd6d04..e7ae7f02e0c8 100644 --- a/pkgs/by-name/rs/rshim-user-space/package.nix +++ b/pkgs/by-name/rs/rshim-user-space/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.2.4"; + version = "2.4.2"; src = fetchFromGitHub { owner = "Mellanox"; repo = "rshim-user-space"; rev = "rshim-${version}"; - hash = "sha256-z0Uk520vsBERbeVtxBqXPXSWhO0sLD5GCQy1dQsJdEg="; + hash = "sha256-J/gCACqpUY+KraVOLWpd+UVyZ1f2o77EfpAgUVtZL9w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 159dee479fd0..d9121ef6d829 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-7qh6YZbIH/kHVssDZxHY7X8bytrnMcUq0MiJzWZYItc="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index b30f319eeea8..a8ac06b59150 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -38,23 +38,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "rtabmap"; - version = "0.21.13"; + version = "0.22.1"; src = fetchFromGitHub { owner = "introlab"; repo = "rtabmap"; - tag = "${finalAttrs.version}-noetic"; - hash = "sha256-W4yjHKb2BprPYkL8rLwLQcZDGgmMZ8279ntR+Eqj7R0="; + tag = finalAttrs.version; + hash = "sha256-6kDjIfUgyaqrsVAWO6k0h1qIDN/idMOJJxLpqMQ6DFY="; }; - patches = [ - (fetchpatch { - # Fix the ctor and dtor warning - url = "https://github.com/introlab/rtabmap/pull/1496/commits/84c59a452b40a26edf1ba7ec8798700a2f9c3959.patch"; - hash = "sha256-kto02qcL2dW8Frt81GA+OCldPgCF5bAs/28w9amcf0o="; - }) - ]; - nativeBuildInputs = [ cmake libsForQt5.wrapQtAppsHook diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index daeb84fc8290..52d0be28d90f 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-06-30"; + version = "2025-07-07"; useFetchCargoVendor = true; - cargoHash = "sha256-H2ogx4D6vxx1iQBJzHcdI9lT5acOgVOw3PN8fyfXkd0="; + cargoHash = "sha256-6letdN1dn5pvUkArddMFxGHsAtprpCGJ98zTr7sAdfY="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-v7XmmLBNRMzRXiVCeH60ZeGEqo+aagmwawI0Z9+EoXY="; + hash = "sha256-YjyurHKMrUYKjnujSqjpFtHGYFCGr2Xpo1Xc1AYT1+M="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/ru/rutabaga_gfx/darwin-install.patch b/pkgs/by-name/ru/rutabaga_gfx/darwin-install.patch deleted file mode 100644 index 0b68ec2beb85..000000000000 --- a/pkgs/by-name/ru/rutabaga_gfx/darwin-install.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/rutabaga_gfx/ffi/Makefile b/rutabaga_gfx/ffi/Makefile -index f8c7820bf..e88a6c308 100644 ---- a/rutabaga_gfx/ffi/Makefile -+++ b/rutabaga_gfx/ffi/Makefile -@@ -47,24 +47,16 @@ build: - cargo build $(gfxstream_feature) $(release) - - install: build --ifeq ($(UNAME), Linux) - install -D -m 755 $(OUT)/$(LIB_NAME) $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) --endif - ifeq ($(UNAME), Darwin) -- install_name_tool -id $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME) -+ install_name_tool -id $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) - endif - - ln -sf $(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION_MAJOR) - ln -sf $(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME) - --ifeq ($(UNAME), Linux) - install -D -m 0644 $(SRC)/share/rutabaga_gfx_ffi.pc $(DESTDIR)$(libdir)/pkgconfig/rutabaga_gfx_ffi.pc - install -D -m 0644 $(SRC)/include/rutabaga_gfx_ffi.h $(DESTDIR)$(includedir)/rutabaga_gfx_ffi.h --endif --ifeq ($(UNAME), Darwin) -- install -m 0644 $(SRC)/share/rutabaga_gfx_ffi.pc $(DESTDIR)$(libdir)/pkgconfig/rutabaga_gfx_ffi.pc -- install -m 0644 $(SRC)/include/rutabaga_gfx_ffi.h $(DESTDIR)$(includedir)/rutabaga_gfx_ffi.h --endif - - clean: - cargo clean $(release) - diff --git a/pkgs/by-name/ru/rutabaga_gfx/link-cxx.patch b/pkgs/by-name/ru/rutabaga_gfx/link-cxx.patch deleted file mode 100644 index b4672ee10a29..000000000000 --- a/pkgs/by-name/ru/rutabaga_gfx/link-cxx.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/rutabaga_gfx/build.rs b/rutabaga_gfx/build.rs -index bd5a9be96..d2244c4c6 100644 ---- a/rutabaga_gfx/build.rs -+++ b/rutabaga_gfx/build.rs -@@ -194,9 +194,14 @@ fn gfxstream() -> Result<()> { - pkg_config::Config::new().probe("libdrm")?; - } - -+ let mut use_clang = target_os.contains("macos"); -+ if std::env::var("USE_CLANG").is_ok() { -+ use_clang = true; -+ } -+ - // Need to link against libc++ or libstdc++. Apple is clang-only, while by default other - // Unix platforms use libstdc++. -- if target_os.contains("macos") { -+ if use_clang { - println!("cargo:rustc-link-lib=dylib=c++"); - } else if target_os.contains("linux") || target_os.contains("nto") { - println!("cargo:rustc-link-lib=dylib=stdc++"); diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index 431b60f173f9..90c48333c658 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -2,61 +2,41 @@ lib, stdenv, fetchgit, - fetchpatch, cargo, + meson, + ninja, pkg-config, + rustc, rustPlatform, aemu, gfxstream, libdrm, libiconv, + withGfxstream ? lib.meta.availableOn stdenv.hostPlatform gfxstream, }: stdenv.mkDerivation (finalAttrs: { pname = "rutabaga_gfx"; - version = "0.1.2"; + version = "0.1.6"; src = fetchgit { url = "https://chromium.googlesource.com/crosvm/crosvm"; rev = "v${finalAttrs.version}-rutabaga-release"; fetchSubmodules = true; - hash = "sha256-0RJDKzeU7U6hc6CLKks8QcRs3fxN+/LYUbB0t6W790M="; - }; - - patches = [ - # Make gfxstream optional - # https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4860836 - (fetchpatch { - url = "https://chromium.googlesource.com/crosvm/crosvm/+/c3ad0e43eb12cbf737a6049e0134d483e337363f%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-Ji1bK7jnRlg0OpDfCLcTHfPSiz3zYcdgsWL4n3EoIYI="; - }) - # Fix error in Makefile where it uses eight spaces instead of a tab - # https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4863380 - (fetchpatch { - url = "https://chromium.googlesource.com/crosvm/crosvm/+/fc415bccc43d36f63a2fd4c28878591bb1053450%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-SLzlZ4o1+R2bGTPvA0a5emq97hOIIIHrubFhcQjqYwg="; - }) - # Install the dylib on Darwin. - ./darwin-install.patch - # Patch for libc++, drop in next update - # https://chromium.googlesource.com/crosvm/crosvm/+/8ae3c23b2e3899de33b973fc636909f1eb3dc98c - ./link-cxx.patch - ]; - - env = lib.optionalAttrs stdenv.hostPlatform.useLLVM { - USE_CLANG = true; + hash = "sha256-/zeWWL4Mdb/kIJ0J3nky5dastsZUOXm9YTXUjKCDJcY="; }; nativeBuildInputs = [ cargo + meson + ninja pkg-config + rustc rustPlatform.cargoSetupHook ]; buildInputs = [ libiconv ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gfxstream) ( + ++ lib.optionals withGfxstream ( [ aemu gfxstream @@ -68,25 +48,24 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-53xCzKuXtnnbS0TWdQrh4Rwy+V+D9soK41ycYd656Uc="; + hash = "sha256-23F0WU//4xvP9xffxr+cQa0m0sSJjcWyz+usKBpDg20="; }; + mesonFlags = [ + (lib.mesonBool "gfxstream" withGfxstream) + ]; + CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc"; - postConfigure = '' + preConfigure = '' cd rutabaga_gfx/ffi - substituteInPlace Makefile --replace-fail pkg-config "$PKG_CONFIG" + chmod +x build.sh + patchShebangs build.sh + substituteInPlace build.sh \ + --replace-fail '"$BUILDTYPE"/"$SHARED_LIB"' '${stdenv.hostPlatform.rust.cargoShortTarget}/"$BUILDTYPE"/"$SHARED_LIB"' ''; - # make install always rebuilds - dontBuild = true; - - makeFlags = [ - "prefix=$(out)" - "OUT=target/${stdenv.hostPlatform.rust.cargoShortTarget}/release" - ]; - meta = with lib; { homepage = "https://crosvm.dev/book/appendix/rutabaga_gfx.html"; description = "cross-platform abstraction for GPU and display virtualization"; diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index 5be03f547157..4612aacba818 100644 --- a/pkgs/by-name/s2/s2n-tls/package.nix +++ b/pkgs/by-name/s2/s2n-tls/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.5.20"; + version = "1.5.21"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; rev = "v${version}"; - hash = "sha256-qmwo8GZpOtAs3OgdR9DWnOGz8sQcGqZKZn4WwfGpy6M="; + hash = "sha256-Rgm6Y75V6lN00lklTL1cXtzfw5ROYXQQLcmLbawl40o="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/s3/s3bro/package.nix b/pkgs/by-name/s3/s3bro/package.nix index fb5b8e8237e6..f8d5caff902e 100644 --- a/pkgs/by-name/s3/s3bro/package.nix +++ b/pkgs/by-name/s3/s3bro/package.nix @@ -7,14 +7,16 @@ python3.pkgs.buildPythonApplication rec { pname = "s3bro"; version = "2.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-+OqcLbXilbY4h/zRAkvRd8taVIOPyiScOAcDyPZ4RUw="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ boto3 botocore click @@ -23,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "use_2to3=True," "" + --replace-fail "use_2to3=True," "" ''; # No tests diff --git a/pkgs/by-name/s3/s3ql/package.nix b/pkgs/by-name/s3/s3ql/package.nix index 048b61fecb25..cba39b690980 100644 --- a/pkgs/by-name/s3/s3ql/package.nix +++ b/pkgs/by-name/s3/s3ql/package.nix @@ -75,7 +75,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "s3ql" ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; # SSL EOF error doesn't match connection reset error. Seems fine. disabledTests = [ "test_aborted_write2" ]; diff --git a/pkgs/by-name/s4/s4cmd/package.nix b/pkgs/by-name/s4/s4cmd/package.nix index 2c2cf486757f..ef5ff67afc13 100644 --- a/pkgs/by-name/s4/s4cmd/package.nix +++ b/pkgs/by-name/s4/s4cmd/package.nix @@ -7,14 +7,16 @@ python3Packages.buildPythonApplication rec { pname = "s4cmd"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0d4mx98i3qhvlmr9x898mjvf827smzx6x5ji6daiwgjdlxc60mj2"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ boto3 pytz ]; @@ -34,6 +36,8 @@ python3Packages.buildPythonApplication rec { # Test suite requires an S3 bucket doCheck = false; + pythonImportsCheck = [ "s4cmd" ]; + meta = with lib; { homepage = "https://github.com/bloomreach/s4cmd"; description = "Super S3 command line tool"; diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 16705b2a20c4..b3d9fe15a05e 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -72,14 +72,14 @@ let ]; in stdenv.mkDerivation rec { - version = "4.5.1"; + version = "4.5.2"; pname = "sabnzbd"; src = fetchFromGitHub { owner = "sabnzbd"; repo = "sabnzbd"; rev = version; - hash = "sha256-vundARltVyTX0rEdwQJnY8p1n9zBhFskJkyttWgEaZI="; + hash = "sha256-8Q/6H9DfiVkonsIvlv7Y4yDHrvpE9dB/5KxUff14qkA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sa/safeeyes/package.nix b/pkgs/by-name/sa/safeeyes/package.nix index 5e87488b9fb2..dcce05e55338 100644 --- a/pkgs/by-name/sa/safeeyes/package.nix +++ b/pkgs/by-name/sa/safeeyes/package.nix @@ -14,12 +14,10 @@ wrapGAppsHook3, }: -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "safeeyes"; version = "2.2.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -27,7 +25,7 @@ buildPythonApplication rec { }; postPatch = '' - substituteInPlace setup.py --replace "root_dir = sys.prefix" "root_dir = '/'" + substituteInPlace setup.py --replace-fail "root_dir = sys.prefix" "root_dir = '/'" ''; nativeBuildInputs = [ @@ -40,14 +38,15 @@ buildPythonApplication rec { libnotify ]; - propagatedBuildInputs = [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ babel psutil xlib pygobject3 dbus-python croniter - setuptools packaging ]; @@ -74,6 +73,8 @@ buildPythonApplication rec { doCheck = false; # no tests + pythonImportsCheck = [ "safeeyes" ]; + passthru.tests.version = testers.testVersion { package = safeeyes; }; meta = with lib; { diff --git a/pkgs/by-name/sa/sage/package.nix b/pkgs/by-name/sa/sage/package.nix index 50ba8c2b6d01..0244119055cd 100644 --- a/pkgs/by-name/sa/sage/package.nix +++ b/pkgs/by-name/sa/sage/package.nix @@ -12,9 +12,8 @@ let inherit (pkgs) symlinkJoin callPackage nodePackages; - # TODO: unpin python when #416039 reaches master - python3 = pkgs.python312 // { - pkgs = pkgs.python312.pkgs.overrideScope ( + python3 = pkgs.python3 // { + pkgs = pkgs.python3.pkgs.overrideScope ( self: super: { # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index 5cab886dbc58..26979068fc3a 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, fetchpatch, + fetchpatch2, fetchurl, }: @@ -75,6 +76,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/pull/39737/commits/4e485497fb5e20a056ffd2178360b88f482447d8.patch"; hash = "sha256-oIcFeol0SW5dE/iE6mbYyas3kXIjOwsG1k+h99R94x8="; }) + + # https://github.com/sagemath/sage/pull/40285, landed in 10.7.beta7 + (fetchpatch2 { + name = "scipy-1.16-update.patch"; + url = "https://github.com/sagemath/sage/commit/d0cbe9d353722580f98a327694f1a361c9b83ccd.patch?full_index=1"; + hash = "sha256-uV2nttxCKDsNqMf1O+lUmuoiDrx7/CfiS00JBb9kiM8="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix b/pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix new file mode 100644 index 000000000000..6e6bd00ebf2f --- /dev/null +++ b/pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix @@ -0,0 +1,18 @@ +{ + lib, + makeSetupHook, + removeReferencesTo, +}: + +makeSetupHook { + name = "sanitise-header-paths-hook"; + + substitutions = { + removeReferencesTo = lib.getExe removeReferencesTo; + }; + + meta = { + description = "Setup hook to sanitise header file paths to avoid leaked references through `__FILE__`"; + maintainers = [ lib.maintainers.emily ]; + }; +} ./sanitise-header-paths-hook.bash diff --git a/pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash b/pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash new file mode 100644 index 000000000000..60e311e12a84 --- /dev/null +++ b/pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash @@ -0,0 +1,10 @@ +sanitiseHeaderPaths() { + local header + while IFS= read -r -d '' header; do + nixLog "sanitising header path in $header" + sed -i "1i#line 1 \"$header\"" "$header" + @removeReferencesTo@ -t "${!outputInclude}" "$header" + done < <(find "${!outputInclude}/include" -type f -print0) +} + +preFixupHooks+=(sanitiseHeaderPaths) diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix index db3b6e1414a5..bdb1fa77f346 100644 --- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix +++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix @@ -56,6 +56,7 @@ buildGoModule rec { inherit pname version src; sourceRoot = "${src.name}/frontend"; hash = "sha256-OP+3zsNlvqLFwvm2cnBd2bj2Kc3EghQZE3hpotoqqrQ="; + fetcherVersion = 1; }; pnpmRoot = "frontend"; diff --git a/pkgs/by-name/sa/savepagenow/package.nix b/pkgs/by-name/sa/savepagenow/package.nix index 5875b96cce19..4be414d2f8c2 100644 --- a/pkgs/by-name/sa/savepagenow/package.nix +++ b/pkgs/by-name/sa/savepagenow/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "savepagenow"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pastpages"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec { sha256 = "1lz6rc47cds9rb35jdf8n13gr61wdkh5jqzx4skikm1yrqkwjyhm"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ click requests ]; @@ -24,6 +26,8 @@ python3Packages.buildPythonApplication rec { # requires network access doCheck = false; + pythonImportsCheck = [ "savepagenow" ]; + meta = with lib; { description = "Simple Python wrapper for archive.org's \"Save Page Now\" capturing service"; homepage = "https://github.com/pastpages/savepagenow"; diff --git a/pkgs/by-name/sb/sbc/package.nix b/pkgs/by-name/sb/sbc/package.nix index cb86445c7b0c..41d6eefdab66 100644 --- a/pkgs/by-name/sb/sbc/package.nix +++ b/pkgs/by-name/sb/sbc/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbc"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "https://www.kernel.org/pub/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-jxI2jh279V4UU2UgRzz7M4yEs5KTnMm2Qpg2D9SgeZI="; + sha256 = "sha256-QmYzyr18eYI2RDUW36gzW0fgBLDvN/8Qfgx+rTKZ/MI="; }; outputs = [ diff --git a/pkgs/by-name/sc/sca2d/package.nix b/pkgs/by-name/sc/sca2d/package.nix index 4cca153e6f95..f18a765769c2 100644 --- a/pkgs/by-name/sc/sca2d/package.nix +++ b/pkgs/by-name/sc/sca2d/package.nix @@ -28,7 +28,7 @@ in python.pkgs.buildPythonApplication rec { pname = "sca2d"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "bath_open_instrumentation_group"; @@ -37,7 +37,9 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-p0Bv8jcnjcOLBAXN5A4GspSIEG4G4NPA4o0aEtwe/LU="; }; - propagatedBuildInputs = with python.pkgs; [ + build-system = with python.pkgs; [ setuptools ]; + + dependencies = with python.pkgs; [ lark010 colorama ]; diff --git a/pkgs/by-name/sc/screenkey/package.nix b/pkgs/by-name/sc/screenkey/package.nix index c5b02d2d8cc0..7a6a15c732b5 100644 --- a/pkgs/by-name/sc/screenkey/package.nix +++ b/pkgs/by-name/sc/screenkey/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { pname = "screenkey"; version = "1.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "screenkey"; @@ -33,7 +33,9 @@ python3.pkgs.buildPythonApplication rec { libappindicator-gtk3 ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ babel pycairo pygobject3 @@ -53,11 +55,13 @@ python3.pkgs.buildPythonApplication rec { # screenkey does not have any tests doCheck = false; + pythonImportsCheck = [ "Screenkey" ]; + # Fix CDLL python calls for non absolute paths of xorg libraries postPatch = '' substituteInPlace Screenkey/xlib.py \ - --replace libX11.so.6 ${lib.getLib xorg.libX11}/lib/libX11.so.6 \ - --replace libXtst.so.6 ${lib.getLib xorg.libXtst}/lib/libXtst.so.6 + --replace-fail libX11.so.6 ${lib.getLib xorg.libX11}/lib/libX11.so.6 \ + --replace-fail libXtst.so.6 ${lib.getLib xorg.libXtst}/lib/libXtst.so.6 ''; meta = with lib; { diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 236e0c69af41..a1dc97d94c68 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -50,7 +50,6 @@ config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libudevSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, sndioSupport ? false, - testSupport ? true, traySupport ? true, waylandSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, x11Support ? !stdenv.hostPlatform.isAndroid && !stdenv.hostPlatform.isWindows, @@ -65,15 +64,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; version = "3.2.16"; - outputs = - [ - "lib" - "dev" - "out" - ] - ++ lib.optionals testSupport [ - "installedTests" - ]; + outputs = [ + "lib" + "dev" + "out" + "installedTests" + ]; src = fetchFromGitHub { owner = "libsdl-org"; @@ -85,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = # Tests timeout on Darwin # `testtray` loads assets from a relative path, which we are patching to be absolute - lib.optionalString testSupport '' + lib.optionalString (finalAttrs.finalPackage.doCheck) '' substituteInPlace test/CMakeLists.txt \ --replace-fail 'set(noninteractive_timeout 10)' 'set(noninteractive_timeout 30)' @@ -175,17 +171,17 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDL_PIPEWIRE" pipewireSupport) (lib.cmakeBool "SDL_PULSEAUDIO" pulseaudioSupport) (lib.cmakeBool "SDL_SNDIO" sndioSupport) - (lib.cmakeBool "SDL_TEST_LIBRARY" testSupport) + (lib.cmakeBool "SDL_TEST_LIBRARY" true) (lib.cmakeBool "SDL_TRAY_DUMMY" (!traySupport)) (lib.cmakeBool "SDL_WAYLAND" waylandSupport) (lib.cmakeBool "SDL_WAYLAND_LIBDECOR" libdecorSupport) (lib.cmakeBool "SDL_X11" x11Support) - (lib.cmakeBool "SDL_TESTS" finalAttrs.finalPackage.doCheck) - (lib.cmakeBool "SDL_INSTALL_TESTS" testSupport) + (lib.cmakeBool "SDL_TESTS" true) + (lib.cmakeBool "SDL_INSTALL_TESTS" true) ]; - doCheck = testSupport && stdenv.buildPlatform.canExecute stdenv.hostPlatform; + doCheck = true; # See comment below. We actually *do* need these RPATH entries dontPatchELF = true; @@ -198,10 +194,9 @@ stdenv.mkDerivation (finalAttrs: { ) "-rpath ${lib.makeLibraryPath (finalAttrs.dlopenBuildInputs)}"; }; - postInstall = lib.optionalString testSupport '' + postInstall = '' moveToOutput "share/installed-tests" "$installedTests" moveToOutput "libexec/installed-tests" "$installedTests" - install -Dm 444 -t $installedTests/share/assets test/*.bmp ''; passthru = { diff --git a/pkgs/by-name/se/seashells/package.nix b/pkgs/by-name/se/seashells/package.nix index c190a458fbce..d4c6e663166a 100644 --- a/pkgs/by-name/se/seashells/package.nix +++ b/pkgs/by-name/se/seashells/package.nix @@ -7,13 +7,15 @@ python3Packages.buildPythonApplication rec { pname = "seashells"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; }; + build-system = with python3Packages; [ setuptools ]; + doCheck = false; # there are no tests pythonImportsCheck = [ "seashells" ]; diff --git a/pkgs/by-name/se/semiphemeral/package.nix b/pkgs/by-name/se/semiphemeral/package.nix index 2cc721a2228b..90f419d35432 100644 --- a/pkgs/by-name/se/semiphemeral/package.nix +++ b/pkgs/by-name/se/semiphemeral/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "semiphemeral"; version = "0.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "semiphemeral" ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ click sqlalchemy flask diff --git a/pkgs/by-name/se/serious-sam-classic-vulkan/package.nix b/pkgs/by-name/se/serious-sam-classic-vulkan/package.nix new file mode 100644 index 000000000000..48d47f5c5d05 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic-vulkan/package.nix @@ -0,0 +1,17 @@ +{ + serious-sam-classic, + vulkan-headers, + vulkan-loader, +}: +serious-sam-classic.overrideAttrs (oldAttrs: { + pname = "serious-sam-classic-vulkan"; + + src = oldAttrs.src.override { + repo = "SeriousSamClassic-VK"; + hash = "sha256-fnWJOmgaW4/PfrmXiN7qodHEXc96/AZCbUo3dwelY6s="; + }; + + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ vulkan-headers ]; + + buildInputs = oldAttrs.buildInputs ++ [ vulkan-loader ]; +}) diff --git a/pkgs/by-name/se/serious-sam-classic/package.nix b/pkgs/by-name/se/serious-sam-classic/package.nix new file mode 100644 index 000000000000..12ae5fb92617 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/package.nix @@ -0,0 +1,86 @@ +{ + bison, + cmake, + fetchFromGitHub, + flex, + imagemagick, + lib, + libogg, + libvorbis, + makeWrapper, + nasm, + SDL2, + stdenv, + zlib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "serious-sam-classic"; + version = "1.10.7"; + + src = fetchFromGitHub { + owner = "tx00100xt"; + repo = "SeriousSamClassic"; + tag = finalAttrs.version; + hash = "sha256-TwbTG2QT3nddLFHwMW4T7sAd9pi+QXdBz62ri4VcNeg="; + }; + + patches = [ + ./tfe-fix-cmake-libdir-override.patch + ./tse-fix-cmake-libdir-override.patch + ./tfe-force-using-system-path.patch + ./tse-force-using-system-path.patch + ]; + + postPatch = '' + substituteInPlace SamTFE/Sources/CMakeLists.txt --replace-fail "-march=native" "-mtune=generic" + substituteInPlace SamTSE/Sources/CMakeLists.txt --replace-fail "-march=native" "-mtune=generic" + ''; + + nativeBuildInputs = [ + makeWrapper + cmake + imagemagick + bison + flex + nasm + ]; + + buildInputs = [ + SDL2 + zlib + libogg + libvorbis + ]; + + # I've tried to use patchelf --add-needed and --add-rpath with libvorbis, didn't work + postInstall = '' + wrapProgram $out/bin/serioussam --prefix LD_LIBRARY_PATH : ${libvorbis}/lib + wrapProgram $out/bin/serioussamse --prefix LD_LIBRARY_PATH : ${libvorbis}/lib + ''; + + meta = { + homepage = "https://github.com/tx00100xt/${finalAttrs.src.repo}"; + description = "Open source game engine version developed by Croteam for Serious Sam Classic"; + longDescription = '' + Note: This package allows to run both Serious Sam: The First Encounter (serioussam) + and The Second Encounter (serioussamse). + + For serioussam you must copy all the assets of the original games into + ~/.local/share/Serious-Engine/serioussam for serioussam and + ~/.local/share/Serious-Engine/serioussamse for serioussamse. + Look at + https://github.com/tx00100xt/${finalAttrs.src.repo}/wiki/How-to-building-a-package-for-Debian-or-Ubuntu.md#game-resources + for instructions on how to do that. + For both games you must also copy the files SE1_10b.gro and ModEXT.txt into the assets. + For serioussam: + - https://raw.githubusercontent.com/tx00100xt/${finalAttrs.src.repo}/${finalAttrs.src.tag}/SamTFE/ModEXT.txt + - https://raw.githubusercontent.com/tx00100xt/${finalAttrs.src.repo}/${finalAttrs.src.tag}/SamTFE/SE1_10b.gro + For serioussamse: + - https://raw.githubusercontent.com/tx00100xt/${finalAttrs.src.repo}/${finalAttrs.src.tag}/SamTSE/ModEXT.txt + - https://raw.githubusercontent.com/tx00100xt/${finalAttrs.src.repo}/${finalAttrs.src.tag}/SamTSE/SE1_10b.gro + ''; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.l0b0 ]; + }; +}) diff --git a/pkgs/by-name/se/serious-sam-classic/tfe-fix-cmake-libdir-override.patch b/pkgs/by-name/se/serious-sam-classic/tfe-fix-cmake-libdir-override.patch new file mode 100644 index 000000000000..af5f3008b906 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/tfe-fix-cmake-libdir-override.patch @@ -0,0 +1,17 @@ +diff --git a/SamTFE/Sources/CMakeLists.txt b/SamTFE/Sources/CMakeLists.txt +index 956518b..76308f2 100644 +--- a/SamTFE/Sources/CMakeLists.txt ++++ b/SamTFE/Sources/CMakeLists.txt +@@ -221,10 +221,10 @@ endif (LINUX) + message(STATUS "Operating system name: ${CMAKE_OS_NAME}") + + set(CMAKE_ARCH_BITS 32) +-set(CMAKE_INSTALL_LIBDIR "/usr/lib") ++#set(CMAKE_INSTALL_LIBDIR "/usr/lib") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CMAKE_ARCH_BITS 64) +- set(CMAKE_INSTALL_LIBDIR "/usr/lib64") ++ #set(CMAKE_INSTALL_LIBDIR "/usr/lib64") + endif() + + message(STATUS "Arch bits: ${CMAKE_ARCH_BITS}") diff --git a/pkgs/by-name/se/serious-sam-classic/tfe-force-using-system-path.patch b/pkgs/by-name/se/serious-sam-classic/tfe-force-using-system-path.patch new file mode 100644 index 000000000000..a48c2f18185a --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/tfe-force-using-system-path.patch @@ -0,0 +1,60 @@ +diff --git a/SamTFE/Sources/Engine/Engine.cpp b/SamTFE/Sources/Engine/Engine.cpp +index 6febab8..5963e34 100644 +--- a/SamTFE/Sources/Engine/Engine.cpp ++++ b/SamTFE/Sources/Engine/Engine.cpp +@@ -742,53 +742,8 @@ + CPrintF(TRANSV("Running %d-bit version\n"), sys_iGameBits); + + #ifdef PLATFORM_UNIX +-#if defined(__OpenBSD__) || defined(__FreeBSD__) +- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/local/bin/", (size_t) 15 ); +-#elif defined(__NetBSD__) +- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/pkg/bin/", (size_t) 13 ); +-#else +- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/bin/", (size_t) 9 ); +-#endif +- if( _isystempath == 0 ) { +- sys_iSysPath = 1; // using system path +- } else { +- sys_iSysPath = 0; // using standarted path +- } +- +- // get library path for mods +- _fnmModLibPath = ""; +-#if defined(__OpenBSD__) || defined(__FreeBSD__) +- if( sys_iSysPath == 1 ) { +- _fnmModLibPath = "/usr/local/lib/" + strGameID + "/"; +-#elif defined(__NetBSD__) +- if( sys_iSysPath == 1 ) { +- _fnmModLibPath = "/usr/pkg/lib/" + strGameID + "/"; +-#else +- if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/aarch64-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/aarch64-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/arm-linux-gnueabihf/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/arm-linux-gnueabihf/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/riscv64-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/riscv64-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/s390x-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/s390x-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/powerpc64-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/powerpc64-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/x86_64-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/x86_64-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/i386-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/i386-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib64/" + strGameID)) { +- _fnmModLibPath = "/usr/lib64/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib//" + strGameID)) { +- _fnmModLibPath = "/usr/lib/" + strGameID + "/"; +-#endif +- } else if( sys_iSysPath == 0 ) { +- _fnmModLibPath = _fnmApplicationPath; +- } else { +- CPrintF(TRANSV("ERROR: Game libraries not ound!\n")); +- FatalError(TRANSV("Failed to search game libraries installed!\nPlease reinstall the game.\nSee the log for more details.\nGame log is here: ~/.local/share/Serious-Engine/%s/SeriousSam.log"),(const char *) strGameID); +- } ++ sys_iSysPath = 1; // using system path ++ _fnmModLibPath = _fnmApplicationPath + "lib/" + strGameID + "/"; + + if( sys_iSysPath == 1 ) { // search game data + CTFileName _fnm_usr_TestFile, _fnm_local_TestFile, _fnm_home_TestFile; diff --git a/pkgs/by-name/se/serious-sam-classic/tse-fix-cmake-libdir-override.patch b/pkgs/by-name/se/serious-sam-classic/tse-fix-cmake-libdir-override.patch new file mode 100644 index 000000000000..fda65a255291 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/tse-fix-cmake-libdir-override.patch @@ -0,0 +1,17 @@ +diff --git a/SamTSE/Sources/CMakeLists.txt b/SamTSE/Sources/CMakeLists.txt +index 956518b..76308f2 100644 +--- a/SamTSE/Sources/CMakeLists.txt ++++ b/SamTSE/Sources/CMakeLists.txt +@@ -221,10 +221,10 @@ endif (LINUX) + message(STATUS "Operating system name: ${CMAKE_OS_NAME}") + + set(CMAKE_ARCH_BITS 32) +-set(CMAKE_INSTALL_LIBDIR "/usr/lib") ++#set(CMAKE_INSTALL_LIBDIR "/usr/lib") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CMAKE_ARCH_BITS 64) +- set(CMAKE_INSTALL_LIBDIR "/usr/lib64") ++ #set(CMAKE_INSTALL_LIBDIR "/usr/lib64") + endif() + + message(STATUS "Arch bits: ${CMAKE_ARCH_BITS}") diff --git a/pkgs/by-name/se/serious-sam-classic/tse-force-using-system-path.patch b/pkgs/by-name/se/serious-sam-classic/tse-force-using-system-path.patch new file mode 100644 index 000000000000..71aa14e16eb9 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/tse-force-using-system-path.patch @@ -0,0 +1,60 @@ +diff --git a/SamTSE/Sources/Engine/Engine.cpp b/SamTSE/Sources/Engine/Engine.cpp +index 6febab8..5963e34 100644 +--- a/SamTSE/Sources/Engine/Engine.cpp ++++ b/SamTSE/Sources/Engine/Engine.cpp +@@ -742,53 +742,8 @@ + CPrintF(TRANSV("Running %d-bit version\n"), sys_iGameBits); + + #ifdef PLATFORM_UNIX +-#if defined(__OpenBSD__) || defined(__FreeBSD__) +- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/local/bin/", (size_t) 15 ); +-#elif defined(__NetBSD__) +- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/pkg/bin/", (size_t) 13 ); +-#else +- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/bin/", (size_t) 9 ); +-#endif +- if( _isystempath == 0 ) { +- sys_iSysPath = 1; // using system path +- } else { +- sys_iSysPath = 0; // using standarted path +- } +- +- // get library path for mods +- _fnmModLibPath = ""; +-#if defined(__OpenBSD__) || defined(__FreeBSD__) +- if( sys_iSysPath == 1 ) { +- _fnmModLibPath = "/usr/local/lib/" + strGameID + "/"; +-#elif defined(__NetBSD__) +- if( sys_iSysPath == 1 ) { +- _fnmModLibPath = "/usr/pkg/lib/" + strGameID + "/"; +-#else +- if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/aarch64-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/aarch64-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/arm-linux-gnueabihf/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/arm-linux-gnueabihf/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/riscv64-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/riscv64-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/s390x-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/s390x-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/powerpc64-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/powerpc64-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/x86_64-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/x86_64-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/i386-linux-gnu/" + strGameID)) { +- _fnmModLibPath = "/usr/lib/i386-linux-gnu/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib64/" + strGameID)) { +- _fnmModLibPath = "/usr/lib64/" + strGameID + "/"; +- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib//" + strGameID)) { +- _fnmModLibPath = "/usr/lib/" + strGameID + "/"; +-#endif +- } else if( sys_iSysPath == 0 ) { +- _fnmModLibPath = _fnmApplicationPath; +- } else { +- CPrintF(TRANSV("ERROR: Game libraries not ound!\n")); +- FatalError(TRANSV("Failed to search game libraries installed!\nPlease reinstall the game.\nSee the log for more details.\nGame log is here: ~/.local/share/Serious-Engine/%s/SeriousSam.log"),(const char *) strGameID); +- } ++ sys_iSysPath = 1; // using system path ++ _fnmModLibPath = _fnmApplicationPath + "lib/" + strGameID + "/"; + + if( sys_iSysPath == 1 ) { // search game data + CTFileName _fnm_usr_TestFile, _fnm_local_TestFile, _fnm_home_TestFile; diff --git a/pkgs/by-name/se/seventeenlands/package.nix b/pkgs/by-name/se/seventeenlands/package.nix index 649a5280e464..0691a82035ee 100644 --- a/pkgs/by-name/se/seventeenlands/package.nix +++ b/pkgs/by-name/se/seventeenlands/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "seventeenlands"; version = "0.1.43"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "seventeenlands" ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ python-dateutil requests tkinter diff --git a/pkgs/by-name/se/sewer/package.nix b/pkgs/by-name/se/sewer/package.nix index 17049eb5db10..d2a6240f48fe 100644 --- a/pkgs/by-name/se/sewer/package.nix +++ b/pkgs/by-name/se/sewer/package.nix @@ -7,19 +7,23 @@ python3Packages.buildPythonApplication rec { pname = "sewer"; version = "0.8.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "sha256-a4VdbZY8pYxrXIaUHJpnLuTB928tJn4UCdnt+m8UBug="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pyopenssl requests tldextract ]; + pythonImportsCheck = [ "sewer" ]; + meta = with lib; { homepage = "https://github.com/komuw/sewer"; description = "ACME client"; diff --git a/pkgs/by-name/sf/sftpman/package.nix b/pkgs/by-name/sf/sftpman/package.nix index 26ea3d4b7e40..db9b5143c296 100644 --- a/pkgs/by-name/sf/sftpman/package.nix +++ b/pkgs/by-name/sf/sftpman/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "sftpman"; version = "1.2.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "spantaleev"; @@ -16,10 +16,14 @@ python3Packages.buildPythonApplication rec { hash = "sha256-YxqN4+u0nYUWehbyRhjddIo2sythH3E0fiPSyrUlWhM="; }; + build-system = with python3Packages; [ setuptools ]; + checkPhase = '' $out/bin/sftpman help ''; + pythonImportsCheck = [ "sftpman" ]; + meta = with lib; { homepage = "https://github.com/spantaleev/sftpman"; description = "Application that handles sshfs/sftp file systems mounting"; diff --git a/pkgs/by-name/sh/shadcn/package.nix b/pkgs/by-name/sh/shadcn/package.nix index 9135d1b5dd0b..02f73aace615 100644 --- a/pkgs/by-name/sh/shadcn/package.nix +++ b/pkgs/by-name/sh/shadcn/package.nix @@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces ; hash = "sha256-/80LJm65ZRqyfhsNqGl83bsI2wjgVkvrA6Ij4v8rtoQ="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/sharkey/package.nix b/pkgs/by-name/sh/sharkey/package.nix index 2db89f5d1838..c3572f5e278c 100644 --- a/pkgs/by-name/sh/sharkey/package.nix +++ b/pkgs/by-name/sh/sharkey/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-S8LxawbtguFOEZyYbS1FQWw/TcRm4Z6mG7dUhfXbf1c="; + fetcherVersion = 1; }; nativeBuildInputs = diff --git a/pkgs/by-name/sh/shot-scraper/package.nix b/pkgs/by-name/sh/shot-scraper/package.nix index 86a921b1042b..5f3ff70cf52f 100644 --- a/pkgs/by-name/sh/shot-scraper/package.nix +++ b/pkgs/by-name/sh/shot-scraper/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "shot-scraper"; version = "1.8"; - format = "setuptools"; + pyproject = true; disabled = python3.pkgs.pythonOlder "3.6"; @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-CSV9HOqVMHI/L+jyMTdaDyc6ACyGIkG/mmcyRza6EjQ="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ click click-default-group playwright diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 1dcee4bb8c21..a0a2fcc0baeb 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -69,6 +69,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname src version; hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0="; + fetcherVersion = 1; }; strictDeps = true; @@ -123,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: { "sha256-ry7s9fbKx4e1LR8DlI2LIJY9GQrxmU7JQt+3apJGw/M=" else "sha256-AkrfugpNvk4KgesRLQbso8p5b96Dg174R9/xuP4JtJg="; + fetcherVersion = 1; }; env = { diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index 6f53f67100ca..14f9e1866e55 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-regaYG+SDvIgdnHQVR1GG1A1FSBXpzFfLuyTEdMt1kQ="; + fetcherVersion = 1; }; cargoRoot = "deps/extension"; diff --git a/pkgs/by-name/si/signing-party/package.nix b/pkgs/by-name/si/signing-party/package.nix index 0308dd250461..1ef34b94d961 100644 --- a/pkgs/by-name/si/signing-party/package.nix +++ b/pkgs/by-name/si/signing-party/package.nix @@ -13,7 +13,7 @@ which, getopt, libpaper, - nettools, + net-tools, qprint, sendmailPath ? "/run/wrappers/bin/sendmail", }: @@ -178,7 +178,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" \ "${ lib.makeBinPath [ - nettools + net-tools gnupg ] }" diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index 7bf3abce085b..6f558689e0d5 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.11.14"; + version = "1.11.15"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-GgFsTLMyrNsYT9GUlnXnSzynIa2D2ECtcYvKMfvndkA="; + hash = "sha256-uqPV3PGk3hFpV1B8+htBG9x58RVWew0sBDUItpxyv8Q="; }; - vendorHash = "sha256-ULfPmVQ2Ngr1ujeCmUPOOaqxyQmbgqH1w6P9TwvjhSo="; + vendorHash = "sha256-qZlnY0MxB4/ttgjuAroTfqGWqGRea549EyIjSxPAlOI="; tags = [ "with_quic" diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index a31210383502..dc85f15bd48b 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch ; hash = "sha256-eSf4mpKBm1G4K9+V6VXEiPrIVQMyru7o9BGVIUycQaQ="; + fetcherVersion = 1; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index e7fdb59764bf..481d59136084 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -21,6 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-NGAgueJ+cuK/csjdf94KNklu+Xf91BHoWKVgEctX6eA="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix index f7ce1adc5e1b..2d82414032bf 100644 --- a/pkgs/by-name/sl/slimevr/package.nix +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec { pname = "${pname}-pnpm-deps"; inherit version src; hash = "sha256-lh5IKdBXuH9GZFUTrzaQFDWCEYj0UJhKwCdPmsiwfCs="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slskd/deps.json b/pkgs/by-name/sl/slskd/deps.json index afffb6a8d3dd..b58ab14bb3d8 100644 --- a/pkgs/by-name/sl/slskd/deps.json +++ b/pkgs/by-name/sl/slskd/deps.json @@ -781,8 +781,8 @@ }, { "pname": "Soulseek", - "version": "7.0.3", - "hash": "sha256-/GCUh4XJ4zs5etxQ0GjNJozkS2GZ/Qq1cot1+bRQack=" + "version": "7.1.0", + "hash": "sha256-n6LUNuPmmy9QYNNALR0ObYyR9LJalf0H8P+SKnoqfFc=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix index a5bc3bedfc3c..ef94103af49a 100644 --- a/pkgs/by-name/sl/slskd/package.nix +++ b/pkgs/by-name/sl/slskd/package.nix @@ -19,13 +19,13 @@ let in buildDotnetModule rec { pname = "slskd"; - version = "0.22.5"; + version = "0.23.1"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; tag = version; - hash = "sha256-gLPWbRffoCJAdg8zP9idfnzqT1nIZrI88cYUd/DyxZA="; + hash = "sha256-vUqDWzWJIZbb6WvANsLhUBzyQFi59/+jizarI8Ob3uQ="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildDotnetModule rec { name = "${pname}-${version}-npm-deps"; inherit src; sourceRoot = "${src.name}/${npmRoot}"; - hash = "sha256-GACe+ufxiSlS1aD9R+I8VqbZqi2gCHUp+Dm/XMx2WZQ="; + hash = "sha256-AbIlpu0KNuzwSQVIsSRhLQZqE3yA68DlIL4WbZ34Hi8="; }; projectFile = "slskd.sln"; diff --git a/pkgs/by-name/sm/smartgit/package.nix b/pkgs/by-name/sm/smartgit/package.nix index 15b19494541c..63c535d6d17e 100644 --- a/pkgs/by-name/sm/smartgit/package.nix +++ b/pkgs/by-name/sm/smartgit/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "smartgit"; - version = "24.1.3"; + version = "24.1.4"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${ builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }.tar.gz"; - hash = "sha256-YhgE1Y0L8lzefJnvswKwIFnx6XIo40DszAr/cxOoOds="; + hash = "sha256-1JKFSIGUE8b1yWBg41x+HRWgmg5prZF2+ND/SId4NVs="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index 49f8200f1499..6d131c675c58 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -88,7 +88,7 @@ python3Packages.buildPythonApplication rec { versionCheckProgramArg = "--version"; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/tests.py" "tests/test_expand.py" "tests/test_io.py" diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index aeb6ca1b3206..9d11d12e7a30 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -14,7 +14,7 @@ python312Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.10.0"; + version = "8.10.1"; pyproject = true; @@ -22,7 +22,7 @@ python312Packages.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; tag = version; - hash = "sha256-k48OgHg0Pm3WfjPex27UvMZBOq9708vGJy/rZvCZdbg="; + hash = "sha256-WGCbqtuCOF5X8yOVrgLKWyDcqjpb8sbTPRZzVesnAIY="; }; patches = [ @@ -142,7 +142,7 @@ python312Packages.buildPythonApplication rec { squashfsTools ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTests = [ "test_bin_echo" diff --git a/pkgs/by-name/sn/snappy/package.nix b/pkgs/by-name/sn/snappy/package.nix index cb6c6e559b89..566dddcc4473 100644 --- a/pkgs/by-name/sn/snappy/package.nix +++ b/pkgs/by-name/sn/snappy/package.nix @@ -3,30 +3,22 @@ stdenv, fetchFromGitHub, cmake, - fetchpatch, static ? stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation rec { pname = "snappy"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "google"; repo = "snappy"; rev = version; - hash = "sha256-IzKzrMDjh+Weor+OrKdX62cAKYTdDXgldxCgNE2/8vk="; + hash = "sha256-bMZD8EI9dvDGupfos4hi/0ShBkrJlI5Np9FxE6FfrNE="; }; patches = [ - # Re-enable RTTI, without which other applications can't subclass - # snappy::Source (this breaks Ceph, as one example) - # https://tracker.ceph.com/issues/53060 - # https://build.opensuse.org/package/show/openSUSE:Factory/snappy - (fetchpatch { - url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; - sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; - }) + ./revert-PUBLIC.patch ]; outputs = [ diff --git a/pkgs/by-name/sn/snappy/revert-PUBLIC.patch b/pkgs/by-name/sn/snappy/revert-PUBLIC.patch new file mode 100644 index 000000000000..e08eec0d5684 --- /dev/null +++ b/pkgs/by-name/sn/snappy/revert-PUBLIC.patch @@ -0,0 +1,11 @@ +https://github.com/google/snappy/issues/206 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -261,7 +261,6 @@ target_sources(snappy + "snappy-stubs-internal.cc" + "snappy.cc" + "${PROJECT_BINARY_DIR}/config.h" +- PUBLIC + $ + $ + $ diff --git a/pkgs/by-name/sn/snowflake-cli/package.nix b/pkgs/by-name/sn/snowflake-cli/package.nix index 4a71fb017012..6fd26aca89eb 100644 --- a/pkgs/by-name/sn/snowflake-cli/package.nix +++ b/pkgs/by-name/sn/snowflake-cli/package.nix @@ -54,9 +54,7 @@ python3Packages.buildPythonApplication rec { pytest-httpserver ]; - pytestFlagsArray = [ - "-n" - "$NIX_BUILD_CORES" + pytestFlags = [ "--snapshot-warn-unused" ]; diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 9ce46e47ab7c..9f3e9c8fdae9 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -14,13 +14,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "4.4.4"; + version = "4.4.5"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${version}"; - hash = "sha256-FVrj26pQthy6gY6UWXD4ACvy0/PPLXM0zrGOIjXl07U="; + hash = "sha256-iJAeZj1tnd03qF3vvr+VKC5El0sVAFvl901biNvaAp4="; }; passthru.updateScript = nix-update-script { }; @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-ZzVTl1IVTAut+7o9QXaPDk8QCemRt2EoYX/Wi0RXJ3U="; + cargoHash = "sha256-XBiwLpmqm1QgdTkaTJ7R+llRpTM7Wf8NX2Ar+//5l5w="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index 55fcc3bb5992..e208234f2332 100644 --- a/pkgs/by-name/so/socat/package.nix +++ b/pkgs/by-name/so/socat/package.nix @@ -1,7 +1,7 @@ { lib, fetchurl, - nettools, + net-tools, openssl, readline, stdenv, @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ which - nettools + net-tools ]; doCheck = false; # fails a bunch, hangs diff --git a/pkgs/by-name/so/soco-cli/package.nix b/pkgs/by-name/so/soco-cli/package.nix index edf5ffc461fe..434b6a2dd167 100644 --- a/pkgs/by-name/so/soco-cli/package.nix +++ b/pkgs/by-name/so/soco-cli/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "soco-cli"; version = "0.4.73"; - format = "setuptools"; + pyproject = true; disabled = python3.pythonOlder "3.6"; @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-WxBwHjh5tCXclQXqrHrpvZdcQU93RObteAfZyyVvKf0="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ fastapi rangehttpserver soco diff --git a/pkgs/by-name/so/sonata/package.nix b/pkgs/by-name/so/sonata/package.nix index 46e2504fae87..0e2f2ca7d74c 100644 --- a/pkgs/by-name/so/sonata/package.nix +++ b/pkgs/by-name/so/sonata/package.nix @@ -25,7 +25,7 @@ in buildPythonApplication rec { pname = "sonata"; version = "1.7.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "multani"; @@ -50,13 +50,15 @@ buildPythonApplication rec { gdk-pixbuf ]; + build-system = [ setuptools ]; + # The optional tagpy dependency (for editing metadata) is not yet # included because it's difficult to build. pythonPath = [ dbus-python mpd2 pygobject3 - setuptools + setuptools # pkg_resources is imported during runtime ]; postPatch = '' diff --git a/pkgs/by-name/so/soundtouch/package.nix b/pkgs/by-name/so/soundtouch/package.nix index 12540494e975..1a49385a51c6 100644 --- a/pkgs/by-name/so/soundtouch/package.nix +++ b/pkgs/by-name/so/soundtouch/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "soundtouch"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "soundtouch"; repo = "soundtouch"; rev = version; - hash = "sha256-imeeTj+3gXxoGTuC/13+BAplwcnQ0wRJdSVt7MPlBxc="; + hash = "sha256-7JUBAFURKtPCZrcKqL1rOLdsYMd7kGe7wY0JUl2XPvw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix index 157ff8c558de..61da8d363a79 100644 --- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix +++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix @@ -9,6 +9,7 @@ llvm, spirv-headers, spirv-tools, + pkgs, }: let @@ -16,51 +17,42 @@ let isROCm = lib.hasPrefix "rocm" llvm.pname; # ROCm, if actively updated will always be at the latest version + versions = { + "19" = rec { + version = "19.1.6"; + rev = "v${version}"; + hash = "sha256-mUvDF5y+cBnqUaHjyiiE8cJGH5MfQMqGFy6bYv9vCVY="; + }; + "18" = rec { + version = "18.1.11"; + rev = "v${version}"; + hash = "sha256-VoALyFqShKL3bpeoOIdKoseNfDWiRE+j0ppHapXOmEU="; + }; + "17" = rec { + version = "17.0.11"; + rev = "v${version}"; + hash = "sha256-Ba4GZS7Rc93Fphj2xaBZ3AqwXvxB9UU0gzPNoDEoaQM="; + }; + "16" = rec { + version = "16.0.11"; + rev = "v${version}"; + hash = "sha256-PI4cT/PGqpaF5SysOTrEE4D+OcIUsIOMzww4CRPtwBQ="; + }; + "15" = rec { + version = "15.0.13"; + rev = "v${version}"; + hash = "sha256-RnGbBHUUGjIBcakQJO4nAm3/oIrQ8nkx+BC8Evw6Jmc="; + }; + "14" = { + version = "14.0.11+unstable-2025-01-28"; + rev = "9df26b6af308cb834a4013deb8094f386f29accd"; + hash = "sha256-8VRQwXFbLcYgHtWKs73yuTsy2kkCgYgPqD+W/GPy1BM="; + }; + }; + branch = - if llvmMajor == "19" then - { - version = "19.1.0"; - rev = "dad1f0eaab8047a4f73c50ed5f3d1694b78aae97"; - hash = "sha256-mUvDF5y+cBnqUaHjyiiE8cJGH5MfQMqGFy6bYv9vCVY="; - } - else if llvmMajor == "18" then - rec { - version = "18.1.0"; - rev = "v${version}"; - hash = "sha256-64guZiuO7VpaX01wNIjV7cnjEAe6ineMdY44S6sA33k="; - } - else if llvmMajor == "17" || isROCm then - rec { - version = "17.0.0"; - rev = "v${version}"; - hash = "sha256-Rzm5Py9IPFtS9G7kME+uSwZ/0gPGW6MlL35ZWk4LfHM="; - } - else if llvmMajor == "16" then - rec { - version = "16.0.0"; - rev = "v${version}"; - hash = "sha256-EUabcYqSjXshbPmcs1DRLvCSL1nd9rEdpqELBrItCW8="; - } - else if llvmMajor == "15" then - rec { - version = "15.0.13"; - rev = "v${version}"; - hash = "sha256-RnGbBHUUGjIBcakQJO4nAm3/oIrQ8nkx+BC8Evw6Jmc="; - } - else if llvmMajor == "14" then - { - version = "14.0.0+unstable-2025-01-28"; - rev = "9df26b6af308cb834a4013deb8094f386f29accd"; - hash = "sha256-8VRQwXFbLcYgHtWKs73yuTsy2kkCgYgPqD+W/GPy1BM="; - } - else if llvmMajor == "11" then - { - version = "11.0.0+unstable-2022-05-04"; - rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 - hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s="; - } - else - throw "Incompatible LLVM version."; + versions."${if isROCm then "17" else llvmMajor}" + or (throw "Incompatible LLVM version ${llvmMajor}"); in stdenv.mkDerivation { pname = "SPIRV-LLVM-Translator"; @@ -72,39 +64,14 @@ stdenv.mkDerivation { inherit (branch) rev hash; }; - patches = - lib.optionals (llvmMajor == "18") [ - # Fixes build after SPV_INTEL_maximum_registers breaking change - # TODO: remove on next spirv-headers release - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/d970c9126c033ebcbb7187bc705eae2e54726b74.patch"; - revert = true; - hash = "sha256-71sJuGqVjTcB549eIiCO0LoqAgxkdEHCoxh8Pd/Qzz8="; - }) - ] - ++ lib.optionals (lib.versionAtLeast llvmMajor "16" && lib.versionOlder llvmMajor "18") [ - # Fixes build after spirv-headers breaking change - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch"; - excludes = [ "spirv-headers-tag.conf" ]; - hash = "sha256-17JJG8eCFVphElY5fVT/79hj0bByWxo8mVp1ZNjQk/M="; - }) - ] - ++ lib.optionals (llvmMajor == "16") [ - # Fixes builds that link against external LLVM dynamic library - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch"; - hash = "sha256-opDjyZcy7O4wcSfm/A51NCIiDyIvbcmbv9ns1njdJbc="; - }) - ] - ++ lib.optionals (llvmMajor == "14") [ - (fetchpatch { - # tries to install llvm-spirv into llvm nix store path - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch"; - revert = true; - hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8="; - }) - ]; + patches = lib.optionals (llvmMajor == "14") [ + (fetchpatch { + # tries to install llvm-spirv into llvm nix store path + url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch"; + revert = true; + hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8="; + }) + ]; nativeBuildInputs = [ pkg-config @@ -126,8 +93,8 @@ stdenv.mkDerivation { "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" + "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" ] - ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" ++ lib.optional (llvmMajor == "19") "-DBASE_LLVM_VERSION=${lib.versions.majorMinor llvm.version}.0"; # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist @@ -147,6 +114,10 @@ stdenv.mkDerivation { -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib ''; + passthru.tests = lib.genAttrs (lib.attrNames versions) ( + version: pkgs.spirv-llvm-translator.override { llvm = pkgs."llvm_${version}"; } + ); + meta = with lib; { homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator"; description = "Tool and a library for bi-directional translation between SPIR-V and LLVM IR"; diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index d1edc96a6f62..3f0dabe9a26f 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -38,16 +38,16 @@ stdenv.mkDerivation rec { # https://github.com/KhronosGroup/SPIRV-Tools/issues/3905 postPatch = '' substituteInPlace CMakeLists.txt \ - --replace '-P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' \ - '-DCMAKE_INSTALL_FULL_LIBDIR=''${CMAKE_INSTALL_FULL_LIBDIR} - -DCMAKE_INSTALL_FULL_INCLUDEDIR=''${CMAKE_INSTALL_FULL_INCLUDEDIR} - -P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' + --replace-fail '-P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' \ + '-DCMAKE_INSTALL_FULL_LIBDIR=''${CMAKE_INSTALL_FULL_LIBDIR} + -DCMAKE_INSTALL_FULL_INCLUDEDIR=''${CMAKE_INSTALL_FULL_INCLUDEDIR} + -P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' substituteInPlace cmake/SPIRV-Tools.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ substituteInPlace cmake/SPIRV-Tools-shared.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; meta = with lib; { diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix index 5f1c45c4f2db..9e405aaacbc0 100644 --- a/pkgs/by-name/sp/splayer/package.nix +++ b/pkgs/by-name/sp/splayer/package.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation (final: { pnpmDeps = final.pnpm.fetchDeps { inherit (final) pname version src; hash = "sha256-mC1iJtkZpTd2Vte5DLI3ntZ7vSO5Gka2qOk7ihQd3Gs="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index b6a4852f61ed..40b6a82d5329 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.4.1"; + version = "3.4.2"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; tag = version; - hash = "sha256-gtpYQvhDOxNO97YXaSHqSgUklmPJIe2ynjexTZPBUmA="; + hash = "sha256-Cf4nrINpe5Kr2JYwcTYx1oO+E6ydlBs0W7F4Mh7ITAs="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "SQL linter and auto-formatter"; homepage = "https://www.sqlfluff.com/"; - changelog = "https://github.com/sqlfluff/sqlfluff/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/sqlfluff/sqlfluff/blob/${src.tag}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; mainProgram = "sqlfluff"; diff --git a/pkgs/by-name/sq/sqlite-web/package.nix b/pkgs/by-name/sq/sqlite-web/package.nix index 6dea15352a99..b1128260999b 100644 --- a/pkgs/by-name/sq/sqlite-web/package.nix +++ b/pkgs/by-name/sq/sqlite-web/package.nix @@ -7,14 +7,16 @@ python3Packages.buildPythonApplication rec { pname = "sqlite-web"; version = "0.6.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-5Bdd1C9M3HjvfDKdVvGSQ+/I0Iimvf1MZwPonRiqwqU="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ flask peewee pygments @@ -23,6 +25,8 @@ python3Packages.buildPythonApplication rec { # no tests in repository doCheck = false; + pythonImportsCheck = [ "sqlite_web" ]; + meta = with lib; { description = "Web-based SQLite database browser"; mainProgram = "sqlite_web"; diff --git a/pkgs/by-name/ss/sshuttle/package.nix b/pkgs/by-name/ss/sshuttle/package.nix index e17517008d44..10c43f5e1fb5 100644 --- a/pkgs/by-name/ss/sshuttle/package.nix +++ b/pkgs/by-name/ss/sshuttle/package.nix @@ -8,7 +8,7 @@ sphinx, coreutils, iptables, - nettools, + net-tools, openssh, procps, }: @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ iptables - nettools + net-tools ] ) }" \ diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix index 93f455bb1a96..0a2a94498321 100644 --- a/pkgs/by-name/st/step-kms-plugin/package.nix +++ b/pkgs/by-name/st/step-kms-plugin/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "step-kms-plugin"; rev = "v${version}"; - hash = "sha256-XZRNEUMko3HMlKOyHYK3TQywkqC6K5VvdvGFTSk6V68="; + hash = "sha256-9prrXwxCeqMTdO6+qIWhn6Vd67pslXvhkUnQa7ZfEpg="; }; - vendorHash = "sha256-gIzllbLAshJXoTawTbQ+ERliaHwhJhQM6v1aykDKF7M="; + vendorHash = "sha256-hnUsYWuL+CJIL6w7EdYBevH9Cb19fLuE+VD4ZiRuBFM="; proxyVendor = true; diff --git a/pkgs/by-name/st/streamrip/package.nix b/pkgs/by-name/st/streamrip/package.nix index 9fa90e8b6603..262c50c9d374 100644 --- a/pkgs/by-name/st/streamrip/package.nix +++ b/pkgs/by-name/st/streamrip/package.nix @@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec { description = "Scriptable music downloader for Qobuz, Tidal, SoundCloud, and Deezer"; homepage = "https://github.com/nathom/streamrip"; license = licenses.gpl3Only; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; mainProgram = "rip"; }; } diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix index 78c830808d7c..06fb4c4d3d24 100644 --- a/pkgs/by-name/st/stylelint-lsp/package.nix +++ b/pkgs/by-name/st/stylelint-lsp/package.nix @@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-PVA6sXbiuxqvi9u3sPoeVIJSSpSbFQHQQnTFO3w31WE="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix index 681ea499573d..bd07b08eaf9b 100644 --- a/pkgs/by-name/su/substudy/package.nix +++ b/pkgs/by-name/su/substudy/package.nix @@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.randomhacks.net/substudy"; license = licenses.asl20; mainProgram = "substudy"; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix index 23df1771fed7..f194f593f3f8 100644 --- a/pkgs/by-name/su/subtitleedit/package.nix +++ b/pkgs/by-name/su/subtitleedit/package.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 2b075e2abc4f..e95b4e5e03b5 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -6,22 +6,21 @@ openssl, rocksdb, testers, - surrealdb, protobuf, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "surrealdb"; - version = "2.3.5"; + version = "2.3.7"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; - tag = "v${version}"; - hash = "sha256-7Rv57D966TQFHbZKmtnt1XWuNOwD+r175iUVJiVho/0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-gZICuvgMOdwa39i+5ETUDuFfBtSiZuuFOYW5pHPkoms="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JENp5g1as1RS9fdV5qepEAhE9/SJ8lbMiwyk3YDeu5k="; + cargoHash = "sha256-KndVaz7o0kMtMvQf4NK0pNMaC518keWddmGkYtemeWg="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -55,19 +54,19 @@ rustPlatform.buildRustPackage rec { __darwinAllowLocalNetworking = true; passthru.tests.version = testers.testVersion { - package = surrealdb; + package = finalAttrs.finalPackage; command = "surreal version"; }; - meta = with lib; { + meta = { description = "Scalable, distributed, collaborative, document-graph database, for the realtime web"; homepage = "https://surrealdb.com/"; mainProgram = "surreal"; - license = licenses.bsl11; - maintainers = with maintainers; [ + license = lib.licenses.bsl11; + maintainers = with lib.maintainers; [ sikmir happysalada siriobalmelli ]; }; -} +}) diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index ac2372736750..87df89375c41 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-oreeV9g16/F7JGLApi0Uq+vTqNhIg7Lg1Z4k00RUOYI="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sw/swaggerhole/package.nix b/pkgs/by-name/sw/swaggerhole/package.nix index d1311c61fd8f..a6d6868ff1c0 100644 --- a/pkgs/by-name/sw/swaggerhole/package.nix +++ b/pkgs/by-name/sw/swaggerhole/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication { pname = "swaggerhole"; version = "1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Liodeus"; @@ -17,7 +17,9 @@ python3.pkgs.buildPythonApplication { hash = "sha256-3HmIpn1A86PXZRL+SqMdr84O16hW1mCUWHKnOVolmx8="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ requests whispers ]; diff --git a/pkgs/by-name/sw/swaglyrics/package.nix b/pkgs/by-name/sw/swaglyrics/package.nix index b2e567afc5cf..5c4e6031286b 100644 --- a/pkgs/by-name/sw/swaglyrics/package.nix +++ b/pkgs/by-name/sw/swaglyrics/package.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication { pname = "swaglyrics"; version = "unstable-2021-06-17"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "SwagLyrics"; @@ -19,10 +19,12 @@ python3.pkgs.buildPythonApplication { postPatch = '' substituteInPlace setup.py \ - --replace "==" ">=" + --replace-fail "==" ">=" ''; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ beautifulsoup4 colorama flask diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix index e9eb571eea4f..1248027bfcef 100644 --- a/pkgs/by-name/sw/swaynotificationcenter/package.nix +++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix @@ -5,18 +5,19 @@ testers, wrapGAppsHook3, bash-completion, + blueprint-compiler, dbus, dbus-glib, fish, gdk-pixbuf, glib, gobject-introspection, - gtk-layer-shell, - gtk3, + gtk4-layer-shell, + gtk4, gvfs, json-glib, + libadwaita, libgee, - libhandy, libnotify, libpulseaudio, librsvg, @@ -34,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SwayNotificationCenter"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; - rev = "v${finalAttrs.version}"; - hash = "sha256-kRawYbBLVx0ie4t7tChkA8QJShS83fUcGrJSKkxBy8Q="; + tag = "v${finalAttrs.version}"; + hash = "sha256-F7fccUaQUSHHqXO0lvnW1H3Af2YTQwQ17rNFhprgFz4="; }; # build pkg-config is required to locate the native `scdoc` input @@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ bash-completion + blueprint-compiler # cmake # currently conflicts with meson fish glib @@ -67,16 +69,16 @@ stdenv.mkDerivation (finalAttrs: { dbus-glib gdk-pixbuf glib - gtk-layer-shell - gtk3 + gtk4-layer-shell + gtk4 gvfs json-glib + libadwaita libgee - libhandy libnotify libpulseaudio librsvg - pantheon.granite + pantheon.granite7 # systemd # ends with broken permission wayland-scanner ]; diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index 8baf5924a7db..c174237089a8 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -634,7 +634,7 @@ fn handle_modified_unit( }; if sockets.is_empty() { - sockets.push(format!("{}.socket", base_name)); + sockets.push(format!("{base_name}.socket")); } for socket in &sockets { @@ -809,7 +809,7 @@ fn path_to_unit_name(bin_path: &Path, path: &str) -> String { .arg(path) .output() else { - eprintln!("Unable to escape {}!", path); + eprintln!("Unable to escape {path}!"); die(); }; @@ -974,14 +974,13 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> { fn usage(argv0: &str) -> ! { eprintln!( - r#"Usage: {} [check|switch|boot|test|dry-activate] + r#"Usage: {argv0} [check|switch|boot|test|dry-activate] check: run pre-switch checks and exit switch: make the configuration the boot default and activate now boot: make the configuration the boot default test: activate the configuration, but don't make it the boot default dry-activate: show what would be done if this configuration were activated -"#, - argv0 +"# ); std::process::exit(1); } @@ -1009,7 +1008,7 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> { let os_release = parse_os_release().context("Failed to parse os-release")?; - let distro_id_re = Regex::new(format!("^\"?{}\"?$", distro_id).as_str()) + let distro_id_re = Regex::new(format!("^\"?{distro_id}\"?$").as_str()) .context("Invalid regex for distro ID")?; // This is a NixOS installation if it has /etc/NIXOS or a proper /etc/os-release. @@ -1181,7 +1180,7 @@ won't take effect until you reboot the system. }) { if !current_unit_file.exists() && !new_unit_file.exists() { - base_unit = format!("{}@.{}", template_name, template_instance); + base_unit = format!("{template_name}@.{template_instance}"); current_base_unit_file = Path::new("/etc/systemd/system").join(&base_unit); new_base_unit_file = toplevel.join("etc/systemd/system").join(&base_unit); } @@ -1414,7 +1413,7 @@ won't take effect until you reboot the system. }) { if !current_unit_file.exists() && !new_unit_file.exists() { - base_unit = format!("{}@.{}", template_name, template_instance); + base_unit = format!("{template_name}@.{template_instance}"); new_base_unit_file = toplevel.join("etc/systemd/system").join(&base_unit); } } @@ -1450,7 +1449,7 @@ won't take effect until you reboot the system. } remove_file_if_exists(DRY_RESTART_BY_ACTIVATION_LIST_FILE) - .with_context(|| format!("Failed to remove {}", DRY_RESTART_BY_ACTIVATION_LIST_FILE))?; + .with_context(|| format!("Failed to remove {DRY_RESTART_BY_ACTIVATION_LIST_FILE}"))?; for unit in std::fs::read_to_string(DRY_RELOAD_BY_ACTIVATION_LIST_FILE) .unwrap_or_default() @@ -1466,7 +1465,7 @@ won't take effect until you reboot the system. } remove_file_if_exists(DRY_RELOAD_BY_ACTIVATION_LIST_FILE) - .with_context(|| format!("Failed to remove {}", DRY_RELOAD_BY_ACTIVATION_LIST_FILE))?; + .with_context(|| format!("Failed to remove {DRY_RELOAD_BY_ACTIVATION_LIST_FILE}"))?; if restart_systemd { eprintln!("would restart systemd"); @@ -1578,7 +1577,7 @@ won't take effect until you reboot the system. }) { if !new_unit_file.exists() { - base_unit = format!("{}@.{}", template_name, template_instance); + base_unit = format!("{template_name}@.{template_instance}"); new_base_unit_file = toplevel.join("etc/systemd/system").join(&base_unit); } } @@ -1616,7 +1615,7 @@ won't take effect until you reboot the system. // We can remove the file now because it has been propagated to the other restart/reload files remove_file_if_exists(RESTART_BY_ACTIVATION_LIST_FILE) - .with_context(|| format!("Failed to remove {}", RESTART_BY_ACTIVATION_LIST_FILE))?; + .with_context(|| format!("Failed to remove {RESTART_BY_ACTIVATION_LIST_FILE}"))?; for unit in std::fs::read_to_string(RELOAD_BY_ACTIVATION_LIST_FILE) .unwrap_or_default() @@ -1633,7 +1632,7 @@ won't take effect until you reboot the system. // We can remove the file now because it has been propagated to the other reload file remove_file_if_exists(RELOAD_BY_ACTIVATION_LIST_FILE) - .with_context(|| format!("Failed to remove {}", RELOAD_BY_ACTIVATION_LIST_FILE))?; + .with_context(|| format!("Failed to remove {RELOAD_BY_ACTIVATION_LIST_FILE}"))?; // Restart systemd if necessary. Note that this is done using the current version of systemd, // just in case the new one has trouble communicating with the running pid 1. @@ -1686,7 +1685,7 @@ won't take effect until you reboot the system. .get("org.freedesktop.login1.User", "RuntimePath") .with_context(|| format!("Failed to get runtime directory for {name}"))?; - eprintln!("reloading user units for {}...", name); + eprintln!("reloading user units for {name}..."); let myself = Path::new("/proc/self/exe") .canonicalize() .context("Failed to get full path to /proc/self/exe")?; @@ -1776,7 +1775,7 @@ won't take effect until you reboot the system. block_on_jobs(&dbus_conn, &submitted_jobs); remove_file_if_exists(RELOAD_LIST_FILE) - .with_context(|| format!("Failed to remove {}", RELOAD_LIST_FILE))?; + .with_context(|| format!("Failed to remove {RELOAD_LIST_FILE}"))?; } // Restart changed services (those that have to be restarted rather than stopped and started). @@ -1804,7 +1803,7 @@ won't take effect until you reboot the system. block_on_jobs(&dbus_conn, &submitted_jobs); remove_file_if_exists(RESTART_LIST_FILE) - .with_context(|| format!("Failed to remove {}", RESTART_LIST_FILE))?; + .with_context(|| format!("Failed to remove {RESTART_LIST_FILE}"))?; } // Start all active targets, as well as changed units we stopped above. The latter is necessary @@ -1837,12 +1836,12 @@ won't take effect until you reboot the system. block_on_jobs(&dbus_conn, &submitted_jobs); remove_file_if_exists(START_LIST_FILE) - .with_context(|| format!("Failed to remove {}", START_LIST_FILE))?; + .with_context(|| format!("Failed to remove {START_LIST_FILE}"))?; for (unit, job, result) in finished_jobs.borrow().values() { match result.as_str() { "timeout" | "failed" | "dependency" => { - eprintln!("Failed to {} {}", job, unit); + eprintln!("Failed to {job} {unit}"); exit_code = 4; } _ => {} diff --git a/pkgs/by-name/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix index a109e5efaacd..ffb469c8dc52 100644 --- a/pkgs/by-name/sw/swtpm/package.nix +++ b/pkgs/by-name/sw/swtpm/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoreconfHook, pkg-config, libtasn1, @@ -35,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-N79vuI0FhawLyQtwVF6ABIvCmEaYefq/YkyrafUfUHE="; }; + patches = [ + (fetchpatch { + name = "retry-nwwrite.patch"; + url = "https://github.com/stefanberger/swtpm/commit/4da66c66f92438443e66b67555673c9cb898b0ae.patch"; + hash = "sha256-TTS+ViN4g6EfNLrhvGPobcSQEbr/mEl9ZLZTWdxbifs="; + }) + ]; + nativeBuildInputs = [ pkg-config unixtools.netstat diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index a413fc4fa962..f514586713bf 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-q9Dmb8R9CixAQkERoKg778K9UiZMC6ql1ZHVsNfk/0s="; + hash = "sha256-cJIHyfnrzy0SM9qOxNGf9PGVapoGRWD8hT5L7XCKLjo="; # 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; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-K6d4IloHF/WURfJ0JIi2LdP8ft/3Pc426HzB2x8Qwj0="; + vendorHash = "sha256-cBaAndcF1RBxdmG196KFXKd9mEqyUQdGlaTPZSPln0I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix index f9b32eb054cb..4bb6743d2470 100644 --- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix +++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix @@ -17,18 +17,18 @@ assert lib.asserts.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "synapse-admin-etkecc"; - version = "0.11.1-etke44"; + version = "0.11.1-etke45"; src = fetchFromGitHub { owner = "etkecc"; repo = "synapse-admin"; tag = "v${finalAttrs.version}"; - hash = "sha256-8IL81rMohPNss0ZTKgyxvx4FNcgFtDoJGZ6uyM/nJgg="; + hash = "sha256-LlwNVlgZl5O9paEGem68FbzAPOfXlLTxZ865vR7qPR8="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-6TVVYitLtpNjyMOUXaMYlhOskSZCb/eWW91S69RTeFo="; + hash = "sha256-7eSQQdcJkBIbG/0cj0uh02Day+4ph6LMQGIaMPqjpdk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix index fdc86661cbfb..bae597725037 100644 --- a/pkgs/by-name/sy/synchrony/package.nix +++ b/pkgs/by-name/sy/synchrony/package.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-+hS4UK7sncCxv6o5Yl72AeY+LSGLnUTnKosAYB6QsP0="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/sy/syncrclone/package.nix b/pkgs/by-name/sy/syncrclone/package.nix index d5fd5968f0e9..a23ae28d8e71 100644 --- a/pkgs/by-name/sy/syncrclone/package.nix +++ b/pkgs/by-name/sy/syncrclone/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "syncrclone"; version = "unstable-2023-03-23"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jwink3101"; @@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-v81hPeu5qnMG6Sb95D88jy5x/GO781bf7efCYjbOaxs="; }; + build-system = with python3.pkgs; [ setuptools ]; + pythonImportsCheck = [ "syncrclone" ]; diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix index 0765c78a7335..b3944784c853 100644 --- a/pkgs/by-name/sy/syncyomi/package.nix +++ b/pkgs/by-name/sy/syncyomi/package.nix @@ -34,6 +34,7 @@ buildGoModule rec { sourceRoot ; hash = "sha256-edcZIqshnvM3jJpZWIR/UncI0VCMLq26h/n3VvV/384="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sy/systemd-wait/package.nix b/pkgs/by-name/sy/systemd-wait/package.nix index d5e054ccb14b..a19db9b7acf5 100644 --- a/pkgs/by-name/sy/systemd-wait/package.nix +++ b/pkgs/by-name/sy/systemd-wait/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "systemd-wait"; version = "0.1+2018-10-05"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Stebalien"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication { sha256 = "1l8rd0wzf3m7fk0g1c8wc0csdisdfac0filhixpgp0ck9ignayq5"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ dbus-python pygobject3 ]; diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 13742184d32f..271e4dd38cab 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-SiJJxRzmKQxqw3UESN7q+3qkU1nK+7z6K5RpIMRRces="; + fetcherVersion = 1; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/ta/taglib/package.nix b/pkgs/by-name/ta/taglib/package.nix index 1f93bf749102..fc9ad9d6f58a 100644 --- a/pkgs/by-name/ta/taglib/package.nix +++ b/pkgs/by-name/ta/taglib/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "taglib"; - version = "2.0.2"; + version = "2.1"; src = fetchFromGitHub { owner = "taglib"; repo = "taglib"; rev = "v${finalAttrs.version}"; - hash = "sha256-3cJwCo2nUSRYkk8H8dzyg7UswNPhjfhyQ704Fn9yNV8="; + hash = "sha256-1eIx4Lp/GZEBdHJcMN1zvctxJK2OAywuPzBwgtZgbmE="; }; strictDeps = true; diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index bef1a40ee1bf..c543ed0803c9 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspaces ; hash = "sha256-SUEq20gZCiTDkFuNgMc5McHBPgW++8P9Q1MJb7a7pY8="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index e136588b3726..eb86a73f1a0c 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-pLe5smsXdzSBgz/OYNO5FVEI2L6y/p+jMxEkzqUaX34="; + fetcherVersion = 1; }; buildInputs = [ nodejs_20 ]; diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 4f8600066f06..48c92f4e6ed9 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -62,7 +62,7 @@ let stdenv.cc.cc stdenv.cc.libc ]; - version = "1.0.36"; + version = "1.0.37"; in stdenv.mkDerivation { pname = "tana"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-dDB2RcTk58IQGqNGepaIvxGhR0/soWWDbBXxnSEYkdw="; + hash = "sha256-S7aihKoeP1zJpMd+mdb6D9QEtFBghyVU+K0nSzGd2ew="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix index 0c165057e334..d604098744cd 100644 --- a/pkgs/by-name/ta/tauno-monitor/package.nix +++ b/pkgs/by-name/ta/tauno-monitor/package.nix @@ -13,14 +13,14 @@ }: python3Packages.buildPythonApplication rec { pname = "tauno-monitor"; - version = "0.2.1"; + version = "0.2.9"; pyproject = false; src = fetchFromGitHub { owner = "taunoe"; repo = "tauno-monitor"; tag = "v${version}"; - hash = "sha256-WsBov5ftt0lXw3fC04EGAFj1imDaPAmKvWDC5a1y9+k="; + hash = "sha256-tVl6JZbzAgOlXQzvN9Wq4TTRoGfIyWw243vZFbkcyRo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index b4c8ac5cbac5..d302aa1650b2 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -33,13 +33,15 @@ let lynxpresence = python3Packages.buildPythonPackage rec { pname = "lynxpresence"; version = "4.4.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-y/KboyhEGs9RvyKayEIQu2+WaiQNOdsHDl1/pEoqEkQ="; }; + build-system = with python3Packages; [ setuptools ]; + doCheck = false; # tests require internet connection pythonImportsCheck = [ "lynxpresence" ]; }; diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index a36cb0aad6cf..76c9b8b8560b 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-aUMV2REINp5LDcj1s8bgQAj/4508UEewu+ebD+JT0+M="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/tebreak/package.nix b/pkgs/by-name/te/tebreak/package.nix index 40ad4527916e..1a8107b35310 100644 --- a/pkgs/by-name/te/tebreak/package.nix +++ b/pkgs/by-name/te/tebreak/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { pname = "tebreak"; version = "1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "adamewing"; @@ -21,8 +21,9 @@ python3.pkgs.buildPythonApplication rec { sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz"; }; - nativeBuildInputs = [ python3.pkgs.cython ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ pysam scipy bx-python @@ -47,6 +48,8 @@ python3.pkgs.buildPythonApplication rec { ${python3.interpreter} checktest.py ''; + pythonImportsCheck = [ "tebreak" ]; + meta = with lib; { description = "Find and characterise transposable element insertions"; mainProgram = "tebreak"; diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index 48af298648ea..bc4d5f9039a1 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.35.1"; + version = "1.35.2"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-vdn/c3EVtGnCh750IqjMjRxeW2Zimn8PazREL9KZX2Y="; + hash = "sha256-x1PUDe5sMtg7VjFmjZ1rtk1SjglkEtbhVOfDYL/kikA="; }; - vendorHash = "sha256-W5Ng7IH4WKq1v1PfO1Wi3eBDonITcIuJzJTmtHPnCmg="; + vendorHash = "sha256-pTJqf00JdF+6ixU23zBLrNZquB02fP+BBX6JXgxthSw="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix index 0f8be9b81afa..4b3667ba21e3 100644 --- a/pkgs/by-name/te/teleport/package.nix +++ b/pkgs/by-name/te/teleport/package.nix @@ -74,6 +74,7 @@ let pnpmDeps = pnpm_10.fetchDeps { inherit src pname version; hash = pnpmHash; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index c9da5beb625d..69360a910be4 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -4,20 +4,21 @@ buildGoModule, installShellFiles, stdenv, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "temporal-cli"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-9O+INXJhNwgwwvC0751ifdHmxbD0qI5A3LdDb4Krk/o="; + hash = "sha256-y4NS9IoGknHOKLJtAZBbruwRTqjUmQTKtEYNlixwyL8="; }; - vendorHash = "sha256-Xe/qrlqg6DpCNmsO/liTKjWIaY3KznkOQdXSSoJVZq4="; + vendorHash = "sha256-dWcf4X8/Wy/TULdT6PbiMaOd1d+haBlnII+6VKazrD4="; overrideModAttrs = old: { # https://gitlab.com/cznic/libc/-/merge_requests/10 @@ -55,6 +56,8 @@ buildGoModule (finalAttrs: { __darwinAllowLocalNetworking = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal"; homepage = "https://docs.temporal.io/cli"; diff --git a/pkgs/by-name/te/terminator/package.nix b/pkgs/by-name/te/terminator/package.nix index 80ca31f6ccc6..22c84eb5d36e 100644 --- a/pkgs/by-name/te/terminator/package.nix +++ b/pkgs/by-name/te/terminator/package.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "terminator"; version = "2.1.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "gnome-terminator"; @@ -42,7 +42,9 @@ python3.pkgs.buildPythonApplication rec { vte ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ configobj dbus-python pygobject3 @@ -56,6 +58,8 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; + pythonImportsCheck = [ "terminatorlib" ]; + dontWrapGApps = true; # HACK: 'wrapPythonPrograms' will add things to the $PATH in the wrapper. This bleeds into the diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix index 9726eeb44474..7e984c2c5406 100644 --- a/pkgs/by-name/te/termsvg/package.nix +++ b/pkgs/by-name/te/termsvg/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "termsvg"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "mrmarble"; repo = "termsvg"; rev = "v${version}"; - hash = "sha256-q6xjsoxQTIQwPYkBTGwLfTt1VQ8GJPdsiP5dvTyEBIw="; + hash = "sha256-ejrg1UywPQDCeaymkGzU+xZoPXME6XEP/SBe3Yxf4YU="; }; - vendorHash = "sha256-HhJcf+NwM1h0Hh76LU/cddaLoCaQdyuKLSvDFmiKEEg="; + vendorHash = "sha256-BoXRLWhQmfvMIN658MiXGCFMbnvuXfv/H/jCE6h4aWk="; ldflags = [ "-s" diff --git a/pkgs/by-name/te/termtosvg/package.nix b/pkgs/by-name/te/termtosvg/package.nix index 038168c53a56..5b30ecef9a4e 100644 --- a/pkgs/by-name/te/termtosvg/package.nix +++ b/pkgs/by-name/te/termtosvg/package.nix @@ -7,19 +7,23 @@ python3Packages.buildPythonApplication rec { pname = "termtosvg"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "1vk5kn8w3zf2ymi76l8cpwmvvavkmh3b9lb18xw3x1vzbmhz2f7d"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ lxml pyte wcwidth ]; + pythonImportsCheck = [ "termtosvg" ]; + meta = with lib; { homepage = "https://nbedos.github.io/termtosvg/"; description = "Record terminal sessions as SVG animations"; diff --git a/pkgs/by-name/te/terraform-compliance/package.nix b/pkgs/by-name/te/terraform-compliance/package.nix index 2edb96777f3b..0ab9c03badb4 100644 --- a/pkgs/by-name/te/terraform-compliance/package.nix +++ b/pkgs/by-name/te/terraform-compliance/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "terraform-compliance"; version = "1.3.52"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "terraform-compliance"; @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-M6u1P1UxOrP9bNPjPB0V15DUj+Y/1dFIjf/GCnYoCwc="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "IPython==7.16.1" "IPython" \ - --replace "diskcache==5.1.0" "diskcache>=5.1.0" \ - --replace "radish-bdd==0.13.1" "radish-bdd" \ - ''; + build-system = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + pythonRelaxDeps = [ + "radish-bdd" + "IPython" + ]; + + dependencies = with python3.pkgs; [ diskcache emoji filetype diff --git a/pkgs/by-name/te/testssl/package.nix b/pkgs/by-name/te/testssl/package.nix index cc9f1e1c8469..929940124146 100644 --- a/pkgs/by-name/te/testssl/package.nix +++ b/pkgs/by-name/te/testssl/package.nix @@ -6,7 +6,7 @@ dnsutils, coreutils, openssl, - nettools, + net-tools, util-linux, procps, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils # for printf dnsutils # for dig - nettools # for hostname + net-tools # for hostname openssl # for openssl procps # for ps util-linux # for hexdump diff --git a/pkgs/by-name/th/thonny/package.nix b/pkgs/by-name/th/thonny/package.nix index c99854b9adaa..0a8b0cc8b0d9 100644 --- a/pkgs/by-name/th/thonny/package.nix +++ b/pkgs/by-name/th/thonny/package.nix @@ -8,12 +8,10 @@ desktopToDarwinBundle, }: -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "thonny"; version = "4.1.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "thonny"; @@ -40,6 +38,8 @@ buildPythonApplication rec { }) ]; + build-system = with python3.pkgs; [ setuptools ]; + dependencies = with python3.pkgs; ( @@ -71,6 +71,8 @@ buildPythonApplication rec { # Tests need a DISPLAY doCheck = false; + pythonImportsCheck = [ "thonny" ]; + meta = { description = "Python IDE for beginners"; longDescription = '' diff --git a/pkgs/by-name/ti/timetagger_cli/package.nix b/pkgs/by-name/ti/timetagger_cli/package.nix index 55cd89448477..a3edce502af7 100644 --- a/pkgs/by-name/ti/timetagger_cli/package.nix +++ b/pkgs/by-name/ti/timetagger_cli/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "timetagger_cli"; version = "25.5.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "almarklein"; @@ -16,14 +16,19 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-UklsHcVyCpWDHOxu+oB8RvwY+laEBFnDyjejS/GzgHE="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ requests toml + dateparser ]; # Project has no tests doCheck = false; + pythonImportsCheck = [ "timetagger_cli" ]; + meta = with lib; { description = "Track your time from the command-line"; homepage = "https://github.com/almarklein/timetagger_cli"; diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix index d2c08048e477..8fa90c7c3254 100644 --- a/pkgs/by-name/ti/tiny-dfr/package.nix +++ b/pkgs/by-name/ti/tiny-dfr/package.nix @@ -7,6 +7,7 @@ gdk-pixbuf, glib, libinput, + librsvg, libxml2, pango, udev, @@ -15,17 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "tiny-dfr"; - version = "0.3.2"; + version = "0.3.5"; src = fetchFromGitHub { - owner = "WhatAmISupposedToPutHere"; + owner = "AsahiLinux"; repo = "tiny-dfr"; - rev = "v${version}"; - hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4="; + tag = "v${version}"; + hash = "sha256-G4OeYZH3VF6fKWxHYLTmwzQmQ4JupgYNH/6aJSgINvg="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-9UlH2W8wNzdZJxIgOafGylliS2RjaBlpirxSWHJ/SIQ="; + cargoHash = "sha256-/PtoAc2ZNJfW5gegcFQAAlEmjSMysZ+QebVfHtW35Nk="; nativeBuildInputs = [ pkg-config @@ -36,6 +36,7 @@ rustPlatform.buildRustPackage rec { gdk-pixbuf glib libinput + librsvg libxml2 pango udev @@ -55,7 +56,7 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; meta = with lib; { - homepage = "https://github.com/WhatAmISupposedToPutHere/tiny-dfr"; + homepage = "https://github.com/AsahiLinux/tiny-dfr"; description = "Most basic dynamic function row daemon possible"; license = [ licenses.asl20 diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix index 17b95f7dbdeb..661eb2246165 100644 --- a/pkgs/by-name/ti/tiny-rdm/package.nix +++ b/pkgs/by-name/ti/tiny-rdm/package.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { pname = "tiny-rdm"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "tiny-craft"; repo = "tiny-rdm"; tag = "v${finalAttrs.version}"; - hash = "sha256-7e+thMIEYmPHJAePJdEQo1q/Zzf+iKPhlkqrrr2O9iE="; + hash = "sha256-wSTC9Ne/Q9LLZL2+8ObMFCXrf4VSI0LkZhHHbAiXCYE="; }; postPatch = '' @@ -31,13 +31,13 @@ buildGoModule (finalAttrs: { --replace-fail "prefStore.autoCheckUpdate" "false" ''; - vendorHash = "sha256-LWa0eZibFc7bXYMWgm+/awOaerd6kBrFpk/dDSGoKlE="; + vendorHash = "sha256-Hh/qudoCZtIHJLsI6GQ814W4nC/uRd4gQd0PobzMlnQ="; env = { CGO_ENABLED = 1; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/frontend"; - hash = "sha256-/kkLabtYXcipyiBpY2UFYBbbbNYHaFqYSNgLYiwErGc="; + hash = "sha256-dcoTwfRocVjpBzqS9f2MkXjzcCI5sLjRZ3UC/Ml+7T0="; }; npmRoot = "frontend"; }; diff --git a/pkgs/by-name/ti/tinyprog/package.nix b/pkgs/by-name/ti/tinyprog/package.nix index a57d25473b6f..a0d7cf880a40 100644 --- a/pkgs/by-name/ti/tinyprog/package.nix +++ b/pkgs/by-name/ti/tinyprog/package.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "tinyprog"; # `python setup.py --version` from repo checkout version = "1.0.24.dev114+g${lib.substring 0 7 src.rev}"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "tinyfpga"; @@ -20,19 +20,22 @@ buildPythonApplication rec { sourceRoot = "${src.name}/programmer"; - propagatedBuildInputs = [ + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = [ pyserial jsonmerge intelhex tqdm six packaging - setuptools + setuptools # pkg_resources is imported during runtime pyusb ]; - nativeBuildInputs = [ setuptools-scm ]; - meta = with lib; { homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer"; description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 2024fbf72c38..62c0fd789133 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -26,7 +26,6 @@ libsoup_3, json-glib, avahi, - systemd, dbus, man-db, writeText, @@ -75,22 +74,17 @@ stdenv.mkDerivation (finalAttrs: { mesonEmulatorHook ]; - buildInputs = - [ - glib - libxml2 - sqlite - icu - libsoup_3 - libuuid - json-glib - avahi - libstemmer - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - systemd - ]; + buildInputs = [ + glib + libxml2 + sqlite + icu + libsoup_3 + libuuid + json-glib + avahi + libstemmer + ]; nativeCheckInputs = [ dbus @@ -100,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddocs=true" + "-Dsystemd_user_services_dir=${placeholder "out"}/lib/systemd/user" (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "vapi" withIntrospection) ] @@ -114,10 +109,7 @@ stdenv.mkDerivation (finalAttrs: { [ "--cross-file=${crossFile}" ] - ) - ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ - "-Dsystemd_user_services=false" - ]; + ); doCheck = true; diff --git a/pkgs/by-name/to/tockloader/package.nix b/pkgs/by-name/to/tockloader/package.nix index 5f8f6f710bae..32b6181c6f57 100644 --- a/pkgs/by-name/to/tockloader/package.nix +++ b/pkgs/by-name/to/tockloader/package.nix @@ -7,14 +7,16 @@ python3.pkgs.buildPythonApplication rec { pname = "tockloader"; version = "1.9.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-7W55jugVtamFUL8N3dD1LFLJP2UDQb74V6o96rd/tEg="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ argcomplete colorama crcmod @@ -32,6 +34,8 @@ python3.pkgs.buildPythonApplication rec { runHook postCheck ''; + pythonImportsCheck = [ "tockloader" ]; + meta = { description = "Tool for programming Tock onto hardware boards"; mainProgram = "tockloader"; diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index b0452059e350..fe3089f9ff8b 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.4.25"; + version = "0.4.30"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-EVr4qybyLtGgNde0uuNoQYv2jugNGJups5HUcs7n4KI="; + hash = "sha256-jRal4zwuP3kniS4vfS97sYKuXC+3I3kLMaBKbpa3ZUg="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-vtaif74fYBCP0AAL1NFXxHJ/casZGwTJsmwZLiWqY64="; + cargoHash = "sha256-JZlWYzKK6un1IMpHZ/o7SibLHROIitDpVgIRds3m5Ns="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/by-name/to/toybox/package.nix b/pkgs/by-name/to/toybox/package.nix index e12d2f9edc98..84dde2316d7c 100644 --- a/pkgs/by-name/to/toybox/package.nix +++ b/pkgs/by-name/to/toybox/package.nix @@ -64,7 +64,19 @@ stdenv.mkDerivation rec { make oldconfig ''; - makeFlags = [ "PREFIX=$(out)/bin" ] ++ optionals enableStatic [ "LDFLAGS=--static" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [ + # breaks string.h header in musl + "fortify" + ]; + + makeFlags = + [ + "PREFIX=$(out)/bin" + "CC=${stdenv.cc.targetPrefix}cc" + ] + ++ optionals (enableStatic && !stdenv.hostPlatform.isDarwin) [ + "LDFLAGS=--static" + ]; installTargets = [ "install_flat" ]; diff --git a/pkgs/by-name/tp/tproxy/package.nix b/pkgs/by-name/tp/tproxy/package.nix index 451fb3d0a35f..3d864c06552c 100644 --- a/pkgs/by-name/tp/tproxy/package.nix +++ b/pkgs/by-name/tp/tproxy/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tproxy"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "kevwan"; repo = "tproxy"; tag = "v${version}"; - hash = "sha256-LiYZ9S7Jga4dQWHmqsPvlGDAAw5reO16LAYaNJZFnhE="; + hash = "sha256-Ck7WtCxWiZxkKlx7D/N0EZmFEgrW7MpPj5ATvJxGXgg="; }; - vendorHash = "sha256-YjkYb5copw0SM2lago+DyVgHIrqLDSBnO+4zLMq+YJ8="; + vendorHash = "sha256-xYPF3RGrOQ1e2EPHtvlM9QKSE+V4cnG8f9JTS0hkAYU="; ldflags = [ "-w" diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 2fcf417165a0..61cae96e1104 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -129,7 +129,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mpickering nagisa - paveloom ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index 32a0693eee8a..ab792f8f5b3e 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -8,16 +8,16 @@ buildGo124Module (finalAttrs: { pname = "traefik"; - version = "3.4.3"; + version = "3.4.4"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz"; - hash = "sha256-fxFr0PRKMYf5KpyFUoEv4TEJBmwTr1s5CRAZyHAgfqM="; + hash = "sha256-v9czTMaNcl4Aov6w4+CAM6YQoyIEy90eBfwrnmQVmgQ="; stripRoot = false; }; - vendorHash = "sha256-nh5l71iRnT32mceeS7slksP3hjQP4hO4AKIvlO+CYMQ="; + vendorHash = "sha256-y0RibDQF+iG3HCX2FkEqxxn8bsC7zc4rQyRyq8oRgQM="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/by-name/tr/trash-cli/package.nix b/pkgs/by-name/tr/trash-cli/package.nix index b86a434cb10c..b645d5a3ec78 100644 --- a/pkgs/by-name/tr/trash-cli/package.nix +++ b/pkgs/by-name/tr/trash-cli/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; version = "0.24.5.26"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "andreafrancia"; @@ -18,14 +18,18 @@ python3Packages.buildPythonApplication rec { hash = "sha256-ltuMnxtG4jTTSZd6ZHWl8wI0oQMMFqW0HAPetZMfGtc="; }; - propagatedBuildInputs = with python3Packages; [ - psutil - six + nativeBuildInputs = [ + installShellFiles ]; - nativeBuildInputs = with python3Packages; [ - installShellFiles - shtab + build-system = with python3Packages; [ + setuptools + shtab # for shell completions + ]; + + dependencies = with python3Packages; [ + psutil + six ]; nativeCheckInputs = with python3Packages; [ @@ -58,6 +62,9 @@ python3Packages.buildPythonApplication rec { runHook postInstallCheck ''; + + pythonImportsCheck = [ "trashcli" ]; + postInstall = '' for bin in trash-empty trash-list trash-restore trash-put trash; do installShellCompletion --cmd "$bin" \ diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 03204b1428f2..31a077a5a99e 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "trickest-cli"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "trickest"; repo = "trickest-cli"; tag = "v${version}"; - hash = "sha256-OuCiW/5g4swtSpqM2rhLyB1syiRkyTbJsghEvyosz/A="; + hash = "sha256-rYdv0OkABV2ih5u28AoxAg3qabbl2VQnuQ01PCXPY6M="; }; vendorHash = "sha256-Ae0fNzYOAeCMrNFVhw4VvG/BkOMcguIMiBvLGt7wxEo="; diff --git a/pkgs/by-name/tr/trzsz-ssh/package.nix b/pkgs/by-name/tr/trzsz-ssh/package.nix new file mode 100644 index 000000000000..dd97c6bc76fb --- /dev/null +++ b/pkgs/by-name/tr/trzsz-ssh/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "trzsz-ssh"; + version = "0.1.22"; + + src = fetchFromGitHub { + owner = "trzsz"; + repo = "trzsz-ssh"; + tag = "v${finalAttrs.version}"; + hash = "sha256-VvPdWRP+lrhho+Bk5rT9pktEvKe01512WoDfAu5d868="; + }; + + vendorHash = "sha256-EllXxDyWI4Dy5E6KnzYFxuYDQcdk9+01v5svpARZU44="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "SSH client designed as a drop-in replacement for the openssh client"; + homepage = "https://github.com/trzsz/trzsz-ssh"; + changelog = "https://github.com/trzsz/trzsz-ssh/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rewine ]; + mainProgram = "trzsz-ssh"; + }; +}) diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix index f902d7a7bccd..43e081b470d2 100644 --- a/pkgs/by-name/ts/tsx/package.nix +++ b/pkgs/by-name/ts/tsx/package.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-57KDZ9cHb7uqnypC0auIltmYMmIhs4PWyf0HTRWEFiU="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tt/tt-metal/deps.nix b/pkgs/by-name/tt/tt-metal/deps.nix new file mode 100644 index 000000000000..af2f5dd7cc21 --- /dev/null +++ b/pkgs/by-name/tt/tt-metal/deps.nix @@ -0,0 +1,130 @@ +{ fetchFromGitHub }: +{ + yaml-cpp = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "2f86d13775d119edbb69af52e5f566fd65c6953b"; + hash = "sha256-GtUTbEaRR3+GfVkt3t8EsqBHVffVKOl8urtQTaHozIo="; + }; + googletest = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + tag = "v1.13.0"; + hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; + }; + reflect = fetchFromGitHub { + owner = "boost-ext"; + repo = "reflect"; + tag = "v1.2.6"; + hash = "sha256-qjy5KyAm7/WeCyxMu/5QrBVjDSJPs0q/ZPyQwXp0WLA="; + }; + magic_enum = fetchFromGitHub { + owner = "Neargye"; + repo = "magic_enum"; + tag = "v0.9.7"; + hash = "sha256-P6fl/dcGOSE1lTJwZlimbvsTPelHwdQdZr18H4Zji20="; + }; + fmt = fetchFromGitHub { + owner = "fmtlib"; + repo = "fmt"; + tag = "11.1.4"; + hash = "sha256-sUbxlYi/Aupaox3JjWFqXIjcaQa0LFjclQAOleT+FRA="; + }; + range-v3 = fetchFromGitHub { + owner = "ericniebler"; + repo = "range-v3"; + tag = "0.12.0"; + hash = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU="; + }; + pybind11 = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11"; + tag = "v2.13.6"; + hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU="; + }; + nlohmann_json = fetchFromGitHub { + owner = "nlohmann"; + repo = "json"; + tag = "v3.11.3"; + hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg="; + }; + xtl = fetchFromGitHub { + owner = "xtensor-stack"; + repo = "xtl"; + tag = "0.8.0"; + hash = "sha256-hhXM2fG3Yl4KeEJlOAcNPVLJjKy9vFlI63lhbmIAsT8="; + }; + xtensor = fetchFromGitHub { + owner = "xtensor-stack"; + repo = "xtensor"; + tag = "0.26.0"; + hash = "sha256-gAGLb5NPT4jiIpXONqY+kalxKCFKFXlNqbM79x1lTKE="; + }; + xtensor-blas = fetchFromGitHub { + owner = "xtensor-stack"; + repo = "xtensor-blas"; + tag = "0.22.0"; + hash = "sha256-Lg6MjJbZUCMqv4eSiZQrLfJy/86RWQ9P85UfeIQJ6bk="; + }; + benchmark = fetchFromGitHub { + owner = "google"; + repo = "benchmark"; + tag = "v1.9.1"; + hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8="; + }; + taskflow = fetchFromGitHub { + owner = "taskflow"; + repo = "taskflow"; + tag = "v3.7.0"; + hash = "sha256-q2IYhG84hPIZhuogWf6ojDG9S9ZyuJz9s14kQyIc6t0="; + }; + flatbuffers = fetchFromGitHub { + owner = "google"; + repo = "flatbuffers"; + tag = "v24.3.25"; + hash = "sha256-uE9CQnhzVgOweYLhWPn2hvzXHyBbFiFVESJ1AEM3BmA="; + }; + simd-everywhere = fetchFromGitHub { + owner = "simd-everywhere"; + repo = "simde"; + tag = "v0.8.2"; + hash = "sha256-igjDHCpKXy6EbA9Mf6peL4OTVRPYTV0Y2jbgYQuWMT4="; + }; + spdlog = fetchFromGitHub { + owner = "gabime"; + repo = "spdlog"; + tag = "v1.15.2"; + hash = "sha256-9RhB4GdFjZbCIfMOWWriLAUf9DE/i/+FTXczr0pD0Vg="; + }; + tt-logger = fetchFromGitHub { + owner = "tenstorrent"; + repo = "tt-logger"; + tag = "v1.1.3"; + hash = "sha256-N7Rs6mrs800B7XONCOOxR8koVEMWakZ1f2pexRwnUh8="; + }; + nanomsg = fetchFromGitHub { + owner = "nanomsg"; + repo = "nng"; + tag = "v1.8.0"; + hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA="; + }; + libuv = fetchFromGitHub { + owner = "libuv"; + repo = "libuv"; + tag = "v1.48.0"; + hash = "sha256-U68BmIQNpmIy3prS7LkYl+wvDJQNikoeFiKh50yQFoA="; + }; + cxxopts = fetchFromGitHub { + owner = "jarro2783"; + repo = "cxxopts"; + rev = "dbf4c6a66816f6c3872b46cc6af119ad227e04e1"; + hash = "sha256-2Z8DT9ihlmbiqCi8gcNzW4C5AUh4xCrpCKrGbRYcreQ="; + }; + nanobind = fetchFromGitHub { + owner = "wjakob"; + repo = "nanobind"; + tag = "v2.7.0"; + fetchSubmodules = true; + hash = "sha256-ex5svqDp9XJtiNCxu0249ORL6LbG679U6PvKQaWANmE="; + }; +} diff --git a/pkgs/by-name/tt/tt-metal/package.nix b/pkgs/by-name/tt/tt-metal/package.nix new file mode 100644 index 000000000000..e97680b4631d --- /dev/null +++ b/pkgs/by-name/tt/tt-metal/package.nix @@ -0,0 +1,101 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + callPackage, + pkg-config, + cmake, + ninja, + boost, + numactl, + mpi, + hwloc, + python3, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "tt-metal"; + version = "0.59.1"; + + src = fetchFromGitHub { + owner = "tenstorrent"; + repo = "tt-metal"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-iDO9q79gurIpIR+6swywlxTe3XI/2ToZxz11EuXc0gI="; + }; + + cpm = fetchurl { + url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.40.2/CPM.cmake"; + hash = "sha256-yM3DLAOBZTjOInge1ylk3IZLKjSjENO3EEgSpcotg10="; + }; + + sfpi = callPackage ./sfpi.nix { }; + + postUnpack = '' + mkdir -p "$sourceRoot/runtime" + ln -s "$sfpi" "$sourceRoot/runtime/sfpi" + ''; + + postPatch = '' + cp $cpm cmake/CPM.cmake + cp $cpm tt_metal/third_party/umd/cmake/CPM.cmake + ''; + + cmakeFlags = [ + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeBool "CPM_USE_LOCAL_PACKAGES" true) + (lib.cmakeFeature "VERSION_NUMERIC" finalAttrs.version) + ]; + + preConfigure = '' + mkdir -p build/_deps + ${lib.concatMapAttrsStringSep "\n" + (name: src: "cp -r --no-preserve=ownership,mode ${src} build/_deps/${name}-src") + ( + import ./deps.nix { + inherit fetchFromGitHub; + } + ) + } + cp $cpm build/_deps/tt-logger-src/cmake/CPM.cmake + ''; + + # CMake install fails because "$out/include/tt-logger" tree does not exist. + preInstall = '' + mkdir -p $out/include + cp -r ../build/_deps/tt-logger-src/include/tt-logger $out/include/tt-logger + ''; + + postInstall = '' + substituteInPlace $out/share/pkgconfig/magic_enum.pc \ + --replace-fail 'includedir=''${prefix}/' "includedir=" + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + python3 + ]; + + buildInputs = [ + numactl + boost + mpi + hwloc + ]; + + # Fixes the parallel hook crashing in the fixupPhase with no error. + noAuditTmpdir = true; + + meta = { + description = "TT-NN operator library, and TT-Metalium low level kernel programming model"; + homepage = "https://github.com/tenstorrent/tt-metal"; + maintainers = with lib.maintainers; [ RossComputerGuy ]; + license = with lib.licenses; [ asl20 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/tt/tt-metal/sfpi.nix b/pkgs/by-name/tt/tt-metal/sfpi.nix new file mode 100644 index 000000000000..01459602e496 --- /dev/null +++ b/pkgs/by-name/tt/tt-metal/sfpi.nix @@ -0,0 +1,48 @@ +{ + stdenv, + fetchurl, + runCommand, + autoPatchelfHook, + ncurses, + isl_0_23, + mpfr, + libmpc, + xz, +}: +let + version = "6.12.0"; +in +runCommand "sfpi-${version}" + { + inherit version; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + ncurses + isl_0_23 + mpfr + libmpc + xz + ]; + + src = + { + aarch64-linux = fetchurl { + url = "https://github.com/tenstorrent/sfpi/releases/download/v${version}/sfpi-aarch64_Linux.txz"; + hash = "sha256-4RGwYhsEGx1/ANBUmNeSQcdmMRjFXN8Bg3DICLF6d5o="; + }; + x86_64-linux = fetchurl { + url = "https://github.com/tenstorrent/sfpi/releases/download/v${version}/sfpi-x86_64_Linux.txz"; + hash = "sha256-hZvet4ErN1nNScjuU6YW7XEjvV9sR6xvb1IJjgMcXlg="; + }; + } + ."${stdenv.hostPlatform.system}" or (throw "SFPI does not support ${stdenv.hostPlatform.system}"); + } + '' + runPhase unpackPhase + cp -r ../"$sourceRoot" "$out" + runPhase fixupPhase + '' diff --git a/pkgs/by-name/tu/tuir/package.nix b/pkgs/by-name/tu/tuir/package.nix index 7570298cb6c8..638d639a9e38 100644 --- a/pkgs/by-name/tu/tuir/package.nix +++ b/pkgs/by-name/tu/tuir/package.nix @@ -8,7 +8,7 @@ with python3Packages; buildPythonApplication rec { pname = "tuir"; version = "1.31.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "Chocimier"; @@ -17,24 +17,9 @@ buildPythonApplication rec { hash = "sha256-VYBtD3Ex6+iIRNvX6jF0b0iPvno41/58xCRydiyssvk="; }; - # Tests try to access network - doCheck = false; + build-system = with python3Packages; [ setuptools ]; - checkPhase = '' - py.test - ''; - - nativeCheckInputs = [ - coverage - coveralls - docopt - mock - pylint - pytest - vcrpy - ]; - - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 decorator kitchen @@ -43,6 +28,27 @@ buildPythonApplication rec { six ]; + nativeCheckInputs = [ + coverage + coveralls + docopt + mock + pylint + pytestCheckHook + vcrpy + ]; + + __darwinAllowLocalNetworking = true; # for oauth tests + + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError: assert ['pbcopy', 'w'] == ['xclip', '-s..., 'clipboard'] + "test_copy_nix" + # AttributeError: Can't get local object 'Terminal.open_browser.open_browser..open_url_silent' + "test_terminal_open_browser_display" + ]; + + pythonImportsCheck = [ "tuir" ]; + meta = with lib; { description = "Browse Reddit from your Terminal (fork of rtv)"; mainProgram = "tuir"; diff --git a/pkgs/by-name/tv/tvnamer/package.nix b/pkgs/by-name/tv/tvnamer/package.nix index 1141a473d643..c5e83e3ab788 100644 --- a/pkgs/by-name/tv/tvnamer/package.nix +++ b/pkgs/by-name/tv/tvnamer/package.nix @@ -34,18 +34,22 @@ in pypkgs.buildPythonApplication rec { pname = "tvnamer"; version = "3.0.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04"; }; - propagatedBuildInputs = with pypkgs; [ tvdb-api ]; + build-system = with pypkgs; [ setuptools ]; + + dependencies = with pypkgs; [ tvdb-api ]; # no tests from pypi doCheck = false; + pythonImportsCheck = [ "tvnamer" ]; + meta = with lib; { description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api"; homepage = "https://github.com/dbr/tvnamer"; diff --git a/pkgs/by-name/tx/txt2tags/package.nix b/pkgs/by-name/tx/txt2tags/package.nix index 7f8a028cbd7d..59213b1913ea 100644 --- a/pkgs/by-name/tx/txt2tags/package.nix +++ b/pkgs/by-name/tx/txt2tags/package.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "txt2tags"; version = "3.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "txt2tags"; @@ -17,17 +17,21 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-PwPGJJg79ny13gEb1WmgIVHcXQppI/j5mhIyOZjR19k="; }; + build-system = with python3.pkgs; [ setuptools ]; + postPatch = '' substituteInPlace test/lib.py \ - --replace 'TXT2TAGS = os.path.join(TEST_DIR, "..", "txt2tags.py")' \ - 'TXT2TAGS = "${placeholder "out"}/bin/txt2tags"' \ - --replace "[PYTHON] + TXT2TAGS" "TXT2TAGS" + --replace-fail 'TXT2TAGS = os.path.join(TEST_DIR, "..", "txt2tags.py")' \ + 'TXT2TAGS = "${placeholder "out"}/bin/txt2tags"' \ + --replace-fail "[PYTHON] + TXT2TAGS" "TXT2TAGS" ''; checkPhase = '' ${python3.interpreter} test/run.py ''; + pythonImportsCheck = [ "txt2tags" ]; + meta = { changelog = "https://github.com/txt2tags/txt2tags/blob/${src.rev}/CHANGELOG.md"; description = "Convert between markup languages"; diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix index 97adcd8bb595..d78bc9ebd677 100644 --- a/pkgs/by-name/ty/typespec/package.nix +++ b/pkgs/by-name/ty/typespec/package.nix @@ -39,6 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { postPatch ; hash = "sha256-9RQZ2ycu78W3Ie6MLpo6x7Sa/iYsUdq5bYed56mOPxs="; + fetcherVersion = 1; }; postPatch = '' diff --git a/pkgs/by-name/ud/uddup/package.nix b/pkgs/by-name/ud/uddup/package.nix index 9f8ec15df2cf..1975e0d73274 100644 --- a/pkgs/by-name/ud/uddup/package.nix +++ b/pkgs/by-name/ud/uddup/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "uddup"; version = "0.9.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rotemreiss"; @@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg"; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ colorama ]; diff --git a/pkgs/by-name/ud/udocker/package.nix b/pkgs/by-name/ud/udocker/package.nix index bc87553651ec..49be910c01b3 100644 --- a/pkgs/by-name/ud/udocker/package.nix +++ b/pkgs/by-name/ud/udocker/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "udocker"; version = "1.3.17"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "indigo-dc"; @@ -30,6 +30,10 @@ python3Packages.buildPythonApplication rec { singularity ]; + build-system = with python3Packages; [ + setuptools + ]; + dependencies = with python3Packages; [ pycurl ]; @@ -49,6 +53,8 @@ python3Packages.buildPythonApplication rec { "tests/unit/test_dockerioapi.py" ]; + pythonImportsCheck = [ "udocker" ]; + passthru = { tests.version = testers.testVersion { package = udocker; }; }; diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix index 5a095b4411d8..8feaea98ae70 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -13,12 +13,12 @@ let pname = "uhk-agent"; - version = "7.0.1"; + version = "8.0.0"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-8zf6vhgZj8cY9XoI/6FZH1/xh7/I3vboVumLsTq3q8Q="; + sha256 = "sha256-1XgmGAjLoxJ9ZyeaDSk8UC9fVVwkY83i+DRBRIQz7/M="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ul/ulauncher/package.nix b/pkgs/by-name/ul/ulauncher/package.nix index b7b6e1f74baf..c9fdbcf6defa 100644 --- a/pkgs/by-name/ul/ulauncher/package.nix +++ b/pkgs/by-name/ul/ulauncher/package.nix @@ -23,15 +23,14 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; version = "5.15.7"; - format = "setuptools"; + pyproject = true; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; hash = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788="; }; - nativeBuildInputs = with python3Packages; [ - distutils-extra + nativeBuildInputs = [ gobject-introspection intltool wrapGAppsHook3 @@ -50,7 +49,12 @@ python3Packages.buildPythonApplication rec { wmctrl ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + distutils-extra + ]; + + dependencies = with python3Packages; [ mock dbus-python pygobject3 @@ -102,6 +106,8 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + pythonImportsCheck = [ "ulauncher" ]; + # do not double wrap dontWrapGApps = true; preFixup = '' diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix index 1de3507d4805..8fd010e52852 100644 --- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix +++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix @@ -13,13 +13,13 @@ }: python3Packages.buildPythonPackage rec { pname = "umu-launcher-unwrapped"; - version = "1.2.7"; + version = "1.2.9"; src = fetchFromGitHub { owner = "Open-Wine-Components"; repo = "umu-launcher"; tag = version; - hash = "sha256-G8UZvQ/pidh93FSsYq1dY0FTESWbksKAd9OU5Sxvv4I="; + hash = "sha256-nqI2XmMS28dvYrgD9kh7Xc510CvG7ifIybj+HlrU3qI="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/un/undervolt/package.nix b/pkgs/by-name/un/undervolt/package.nix index 3b75f468ca08..b00041ba1124 100644 --- a/pkgs/by-name/un/undervolt/package.nix +++ b/pkgs/by-name/un/undervolt/package.nix @@ -5,9 +5,9 @@ }: python3Packages.buildPythonApplication rec { - version = "0.4.0"; - format = "setuptools"; pname = "undervolt"; + version = "0.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "georgewhewell"; @@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-G+CK/lnZXkQdyNZPqY9P3owVJsd22H3K8wSpjHFG0ow="; }; + build-system = with python3Packages; [ setuptools ]; + + pythonImportsCheck = [ "undervolt" ]; + meta = with lib; { homepage = "https://github.com/georgewhewell/undervolt/"; description = "Program for undervolting Intel CPUs on Linux"; diff --git a/pkgs/by-name/un/undetected-chromedriver/package.nix b/pkgs/by-name/un/undetected-chromedriver/package.nix index 844bbe3b069c..4bf725552fad 100644 --- a/pkgs/by-name/un/undetected-chromedriver/package.nix +++ b/pkgs/by-name/un/undetected-chromedriver/package.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation (finalAttrs: { meta = chromedriver.meta // { description = "Custom Selenium ChromeDriver that passes all bot mitigation systems"; mainProgram = "undetected-chromedriver"; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/un/unhide/package.nix b/pkgs/by-name/un/unhide/package.nix index eede250876f5..2981a313bdd5 100644 --- a/pkgs/by-name/un/unhide/package.nix +++ b/pkgs/by-name/un/unhide/package.nix @@ -6,7 +6,7 @@ cmake, iproute2, lsof, - nettools, + net-tools, pkg-config, procps, psmisc, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ iproute2 lsof - nettools + net-tools procps psmisc ]; diff --git a/pkgs/by-name/un/unicode-emoji/package.nix b/pkgs/by-name/un/unicode-emoji/package.nix index 7751b455393a..84d08627bf89 100644 --- a/pkgs/by-name/un/unicode-emoji/package.nix +++ b/pkgs/by-name/un/unicode-emoji/package.nix @@ -6,7 +6,7 @@ }: let - version = "16.0"; + version = "17.0"; fetchData = { suffix, hash }: @@ -35,15 +35,15 @@ let srcs = { emoji-sequences = fetchData { suffix = "sequences"; - hash = "sha256-P+PHfnLo8m3zAtx9mbEGxdCP2Ajvckb7XUUC1ln+ZZw="; + hash = "sha256-M1txywy3BISmMxoXYzGmg+LOafAdZOtAPu5mnE1XA5g="; }; emoji-test = fetchData { suffix = "test"; - hash = "sha256-JPDFNOhs8ULiSWlT6PDkaj5wI5KRHt3NKcbM7YUTlpc="; + hash = "sha256-EYHEVX845REBhFBFD51CV02qiA0TQ9WsYfE0h34+veU="; }; emoji-zwj-sequences = fetchData { suffix = "zwj-sequences"; - hash = "sha256-lCPsI1R0NW+XCmllBnN+LV1lRTpn9F32a4u+kgw/q4M="; + hash = "sha256-WyVEHa7SMisGjF5wzaUilGpPAnTfhkRFoZZakuX8XK0="; }; }; in @@ -55,10 +55,10 @@ symlinkJoin { passthru = srcs; - meta = with lib; { + meta = { description = "Unicode Emoji Data Files"; homepage = "https://home.unicode.org/emoji/"; - license = licenses.unicode-dfs-2016; - platforms = platforms.all; + license = lib.licenses.unicode-dfs-2016; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/un/unicode-paracode/package.nix b/pkgs/by-name/un/unicode-paracode/package.nix index 004eab28cce9..2b3ac152a4ce 100644 --- a/pkgs/by-name/un/unicode-paracode/package.nix +++ b/pkgs/by-name/un/unicode-paracode/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "unicode"; version = "2.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "garabik"; @@ -26,9 +26,11 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; + build-system = with python3Packages; [ setuptools ]; + postFixup = '' substituteInPlace "$out/bin/.unicode-wrapped" \ - --replace "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" + --replace-fail "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" ''; postInstall = '' diff --git a/pkgs/by-name/un/unity-test/meson.patch b/pkgs/by-name/un/unity-test/meson.patch new file mode 100644 index 000000000000..4276fb2d1e56 --- /dev/null +++ b/pkgs/by-name/un/unity-test/meson.patch @@ -0,0 +1,18 @@ +diff --git a/meson.build b/meson.build +index 6585129..9489aef 100644 +--- a/meson.build ++++ b/meson.build +@@ -64,10 +64,10 @@ unity_dep = declare_dependency( + if not meson.is_subproject() + pkg = import('pkgconfig') + pkg.generate( +- name: meson.project_name(), ++ unity_lib, + version: meson.project_version(), +- libraries: [ unity_lib ], +- description: 'C Unit testing framework.' ++ subdirs: 'unity', ++ extra_cflags: unity_args, + ) + endif + diff --git a/pkgs/by-name/un/unity-test/package.nix b/pkgs/by-name/un/unity-test/package.nix index 4b0d280276c3..9adc30e47b03 100644 --- a/pkgs/by-name/un/unity-test/package.nix +++ b/pkgs/by-name/un/unity-test/package.nix @@ -2,9 +2,33 @@ lib, stdenv, fetchFromGitHub, - cmake, -}: + fetchpatch2, + meson, + ninja, + ruby, + python3Minimal, + nix-update-script, + testers, + iniparser, + validatePkgConfig, + # Adds test groups and extra CLI flags. + buildFixture ? false, + # Adds the ablilty to track malloc and free calls. + # Note that if fixtures are enabled, this option is ignored + # and will always be enabled. + buildMemory ? buildFixture, + # Adds double precision floating point assertions + supportDouble ? false, +}: +let + # On newer versions of Clang, Weverything is too much of everything. + ignoredErrors = [ + "-Wno-unsafe-buffer-usage" + "-Wno-reserved-identifier" + "-Wno-extra-semi-stmt" + ]; +in stdenv.mkDerivation (finalAttrs: { pname = "unity-test"; version = "2.6.1"; @@ -16,13 +40,85 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-g0ubq7RxGQmL1R6vz9RIGJpVWYsgrZhsTWSrL1ySEug="; }; - nativeBuildInputs = [ cmake ]; + patches = [ + # The meson file does not have the subdir set correctly + (fetchpatch2 { + url = "https://patch-diff.githubusercontent.com/raw/ThrowTheSwitch/Unity/pull/771.patch"; + hash = "sha256-r8ldVb7WrzVwTC2CtGul9Jk4Rzt+6ejk+paYAfFlR5M="; + }) + # Fix up the shebangs in the auto directory as not all are correct + (fetchpatch2 { + url = "https://patch-diff.githubusercontent.com/raw/ThrowTheSwitch/Unity/pull/790.patch"; + hash = "sha256-K+OxMe/ZMXPPjZXjGhgc5ULLN7plBwL0hV5gwmgA3FM="; + }) + ]; + + postPatch = '' + patchShebangs --build auto + ''; + + outputs = [ + "out" + "dev" + ]; + + strictDeps = true; + nativeBuildInputs = [ + meson + ninja + python3Minimal + validatePkgConfig + ]; + + # For the helper shebangs + buildInputs = [ + python3Minimal + ruby + ]; + + mesonFlags = [ + (lib.mesonBool "extension_memory" buildMemory) + (lib.mesonBool "extension_fixture" buildFixture) + (lib.mesonBool "support_double" supportDouble) + ]; + doCheck = true; + checkPhase = '' + runHook preCheck + + make -C../test -j $NIX_BUILD_CORES ${lib.optionalString stdenv.cc.isClang "CC=clang"} E="-Weverything ${lib.escapeShellArgs ignoredErrors}" test + + runHook postCheck + ''; + + # Various helpers + postInstall = '' + mkdir -p "$out/share" + install -Dm755 ../auto/* -t "$out/share/" + ''; + + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit iniparser; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + }; + }; + meta = { description = "Unity Unit Testing Framework"; homepage = "https://www.throwtheswitch.org/unity"; + changelog = "https://github.com/ThrowTheSwitch/Unity/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.i01011001 ]; + platforms = lib.platforms.all; + pkgConfigModules = [ "unity" ]; + maintainers = with lib.maintainers; [ + i01011001 + RossSmyth + ]; }; }) diff --git a/pkgs/by-name/un/unix-privesc-check/package.nix b/pkgs/by-name/un/unix-privesc-check/package.nix index aacd8e29394f..a20adcd41ce0 100644 --- a/pkgs/by-name/un/unix-privesc-check/package.nix +++ b/pkgs/by-name/un/unix-privesc-check/package.nix @@ -11,7 +11,7 @@ glibc, gnugrep, gnused, - nettools, + net-tools, openssh, postgresql, ps, @@ -48,7 +48,7 @@ resholve.mkDerivation rec { glibc # for ldd command gnugrep gnused - nettools + net-tools openssh postgresql # for psql command ps diff --git a/pkgs/by-name/un/unixbench/package.nix b/pkgs/by-name/un/unixbench/package.nix index 52ccbc26a416..2179124818cc 100644 --- a/pkgs/by-name/un/unixbench/package.nix +++ b/pkgs/by-name/un/unixbench/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ coreutils - unixtools.nettools + unixtools.net-tools unixtools.locale targetPackages.stdenv.cc gnugrep diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix index 02784951d806..4b7a8077bc70 100644 --- a/pkgs/by-name/un/unsilence/package.nix +++ b/pkgs/by-name/un/unsilence/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec { pname = "unsilence"; version = "1.0.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "lagmoellertim"; @@ -16,13 +16,12 @@ python3Packages.buildPythonPackage rec { hash = "sha256-M4Ek1JZwtr7vIg14aTa8h4otIZnPQfKNH4pZE4GpiBQ="; }; - nativeBuildInputs = with python3Packages; [ - rich + build-system = with python3Packages; [ + setuptools ]; - propagatedBuildInputs = [ - python3Packages.rich - python3Packages.setuptools # imports pkg_resources.parse_version + dependencies = with python3Packages; [ + rich ]; makeWrapperArgs = [ diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix index ad86a7220300..8ae5be32171b 100644 --- a/pkgs/by-name/up/upcloud-cli/package.nix +++ b/pkgs/by-name/up/upcloud-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "upcloud-cli"; - version = "3.20.1"; + version = "3.20.2"; src = fetchFromGitHub { owner = "UpCloudLtd"; repo = "upcloud-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-X+nv9MA20z2fJ2N+gyUkwGCHjX2hYMHSv8jfwKbegNE="; + hash = "sha256-M2xGrJKZRlC3YS6JBvLRahX2gm12kctM3waQ1sQ/BHQ="; }; - vendorHash = "sha256-kyIsTNLC1hKsSbZel97eUtBLyH/3iTEvSMsV+6u347c="; + vendorHash = "sha256-EytU3BuAdW3p54SOvgnfohODbd11PYLk4HC5Ix393XU="; ldflags = [ "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${finalAttrs.version}" diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix index d653389865c4..972cd24c1cfd 100644 --- a/pkgs/by-name/ur/urlwatch/package.nix +++ b/pkgs/by-name/ur/urlwatch/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; version = "2.29"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "thp"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ cssselect jq keyring @@ -35,6 +37,8 @@ python3Packages.buildPythonApplication rec { # no tests doCheck = false; + pythonImportsCheck = [ "urlwatch" ]; + meta = with lib; { description = "Tool for monitoring webpages for updates"; mainProgram = "urlwatch"; diff --git a/pkgs/by-name/us/usbrip/package.nix b/pkgs/by-name/us/usbrip/package.nix index f44552e5c236..9c07a2002f03 100644 --- a/pkgs/by-name/us/usbrip/package.nix +++ b/pkgs/by-name/us/usbrip/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication { pname = "usbrip"; version = "unstable-2021-07-02"; - format = "setuptools"; + pyproject = true; disabled = python3.pythonOlder "3.6"; @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication { sha256 = "1vws8ybhv7szpqvlbmv0hrkys2fhhaa5bj9dywv3q2y1xmljl0py"; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ termcolor terminaltables tqdm @@ -27,9 +29,8 @@ python3.pkgs.buildPythonApplication { postPatch = '' # Remove install helpers which we don't need substituteInPlace setup.py \ - --replace "parse_requirements('requirements.txt')," "[]," \ - --replace "resolve('wheel')" "" \ - --replace "'install': LocalInstallCommand," "" + --replace-fail "resolve('wheel')" "" \ + --replace-fail "'install': LocalInstallCommand," "" ''; # Project has no tests diff --git a/pkgs/by-name/us/usbsdmux/package.nix b/pkgs/by-name/us/usbsdmux/package.nix index cbdc49f19418..26945b0c8e98 100644 --- a/pkgs/by-name/us/usbsdmux/package.nix +++ b/pkgs/by-name/us/usbsdmux/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "usbsdmux"; version = "24.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -22,6 +22,8 @@ python3Packages.buildPythonApplication rec { --replace-fail 'TAG+="uaccess", GROUP="plugdev"' 'TAG+="uaccess"' ''; + build-system = with python3Packages; [ setuptools ]; + nativeBuildInputs = [ udevCheckHook ]; @@ -32,6 +34,8 @@ python3Packages.buildPythonApplication rec { install -Dm0444 -t $out/lib/udev/rules.d/ contrib/udev/99-usbsdmux.rules ''; + pythonImportsCheck = [ "usbsdmux" ]; + meta = with lib; { description = "Control software for the LXA USB-SD-Mux"; homepage = "https://github.com/linux-automation/usbsdmux"; diff --git a/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch b/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch new file mode 100644 index 000000000000..557924570c84 --- /dev/null +++ b/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch @@ -0,0 +1,31 @@ +From cfb80587da7bf3d6a8eeb9b846702d6d731aa1c6 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 9 Apr 2025 11:32:08 +0200 +Subject: [PATCH] libmount: (subdir) remove unused code + +The optlist already handles quoted values, so there's no need to do it +in the callers. + +Signed-off-by: Karel Zak +(cherry picked from commit 5462fa3435544344727b8644205ae427dfd5fcba) +--- + libmount/src/hook_subdir.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c +index 5949af7d8..1e5d79958 100644 +--- a/libmount/src/hook_subdir.c ++++ b/libmount/src/hook_subdir.c +@@ -329,9 +329,6 @@ static int is_subdir_required(struct libmnt_context *cxt, int *rc, char **subdir + + dir = mnt_opt_get_value(opt); + +- if (dir && *dir == '"') +- dir++; +- + if (!dir || !*dir) { + DBG(HOOK, ul_debug("failed to parse X-mount.subdir '%s'", dir)); + *rc = -MNT_ERR_MOUNTOPT; +-- +2.49.0 + diff --git a/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch b/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch new file mode 100644 index 000000000000..d96a303a9cc4 --- /dev/null +++ b/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch @@ -0,0 +1,80 @@ +From 22b91501d30a65d25ecf48ce5169ec70848117b8 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 9 Apr 2025 12:15:57 +0200 +Subject: [PATCH] libmount: (subdir) restrict for real mounts only + +It's now possible to use, for example, for bind operations, but it +does not make sense as you can specify the target with the +subdirectory. + +Signed-off-by: Karel Zak +(cherry picked from commit 437a271f7108f689d350f1b3d837490d3d283c3c) +--- + libmount/src/hook_subdir.c | 21 ++++++++++++++++----- + sys-utils/mount.8.adoc | 6 ++++-- + 2 files changed, 20 insertions(+), 7 deletions(-) + +diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c +index 1e5d79958..7cbb2c88d 100644 +--- a/libmount/src/hook_subdir.c ++++ b/libmount/src/hook_subdir.c +@@ -313,6 +313,7 @@ static int is_subdir_required(struct libmnt_context *cxt, int *rc, char **subdir + struct libmnt_optlist *ol; + struct libmnt_opt *opt; + const char *dir = NULL; ++ unsigned long flags = 0; + + assert(cxt); + assert(rc); +@@ -328,16 +329,26 @@ static int is_subdir_required(struct libmnt_context *cxt, int *rc, char **subdir + return 0; + + dir = mnt_opt_get_value(opt); +- + if (!dir || !*dir) { + DBG(HOOK, ul_debug("failed to parse X-mount.subdir '%s'", dir)); + *rc = -MNT_ERR_MOUNTOPT; +- } else { +- *subdir = strdup(dir); +- if (!*subdir) +- *rc = -ENOMEM; ++ return 0; ++ } ++ ++ *rc = mnt_optlist_get_flags(ol, &flags, cxt->map_linux, 0); ++ if (*rc) ++ return 0; ++ ++ if (flags & MS_REMOUNT || flags & MS_BIND || flags & MS_MOVE ++ || mnt_context_propagation_only(cxt)) { ++ DBG(HOOK, ul_debug("ignore subdir= (bind/move/remount/..)")); ++ return 0; + } + ++ *subdir = strdup(dir); ++ if (!*subdir) ++ *rc = -ENOMEM; ++ + return *rc == 0; + } + +diff --git a/sys-utils/mount.8.adoc b/sys-utils/mount.8.adoc +index 6a17cd5eb..d9ce31fd4 100644 +--- a/sys-utils/mount.8.adoc ++++ b/sys-utils/mount.8.adoc +@@ -763,8 +763,10 @@ Note that *mount*(8) still sanitizes and canonicalizes the source and target pat + *X-mount.noloop*:: + Do not create and mount a loop device, even if the source of the mount is a regular file. + +-*X-mount.subdir=*__directory__:: +-Allow mounting sub-directory from a filesystem instead of the root directory. For now, this feature is implemented by temporary filesystem root directory mount in unshared namespace and then bind the sub-directory to the final mount point and umount the root of the filesystem. The sub-directory mount shows up atomically for the rest of the system although it is implemented by multiple *mount*(2) syscalls. ++**X-mount.subdir=**_directory_:: ++Allow mounting a subdirectory of a filesystem instead of the root directory. This is effective only when a new instance of a filesystem is attached to the system. The option is silently ignored for operations like remount, bind mount, or move. +++ ++For now, this feature is implemented by a temporary filesystem root-directory mount in an unshared namespace and then binding the sub-directory to the final mount point and unmounting the root of the filesystem. The sub-directory mount shows up atomically for the rest of the system although it is implemented by multiple *mount*(2) syscalls. + + + Note that this feature will not work in session with an unshared private mount namespace (after *unshare --mount*) on old kernels or with *mount*(8) without support for file-descriptors-based mount kernel API. In this case, you need *unshare --mount --propagation shared*. + + +-- +2.49.0 + diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 92b7785d53f0..d93f0deb29a2 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation (finalPackage: rec { ./fix-darwin-build.patch # https://github.com/util-linux/util-linux/pull/3479 (fixes https://github.com/util-linux/util-linux/issues/3474) ./fix-mount-regression.patch + # https://github.com/util-linux/util-linux/pull/3530 + ./libmount-subdir-remove-unused-code.patch + ./libmount-subdir-restrict-for-real-mounts-only.patch ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ (fetchurl { diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index 381aeaf25cf4..faeb28220760 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valkey"; - version = "8.0.3"; + version = "8.1.2"; src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey"; rev = finalAttrs.version; - hash = "sha256-IzerctJUc478dJu2AH20s/A3psiAZWDjQG3USQWqpos="; + hash = "sha256-5wSUDNFQ6GWT9aGO3Msm+GFSXpNcty8L8UdGw4R0GDw="; }; patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; @@ -85,12 +85,14 @@ stdenv.mkDerivation (finalAttrs: { sed -i '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \ tests/support/util.tcl - # skip some more flaky tests + # Skip some more flaky tests. + # Skip test requiring custom jemalloc (unit/memefficiency). ./runtest \ --no-latency \ --timeout 2000 \ --clients $NIX_BUILD_CORES \ --tags -leaks \ + --skipunit unit/memefficiency \ --skipunit integration/failover \ --skipunit integration/aof-multi-part diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix index af436434833b..8c785eeb46cb 100644 --- a/pkgs/by-name/va/vals/package.nix +++ b/pkgs/by-name/va/vals/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "vals"; - version = "0.41.2"; + version = "0.41.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = "vals"; - sha256 = "sha256-cwyEg+5vysVaW+pe77e+CUJpYLJ6BediJZTaz/eZRAA="; + sha256 = "sha256-SY3GXctZS5lRKqMDn5AbNA6mY++6d3BtqCcHog5NtH8="; }; - vendorHash = "sha256-VOKvXovE/aagZOBFtF2o6/RhJMZhoZAHlVNqXD5Y7L4="; + vendorHash = "sha256-mTzKxVGirM/YClhNYVp9a2nuZMViAFYkl7Hq8D7ir/8="; proxyVendor = true; diff --git a/pkgs/by-name/va/vanguards/package.nix b/pkgs/by-name/va/vanguards/package.nix index f1b81fc4e699..6f2f77c941d5 100644 --- a/pkgs/by-name/va/vanguards/package.nix +++ b/pkgs/by-name/va/vanguards/package.nix @@ -6,7 +6,9 @@ python312Packages.buildPythonApplication { pname = "vanguards"; version = "0.3.1-unstable-2023-10-31"; - format = "setuptools"; + pyproject = true; + + build-system = [ python312Packages.setuptools ]; dependencies = [ python312Packages.stem ]; #tries to access the network during the tests, which fails @@ -25,6 +27,8 @@ python312Packages.buildPythonApplication { 'import stem.response.events' 'import stem.socket; import stem.control; import stem.response.events' ''; + pythonImportsCheck = [ "vanguards" ]; + meta = { maintainers = with lib.maintainers; [ ForgottenBeast ]; mainProgram = "vanguards"; diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix index 4515739d0598..3ab710244956 100644 --- a/pkgs/by-name/va/variety/package.nix +++ b/pkgs/by-name/va/variety/package.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { pname = "variety"; version = "0.8.13"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "varietywalls"; @@ -46,6 +46,8 @@ python3Packages.buildPythonApplication rec { librsvg ] ++ lib.optional appindicatorSupport libayatana-appindicator; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ @@ -85,6 +87,8 @@ python3Packages.buildPythonApplication rec { --replace-fail "{VARIETY_PATH}" "variety" ''; + pythonImportsCheck = [ "variety" ]; + meta = { homepage = "https://github.com/varietywalls/variety"; description = "Wallpaper manager for Linux systems"; diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix index bcb44ba4562d..c2308ccfe660 100644 --- a/pkgs/by-name/vc/vcluster/package.nix +++ b/pkgs/by-name/vc/vcluster/package.nix @@ -56,7 +56,6 @@ buildGoModule rec { license = lib.licenses.asl20; mainProgram = "vcluster"; maintainers = with lib.maintainers; [ - berryp peterromfeldhk qjoly ]; diff --git a/pkgs/by-name/vc/vcstool/package.nix b/pkgs/by-name/vc/vcstool/package.nix index 1d1ada92230f..d014089090a6 100644 --- a/pkgs/by-name/vc/vcstool/package.nix +++ b/pkgs/by-name/vc/vcstool/package.nix @@ -12,16 +12,18 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "04b3a963e15386660f139e5b95d293e43e3cb414e3b13e14ee36f5223032ee2c"; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = [ pyyaml - setuptools + setuptools # pkg_resources is imported during runtime ]; makeWrapperArgs = [ @@ -37,6 +39,8 @@ buildPythonApplication rec { doCheck = false; # requires network + pythonImportsCheck = [ "vcstool" ]; + meta = with lib; { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = "https://github.com/dirk-thomas/vcstool"; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index c6498b649e54..440ebab7b0c6 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname src; hash = "sha256-hO6QKRr4jTfesRDAEGcpFeJmGTGLGMw6EgIvD23DNzw="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/versionCheckHook/hook.sh b/pkgs/by-name/ve/versionCheckHook/hook.sh index ac4605640b70..4a977fe7a888 100644 --- a/pkgs/by-name/ve/versionCheckHook/hook.sh +++ b/pkgs/by-name/ve/versionCheckHook/hook.sh @@ -38,18 +38,24 @@ versionCheckHook(){ : "${versionCheckKeepEnvironment:=}" local cmdProgram cmdArg echoPrefix - if [[ -z "${versionCheckProgram-}" ]]; then - if [[ -z "${pname-}" ]]; then - echo "both \$pname and \$versionCheckProgram are empty, so" \ - "we don't know which program to run the versionCheckPhase" \ - "upon" >&2 - exit 2 - else - cmdProgram="${!outputBin}/bin/$pname" - fi - else + if [[ ! -z "${versionCheckProgram-}" ]]; then cmdProgram="$versionCheckProgram" + elif [[ ! -z "${NIX_MAIN_PROGRAM-}" ]]; then + cmdProgram="${!outputBin}/bin/${NIX_MAIN_PROGRAM}" + elif [[ ! -z "${pname-}" ]]; then + echo "versionCheckHook: Package \`${pname}\` does not have the \`meta.mainProgram\` attribute." \ + "We'll assume that the main program has the same name for now, but this behavior is deprecated," \ + "because it leads to surprising errors when the assumption does not hold." \ + "If the package has a main program, please set \`meta.mainProgram\` in its definition to make this warning go away." \ + "Should the binary that outputs the intended version differ from \`meta.mainProgram\`, consider setting \`versionCheckProgram\` instead." >&2 + cmdProgram="${!outputBin}/bin/${pname}" + else + echo "versionCheckHook: \$NIX_MAIN_PROGRAM, \$versionCheckProgram and \$pname are all empty, so" \ + "we don't know how to run the versionCheckPhase." \ + "To fix this, set one of \`meta.mainProgram\` or \`versionCheckProgram\`." >&2 + exit 2 fi + if [[ ! -x "$cmdProgram" ]]; then echo "versionCheckHook: $cmdProgram was not found, or is not an executable" >&2 exit 2 diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index de1b9f02c052..ec4a84039dff 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-2YVaDfvhmuUx2fVm9PuMPQ3Z5iu7IHJ7dgF52a1stoM="; + hash = "sha256-9wYIg1TGcntUMMp6SqYrgDRl3P41eeOqt76OMjSAi5M="; }; pnpmDeps = pnpm_10.fetchDeps { @@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - hash = "sha256-C05rDd5bcbR18O6ACgzS0pQdWzB99ulceOBpW+4Zbqw="; + fetcherVersion = 2; + hash = "sha256-rJzXbIQUxCImTqeH8EsGiyGNGoHYUqoekoa+VXpob5Y="; }; nativeBuildInputs = diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index a84434bc9520..13d2cbcba14a 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaLogs"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; - repo = "VictoriaMetrics"; - tag = "v${finalAttrs.version}-victorialogs"; - hash = "sha256-E52hvxazzbz9FcPFZFcRHs2vVg6fJJQ8HsieQovQSi4="; + repo = "VictoriaLogs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KhXB+37uK08dDYXtnaPDS7gP/gBGZ0gqyR0u572QOx8="; }; vendorHash = null; @@ -28,31 +28,12 @@ buildGoModule (finalAttrs: { "app/vlogscli" ]; - postPatch = '' - # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package - # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web - # - # This appears to be some kind of test server for development purposes only. - # rm -f app/vmui/packages/vmui/web/{go.mod,main.go} - - # Increase timeouts in tests to prevent failure on heavily loaded builders - substituteInPlace lib/storage/storage_test.go \ - --replace-fail "time.After(10 " "time.After(120 " \ - --replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \ - --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \ - ''; - ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${finalAttrs.version}" ]; - preCheck = '' - # `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset - export ldflags=''${ldflags//=${finalAttrs.version}/=} - ''; - __darwinAllowLocalNetworking = true; passthru = { @@ -61,9 +42,7 @@ buildGoModule (finalAttrs: { victorialogs ; }; - updateScript = nix-update-script { - extraArgs = [ "--version-regex=(.*)-victorialogs" ]; - }; + updateScript = nix-update-script { }; }; meta = { @@ -71,7 +50,7 @@ buildGoModule (finalAttrs: { description = "User friendly log database from VictoriaMetrics"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ marie ]; - changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/${finalAttrs.src.tag}"; mainProgram = "victoria-logs"; }; }) diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index 1096639899de..c703e6eca8f9 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -37,6 +37,7 @@ let sourceRoot ; hash = "sha256-94ZlywOZYmW/NsvE0dtEA81MeBWGUrJsBXTUauuOmZM="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/vim-vint/package.nix b/pkgs/by-name/vi/vim-vint/package.nix index f1f78a112597..2b5006e5ee91 100644 --- a/pkgs/by-name/vi/vim-vint/package.nix +++ b/pkgs/by-name/vi/vim-vint/package.nix @@ -4,12 +4,10 @@ fetchFromGitHub, }: -with python3Packages; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "vim-vint"; version = "0.3.21"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Vimjas"; @@ -18,18 +16,18 @@ buildPythonApplication rec { hash = "sha256-A0yXDkB/b9kEEXSoLeqVdmdm4p2PYL2QHqbF4FgAn30="; }; - # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. - disabled = !pythonAtLeast "3.5"; + build-system = with python3Packages; [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ ansicolor chardet pyyaml - setuptools + setuptools # pkg_resources is imported during runtime + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-cov-stub ]; preCheck = '' diff --git a/pkgs/by-name/vi/vimiv-qt/package.nix b/pkgs/by-name/vi/vimiv-qt/package.nix index 15d19936237f..e7f69c62da0b 100644 --- a/pkgs/by-name/vi/vimiv-qt/package.nix +++ b/pkgs/by-name/vi/vimiv-qt/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "vimiv-qt"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "karlch"; @@ -19,13 +19,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-28sk5qDVmrgXYX2wm5G8zv564vG6GwxNp+gjrFHCRfU="; }; + build-system = with python3.pkgs; [ setuptools ]; + nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook - python3.pkgs.setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ pyqt5 py3exiv2 ]; @@ -44,6 +45,8 @@ python3.pkgs.buildPythonApplication rec { done ''; + pythonImportsCheck = [ "vimiv" ]; + # Vimiv has to be wrapped manually because it is a non-ELF executable. dontWrapQtApps = true; preFixup = '' diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index 6c2ebe4384fa..ae64b13ece2c 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; version = "2.29"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "abbbi"; @@ -38,6 +38,8 @@ python3Packages.buildPythonApplication rec { versionCheckProgramArg = "-V"; + pythonImportsCheck = [ "libvirtnbdbackup" ]; + meta = { description = "Backup utility for Libvirt/qemu/kvm"; homepage = "https://github.com/abbbi/virtnbdbackup"; diff --git a/pkgs/by-name/vi/vit/package.nix b/pkgs/by-name/vi/vit/package.nix index a78636cfb762..88ab07958ba4 100644 --- a/pkgs/by-name/vi/vit/package.nix +++ b/pkgs/by-name/vi/vit/package.nix @@ -11,7 +11,7 @@ with python3Packages; buildPythonApplication rec { pname = "vit"; version = "2.3.3"; - format = "setuptools"; + pyproject = true; disabled = lib.versionOlder python.version "3.7"; src = fetchPypi { @@ -19,7 +19,9 @@ buildPythonApplication rec { hash = "sha256-+lrXGfhoB4z5IWkJTXMIm3GGVPfNGO9lUB3uFTx8hDY="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = [ tasklib urwid ]; @@ -37,6 +39,8 @@ buildPythonApplication rec { export TERM=''${TERM-linux} ''; + pythonImportsCheck = [ "vit" ]; + meta = with lib; { homepage = "https://github.com/scottkosty/vit"; description = "Visual Interactive Taskwarrior"; diff --git a/pkgs/by-name/vk/vkbasalt-cli/package.nix b/pkgs/by-name/vk/vkbasalt-cli/package.nix index f11a4890f454..c5e32ac4f5b8 100644 --- a/pkgs/by-name/vk/vkbasalt-cli/package.nix +++ b/pkgs/by-name/vk/vkbasalt-cli/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "vkbasalt-cli"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "TheEvilSkeleton"; @@ -19,9 +19,11 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace vkbasalt/lib.py \ - --replace /usr ${vkbasalt} + --replace-fail /usr ${vkbasalt} ''; + build-system = with python3Packages; [ setuptools ]; + pythonImportsCheck = [ "vkbasalt.lib" ]; meta = with lib; { diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix index 0ccdfa46688f..7b9cbe55c16f 100644 --- a/pkgs/by-name/vo/voicevox-core/package.nix +++ b/pkgs/by-name/vo/voicevox-core/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "voicevox-core"; - version = "0.15.8"; + version = "0.15.9"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; @@ -42,19 +42,19 @@ stdenv.mkDerivation (finalAttrs: { { "x86_64-linux" = fetchCoreArtifact { id = "linux-x64"; - hash = "sha256-n0rYSMR5wgjAtlQ4DWRAhJW/VevGG/Mmj6lXieG1U78="; + hash = "sha256-dEikEQcGL6h59nTxY833XGBawUjceq8NxIUVhRdQ2I8="; }; "aarch64-linux" = fetchCoreArtifact { id = "linux-arm64"; - hash = "sha256-GOgBH0UinZMiNszTp2CWJKT9prTi84KH3V9fxpmweeU="; + hash = "sha256-92aZEb2bz7xXA4uSo3lWy/cApr88I+yNqDlAWo6nFpg="; }; "x86_64-darwin" = fetchCoreArtifact { id = "osx-x64"; - hash = "sha256-8TRlu1ztPciKDX9Igr0TKcyLzP8WRwTN9F11MjXNNW8="; + hash = "sha256-/5MghfgI8wup+o+eYMgcjI9Mjkjt1NPuN0x3JnqAlxg="; }; "aarch64-darwin" = fetchCoreArtifact { id = "osx-arm64"; - hash = "sha256-6Na7LBZg2bWaX1VN6r6zdyg0mszBNn0e7u+cmqKVuY0="; + hash = "sha256-UrgI4dy/VQCLZ/gyMX0D0YPabtw3IA76CpjLmbFLQeY="; }; }; diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix index 0ca639093865..b999573501de 100644 --- a/pkgs/by-name/vo/voicevox-engine/package.nix +++ b/pkgs/by-name/vo/voicevox-engine/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "voicevox-engine"; - version = "0.24.0"; + version = "0.24.1"; pyproject = true; src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox_engine"; tag = version; - hash = "sha256-LFbKnNv+NNfA6dvgVGr8fGr+3o5/sAyZ8XFZan2EJUY="; + hash = "sha256-WoHTv4VjLFJPIi47WETMQM8JmgBctAWlue8yKmi1+6A="; }; patches = [ @@ -99,7 +99,7 @@ python3Packages.buildPythonApplication rec { owner = "VOICEVOX"; repo = "voicevox_resource"; tag = version; - hash = "sha256-/L7gqskzg7NFBO6Jg2MEMYuQeZK58hTWrRypTE42nGg="; + hash = "sha256-4D9b5MjJQq+oCqSv8t7CILgFcotbNBH3m2F/up12pPE="; }; pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { }; diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index d2ca2cda3f53..9b373173828d 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "voicevox"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox"; tag = finalAttrs.version; - hash = "sha256-2MXJOLt14zpoahYjd3l3q5UxT2yK/g/jksHO4Q7W6HA="; + hash = "sha256-ploFrzxIseyUD7LINnFmshrg3QJV8KUkdbvDoJ/VkRk="; }; patches = [ @@ -65,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ]; hash = "sha256-RKgqFmHQnjHS7yeUIbH9awpNozDOCCHplc/bmfxmMyg="; + fetcherVersion = 1; }; nativeBuildInputs = diff --git a/pkgs/by-name/vp/vpnc-scripts/package.nix b/pkgs/by-name/vp/vpnc-scripts/package.nix index 9be974347412..eaa27cc2d290 100644 --- a/pkgs/by-name/vp/vpnc-scripts/package.nix +++ b/pkgs/by-name/vp/vpnc-scripts/package.nix @@ -7,7 +7,7 @@ gnugrep, iproute2, makeWrapper, - nettools, + net-tools, openresolv, systemd, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, @@ -48,7 +48,7 @@ stdenv.mkDerivation { --prefix PATH : "${ lib.makeBinPath ( [ - nettools + net-tools gawk coreutils gnugrep diff --git a/pkgs/by-name/vs/vscode-css-languageserver/package.nix b/pkgs/by-name/vs/vscode-css-languageserver/package.nix index ac3f5e776ddf..fbc5a4934a32 100644 --- a/pkgs/by-name/vs/vscode-css-languageserver/package.nix +++ b/pkgs/by-name/vs/vscode-css-languageserver/package.nix @@ -9,18 +9,18 @@ buildNpmPackage (finalAttrs: { pname = "vscode-css-languageserver"; - version = "1.101.2"; + version = "1.102.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode"; tag = finalAttrs.version; - hash = "sha256-wdI6VlJ4WoSNnwgkb6dkVYcq/P/yzflv5mE9PuYBVx4="; + hash = "sha256-IfqtwH86R9yp9YEpRHvTz/SUwKzG/nwdEVneRYyAYJ8="; }; sourceRoot = "${finalAttrs.src.name}/extensions/css-language-features/server"; - npmDepsHash = "sha256-wGW2n+16NYHuFpYMq8nuvGgir8QwGc9Ud2yauR4ltIQ="; + npmDepsHash = "sha256-DUcH+C5LB794Op3FYnuL3uNrUCNAxWouqrtV6bpgqRI="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index 665dd9867921..153230409156 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.80.2"; + version = "0.80.3"; outputs = [ "out" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-siW+vQQ2M71JHy6hcTdNDz+d5i3+wHZTBTvAjE+s5G8="; + hash = "sha256-Lllv0/vqu3FTFmIiTnH2osN/aEQmE21ihUYnJ2709pk="; }; patches = [ diff --git a/pkgs/by-name/vt/vtfedit/package.nix b/pkgs/by-name/vt/vtfedit/package.nix index 77ee821ad7e4..6b8792452727 100644 --- a/pkgs/by-name/vt/vtfedit/package.nix +++ b/pkgs/by-name/vt/vtfedit/package.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.lgpl21Plus; inherit (wine.meta) platforms; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix index c35f81ce69f1..4aba8fa0a226 100644 --- a/pkgs/by-name/vt/vtsls/package.nix +++ b/pkgs/by-name/vt/vtsls/package.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { version ; hash = "sha256-SdqeTYRH60CyU522+nBo0uCDnzxDP48eWBAtGTL/pqg="; + fetcherVersion = 1; }; # Patches to get submodule sha from file instead of 'git submodule status' diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix index e0537c7afa32..d406c36da99a 100644 --- a/pkgs/by-name/wa/waagent/package.nix +++ b/pkgs/by-name/wa/waagent/package.nix @@ -16,7 +16,8 @@ in python.pkgs.buildPythonApplication rec { pname = "waagent"; version = "2.14.0.0"; - format = "setuptools"; + pyproject = true; + src = fetchFromGitHub { owner = "Azure"; repo = "WALinuxAgent"; @@ -47,7 +48,9 @@ python.pkgs.buildPythonApplication rec { --replace-fail '/usr/bin/openssl' '${openssl}/bin/openssl' ''; - propagatedBuildInputs = [ python.pkgs.distro ]; + build-system = with python.pkgs; [ setuptools ]; + + dependencies = with python.pkgs; [ distro ]; # The udev rules are placed to the wrong place. # Move them to their default location. diff --git a/pkgs/by-name/wa/wad/package.nix b/pkgs/by-name/wa/wad/package.nix index c1e21ab8261a..231c197832ea 100644 --- a/pkgs/by-name/wa/wad/package.nix +++ b/pkgs/by-name/wa/wad/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "wad"; version = "0.4.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "CERN-CERT"; @@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-/mlmOzFkyKpmK/uk4813Wk0cf/+ynX3Qxafnd1mGR5k="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ six ]; diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 2902a7fe55ca..2976bdd159ee 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-cZ8tt17m1KUGxYPJf+cHf9j8rzNCrGyY8rcZcSvebyY="; + hash = "sha256-srBBRe7OLNM86OVJYYk6A0EYJi+rdJ/xG7f+YBdrclE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index adb10abf9f32..2341006916f0 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -6,7 +6,7 @@ cmake, ninja, - removeReferencesTo, + sanitiseHeaderPathsHook, folly, fizz, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - removeReferencesTo + sanitiseHeaderPathsHook ]; buildInputs = [ @@ -109,18 +109,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - postFixup = '' - # Sanitize header paths to avoid runtime dependencies leaking in - # through `__FILE__`. - ( - shopt -s globstar - for header in "$dev/include"/**/*.h; do - sed -i "1i#line 1 \"$header\"" "$header" - remove-references-to -t "$dev" "$header" - done - ) - ''; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix index e783ca677f56..0bd38a45d10a 100644 --- a/pkgs/by-name/wa/warp-plus/package.nix +++ b/pkgs/by-name/wa/warp-plus/package.nix @@ -47,7 +47,7 @@ buildGoModule rec { description = "Warp + Psiphon, an anti censorship utility for Iran"; homepage = "https://github.com/bepass-org/warp-plus"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "warp-plus"; # Doesn't work with Go toolchain >1.22, runtime error: # 'panic: tls.ConnectionState doesn't match' diff --git a/pkgs/by-name/wa/watson/package.nix b/pkgs/by-name/wa/watson/package.nix index 0b761f2148a5..2d2f926a988a 100644 --- a/pkgs/by-name/wa/watson/package.nix +++ b/pkgs/by-name/wa/watson/package.nix @@ -6,12 +6,10 @@ fetchpatch, }: -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "watson"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jazzband"; @@ -29,25 +27,31 @@ buildPythonApplication rec { }) ]; + nativeBuildInputs = [ installShellFiles ]; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + arrow + click + click-didyoumean + requests + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + pytest-mock + mock + pytest-datafiles + ]; + postInstall = '' installShellCompletion --bash --name watson watson.completion installShellCompletion --zsh --name _watson watson.zsh-completion installShellCompletion --fish watson.fish ''; - nativeCheckInputs = [ - pytestCheckHook - pytest-mock - mock - pytest-datafiles - ]; - propagatedBuildInputs = [ - arrow - click - click-didyoumean - requests - ]; - nativeBuildInputs = [ installShellFiles ]; + pythonImportsCheck = [ "watson" ]; meta = with lib; { homepage = "https://github.com/jazzband/Watson"; diff --git a/pkgs/by-name/wa/wavpack/Fix-autoreconf-with-gettext-0.25.patch b/pkgs/by-name/wa/wavpack/Fix-autoreconf-with-gettext-0.25.patch new file mode 100644 index 000000000000..770f3a996724 --- /dev/null +++ b/pkgs/by-name/wa/wavpack/Fix-autoreconf-with-gettext-0.25.patch @@ -0,0 +1,48 @@ +From ae8d7708e8e28b0d32ef00d18dbd65ed93853811 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Fri, 27 Jun 2025 12:27:58 +0200 +Subject: [PATCH] Fix autoreconf with gettext 0.25 + +Since gettext 0.25, the AM_ICONV macro is installed into the m4 +directory, so we need to add that autoconf config directory. We also +need to make sure autoreconf recognizes that it needs to run autopoint +to install the gettext macros, which it does heuristically by checking +whether AM_GNU_GETTEXT_VERSION is used, so add that and the minimum +amount of other stuff required to make it happy. The version of +gettext we say we use shouldn't matter, so I just went with the +version in ubuntu:latest since that's what CI uses. + +Link: https://github.com/dbry/WavPack/pull/205 +--- + Makefile.am | 2 ++ + configure.ac | 3 +++ + 2 files changed, 5 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index ec20499..6c18f61 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,5 @@ ++SUBDIRS = ++ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = wavpack.pc + +diff --git a/configure.ac b/configure.ac +index e35bb72..7fb0ebb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,10 @@ dnl wavpack 5.8.1 configure.ac + + AC_INIT([wavpack], [5.8.1], [bryant@wavpack.com]) + AC_CONFIG_SRCDIR([src/pack.c]) ++AC_CONFIG_MACRO_DIRS([m4]) + AM_INIT_AUTOMAKE([-Wall 1.15 serial-tests subdir-objects foreign no-dist-gzip dist-xz]) ++AM_GNU_GETTEXT_VERSION([0.21]) ++AM_GNU_GETTEXT([external]) + AM_MAINTAINER_MODE + + LIBWAVPACK_MAJOR=5 +-- +2.49.0 + diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix index 18618982b0fe..9546be7a2bf0 100644 --- a/pkgs/by-name/wa/wavpack/package.nix +++ b/pkgs/by-name/wa/wavpack/package.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + gettext + ]; buildInputs = [ libiconv ]; - # autogen.sh:9 - preAutoreconf = "cp ${gettext}/share/gettext/config.rpath ."; - src = fetchFromGitHub { owner = "dbry"; repo = "WavPack"; @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { hash = "sha256-V9jRIuDpZYIBohJRouGr2TI32BZMXSNVfavqPl56YO0="; }; + patches = [ ./Fix-autoreconf-with-gettext-0.25.patch ]; + outputs = [ "out" "dev" diff --git a/pkgs/by-name/wa/wayback-machine-archiver/package.nix b/pkgs/by-name/wa/wayback-machine-archiver/package.nix index 270f44ca8e11..76fa33e94f33 100644 --- a/pkgs/by-name/wa/wayback-machine-archiver/package.nix +++ b/pkgs/by-name/wa/wayback-machine-archiver/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "wayback-machine-archiver"; version = "1.9.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "agude"; @@ -16,8 +16,13 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0dnnqx507gpj8wsx6f2ivfmha969ydayiqsvxh23p9qcixw9257x"; }; - nativeBuildInputs = with python3.pkgs; [ pypandoc ]; - propagatedBuildInputs = with python3.pkgs; [ requests ]; + build-system = with python3.pkgs; [ + setuptools + pypandoc + ]; + + dependencies = with python3.pkgs; [ requests ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook requests-mock @@ -25,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace \"pytest-runner\", "" + --replace-fail \"pytest-runner\", "" ''; pythonImportsCheck = [ "wayback_machine_archiver" ]; diff --git a/pkgs/by-name/wa/waymore/package.nix b/pkgs/by-name/wa/waymore/package.nix index 181fd35adc10..a0f6c6fdcea1 100644 --- a/pkgs/by-name/wa/waymore/package.nix +++ b/pkgs/by-name/wa/waymore/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "waymore"; version = "4.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "xnl-h4ck3r"; @@ -26,6 +26,11 @@ python3Packages.buildPythonApplication rec { setuptools ]; + pythonRemoveDeps = [ + # python already provides urllib.parse + "urlparse3" + ]; + dependencies = with python3Packages; [ requests termcolor @@ -35,6 +40,8 @@ python3Packages.buildPythonApplication rec { tldextract ]; + pythonImportsCheck = [ "waymore.waymore" ]; + passthru.tests.version = testers.testVersion { package = waymore; command = "waymore --version"; diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix index e2a26733c427..95e12fd6b062 100644 --- a/pkgs/by-name/wd/wdt/package.nix +++ b/pkgs/by-name/wd/wdt/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "1.27.1612021-unstable-2025-06-12"; + version = "1.27.1612021-unstable-2025-07-09"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "5fdb967ef2618e483341bc5021c6fa5f5506a549"; - sha256 = "sha256-3RT7sM8KosrW0r/yrxa8fKz2dSjjf2684VL3ULqfkC4="; + rev = "e4d03e392e90b8ff4d2a67da31d65405afd32db5"; + sha256 = "sha256-epjZFTczJLmI5MgKLMVXhEhv9MYJCYWYOAkZcvqeBs0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 9a872331ac78..42bfe5434ca1 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) src pname version; hash = "sha256-KupqObdNrnWbbt9C4NNmgmQCfJ2O4FjJBwGy6XQhhHg="; + fetcherVersion = 1; }; cargoRoot = "src-tauri"; diff --git a/pkgs/by-name/we/webrtc-audio-processing/package.nix b/pkgs/by-name/we/webrtc-audio-processing/package.nix new file mode 100644 index 000000000000..03f309134a6d --- /dev/null +++ b/pkgs/by-name/we/webrtc-audio-processing/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + abseil-cpp, + meson, + ninja, + pkg-config, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "webrtc-audio-processing"; + version = "2.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pulseaudio"; + repo = "webrtc-audio-processing"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YR4ELukJgHMbfe80H+r8OiaZUCAqefGXmVOaTVVgOqA="; + }; + + patches = [ + (fetchpatch { + name = "gcc-15-compat.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/commit/e9c78dc4712fa6362b0c839ad57b6b46dce1ba83.diff"; + hash = "sha256-QXOtya7RA0UTV9VK4qpql5D8QcOKAn6qURZvPpWT+vg="; + }) + ]; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + propagatedBuildInputs = [ + abseil-cpp + ]; + + mesonFlags = + lib.lists.optional (!stdenv.hostPlatform.isAarch64) "-Dneon=disabled" + ++ lib.lists.optional (stdenv.hostPlatform.isi686) "-Dinline-sse=false"; + + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + + meta = { + homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; + description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; + pkgConfigModules = [ "webrtc-audio-processing-2" ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fzdslr ]; + platforms = + with lib.platforms; + lib.intersectLists + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h + (arm ++ aarch64 ++ mips ++ power ++ riscv ++ x86 ++ loongarch64) + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/meson.build + (linux ++ windows ++ freebsd ++ netbsd ++ openbsd ++ darwin); + }; +}) diff --git a/pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch b/pkgs/by-name/we/webrtc-audio-processing_0_3/enable-powerpc.patch similarity index 100% rename from pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch rename to pkgs/by-name/we/webrtc-audio-processing_0_3/enable-powerpc.patch diff --git a/pkgs/development/libraries/webrtc-audio-processing/enable-riscv.patch b/pkgs/by-name/we/webrtc-audio-processing_0_3/enable-riscv.patch similarity index 100% rename from pkgs/development/libraries/webrtc-audio-processing/enable-riscv.patch rename to pkgs/by-name/we/webrtc-audio-processing_0_3/enable-riscv.patch diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix similarity index 100% rename from pkgs/development/libraries/webrtc-audio-processing/0.3.nix rename to pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix similarity index 100% rename from pkgs/development/libraries/webrtc-audio-processing/default.nix rename to pkgs/by-name/we/webrtc-audio-processing_1/package.nix diff --git a/pkgs/by-name/we/wezterm/headless.nix b/pkgs/by-name/we/wezterm/headless.nix index dd2a4a0b8c03..96d0f6fcaf46 100644 --- a/pkgs/by-name/we/wezterm/headless.nix +++ b/pkgs/by-name/we/wezterm/headless.nix @@ -12,7 +12,6 @@ rustPlatform.buildRustPackage { src postPatch cargoHash - useFetchCargoVendor meta ; diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix index 2988538496da..a25d09f20989 100644 --- a/pkgs/by-name/wh/whisparr/package.nix +++ b/pkgs/by-name/wh/whisparr/package.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "Whisparr"; - maintainers = [ lib.maintainers.paveloom ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix index 1b75eededa37..d365c2aa8a03 100644 --- a/pkgs/by-name/wi/win2xcur/package.nix +++ b/pkgs/by-name/wi/win2xcur/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec { pname = "win2xcur"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "quantum5"; @@ -16,11 +16,18 @@ python3Packages.buildPythonPackage rec { hash = "sha256-OjLj+QYg8YOJzDq3Y6/uyEXlNWbPm8VA/b1yP9jT6Jo="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ numpy wand ]; + pythonImportsCheck = [ + "win2xcur.main.win2xcur" + "win2xcur.main.x2wincur" + ]; + meta = { description = "Tools that convert cursors between the Windows (*.cur, *.ani) and Xcursor format"; homepage = "https://github.com/quantum5/win2xcur"; diff --git a/pkgs/by-name/wl/wlc/package.nix b/pkgs/by-name/wl/wlc/package.nix index 04d734fc0ec1..2c3731103ef3 100644 --- a/pkgs/by-name/wl/wlc/package.nix +++ b/pkgs/by-name/wl/wlc/package.nix @@ -4,19 +4,19 @@ fetchPypi, }: -with python3.pkgs; - -buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { pname = "wlc"; version = "1.15"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-0T8cMq5Mrv/Ygo6BfYho3sjFuu8dYZyUMtJc5gabuG4="; }; - propagatedBuildInputs = [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ argcomplete python-dateutil requests @@ -25,10 +25,12 @@ buildPythonPackage rec { twine ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + pythonImportsCheck = [ "wlc" ]; + meta = with lib; { description = "Weblate commandline client using Weblate's REST API"; homepage = "https://github.com/WeblateOrg/wlc"; diff --git a/pkgs/by-name/wl/wllvm/package.nix b/pkgs/by-name/wl/wllvm/package.nix index bc1c9ebac3e0..365c9ff472e2 100644 --- a/pkgs/by-name/wl/wllvm/package.nix +++ b/pkgs/by-name/wl/wllvm/package.nix @@ -5,15 +5,19 @@ }: python3Packages.buildPythonApplication rec { - version = "1.3.1"; - format = "setuptools"; pname = "wllvm"; + version = "1.3.1"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; + build-system = with python3Packages; [ setuptools ]; + + pythonImportsCheck = [ "wllvm.wllvm" ]; + meta = with lib; { homepage = "https://github.com/travitch/whole-program-llvm"; description = "Wrapper script to build whole-program LLVM bitcode files"; diff --git a/pkgs/by-name/wl/wlvncc/package.nix b/pkgs/by-name/wl/wlvncc/package.nix index e4d1b1a68315..33209a300ed9 100644 --- a/pkgs/by-name/wl/wlvncc/package.nix +++ b/pkgs/by-name/wl/wlvncc/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation { pname = "wlvncc"; - version = "0-unstable-2025-04-20"; + version = "0-unstable-2025-07-07"; src = fetchFromGitHub { owner = "any1"; repo = "wlvncc"; - rev = "a6a5463a9c69ce4db04d8d699dd58e1ba8560a0a"; - hash = "sha256-8p2IOQvcjOV5xe0c/RWP6aRHtQnu9tYI7QgcC13sg4k="; + rev = "bc6063aeacd4fbe9ac8f58f4ba3c5388b3e1f1f2"; + hash = "sha256-Udu/CtrNBqnlgZCK2cS8VWNTfHJGXdijTnNIWnAW2Nw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index 49f04b70a13b..19b9163cb1bc 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -6,31 +6,23 @@ wofi, versionCheckHook, nix-update-script, - yq, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wofi-power-menu"; - version = "0.2.7"; + version = "0.2.9"; src = fetchFromGitHub { owner = "szaffarano"; repo = "wofi-power-menu"; tag = "v${finalAttrs.version}"; - hash = "sha256-WPTK9izFU8xZ5YVFuEGO5EoOzgpXWXQnGgeNYjnb/zA="; + hash = "sha256-xio/Gt37PJ/0Di22na4USmfah2GV+xM2eV4NnGBeVfY="; }; - postPatch = '' - tomlq -ti '.package.version = "0.2.7"' Cargo.toml - ''; - useFetchCargoVendor = true; - cargoHash = "sha256-oJd2ymNkNSGUD3cQ+bEHooAJQNeSarkIHWvGNXezwrM="; + cargoHash = "sha256-diDLKP7JGzrXgdZMwSmg70dbFlMLLWp4Ad/ejjiOSlc="; - nativeBuildInputs = [ - makeWrapper - yq # for `tomlq` - ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/wofi-power-menu \ diff --git a/pkgs/by-name/wo/woomer/package.nix b/pkgs/by-name/wo/woomer/package.nix index f3984cb551fa..cafcacacd82b 100644 --- a/pkgs/by-name/wo/woomer/package.nix +++ b/pkgs/by-name/wo/woomer/package.nix @@ -8,21 +8,22 @@ pkg-config, rustPlatform, wayland, + libgbm, }: rustPlatform.buildRustPackage rec { pname = "woomer"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "coffeeispower"; repo = "woomer"; tag = version; - hash = "sha256-puALhN54ma2KToXUF8ipaYysyayjaSp+ISZ3AgQvniw="; + hash = "sha256-LcL43Wq+5d7HPsm2bEK0vZsjP/dixtNhMKywXMi4ODw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VQee/2adBvJpJDihWuo22JNyDKLkZ9PrVqWPB/gJ9Sw="; + cargoHash = "sha256-xll/A0synEsXy9kPThA3bR8LRuAOQH0T6CAfIEoYJ0w="; strictDeps = true; @@ -35,6 +36,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ glfw3 wayland + libgbm ]; # `raylib-sys` wants to compile examples that don't exist in its crate diff --git a/pkgs/by-name/wo/world-wall-clock/package.nix b/pkgs/by-name/wo/world-wall-clock/package.nix index a4bd752d2626..827a3fa1fe64 100644 --- a/pkgs/by-name/wo/world-wall-clock/package.nix +++ b/pkgs/by-name/wo/world-wall-clock/package.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/*" ]; + enabledTestPaths = [ "tests/*" ]; meta = { description = "TUI application that provides a multi-timezone graphical clock in a terminal environment."; diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index d589848649a6..cb5987089024 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -75,6 +75,7 @@ let sourceRoot ; hash = "sha256-4Xj6doUHFoZSwel+cPnr2m3rfvlxNmQCppm5gXGIEtU="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/wp/wpm/package.nix b/pkgs/by-name/wp/wpm/package.nix index 63e9a06d3da9..7f12b096c7a2 100644 --- a/pkgs/by-name/wp/wpm/package.nix +++ b/pkgs/by-name/wp/wpm/package.nix @@ -7,15 +7,17 @@ python3.pkgs.buildPythonApplication rec { pname = "wpm"; version = "1.51.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-swT9E5Tto4yWnm0voowcJXtY3cIY3MNqAdfrTnuGbdg="; }; - propagatedBuildInputs = with python3.pkgs; [ - setuptools + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + setuptools # pkg_resources is imported during runtime ]; pythonImportsCheck = [ "wpm" ]; diff --git a/pkgs/by-name/wp/wpprobe/package.nix b/pkgs/by-name/wp/wpprobe/package.nix index 866956db428b..8c5fa5cafa9b 100644 --- a/pkgs/by-name/wp/wpprobe/package.nix +++ b/pkgs/by-name/wp/wpprobe/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "wpprobe"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Chocapikk"; repo = "wpprobe"; tag = "v${finalAttrs.version}"; - hash = "sha256-6aL1hK9oZYcBVQbfualIOsYrbMWTA1uV+fEKbOFaSHU="; + hash = "sha256-duTd+4nY8G8+RPlNBrcEZ4hBd4lf/gEyykIdbWcWPbs="; }; vendorHash = "sha256-KV6Ss0fN3xwm5Id7MAHMUjq9TsQbaInLjd5xcLKGX6U="; diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index a7d7da4b40d9..d1cf0d4f75bb 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch ; hash = "sha256-r3QswmqP6CNufnsFM0KeKojm/HjHogrfYO/TdL3SrmA="; + fetcherVersion = 1; }; # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs postPatch = '' diff --git a/pkgs/by-name/x2/x2goserver/package.nix b/pkgs/by-name/x2/x2goserver/package.nix index a07a7bc9d2d8..37a19b0a063c 100644 --- a/pkgs/by-name/x2/x2goserver/package.nix +++ b/pkgs/by-name/x2/x2goserver/package.nix @@ -15,7 +15,7 @@ gnugrep, findutils, xorg, - nettools, + net-tools, iproute2, bc, procps, @@ -77,7 +77,7 @@ let gnused gnugrep findutils - nettools + net-tools iproute2 bc procps diff --git a/pkgs/by-name/xb/xbindkeys/gettext-0.25.patch b/pkgs/by-name/xb/xbindkeys/gettext-0.25.patch new file mode 100644 index 000000000000..01204e341fa3 --- /dev/null +++ b/pkgs/by-name/xb/xbindkeys/gettext-0.25.patch @@ -0,0 +1,31 @@ +diff --git a/Makefile.am b/Makefile.am +index 3257a0a..e39e8bc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,3 +35,5 @@ endif + + + man_MANS = xbindkeys.1 $(man_MANS_TK) ++ ++SUBDIRS = +\ No newline at end of file +diff --git a/configure.ac b/configure.ac +index f039ca8..eb0c886 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,10 +3,15 @@ AC_INIT(xbindkeys, 1.8.7, hocwp@free.fr) + AC_PREREQ(2.54) + AC_COPYRIGHT(Copyright (C) Philippe Brochard ) + ++AC_CONFIG_MACRO_DIRS([m4]) ++ + # Automake + AM_INIT_AUTOMAKE() + AM_MAINTAINER_MODE + ++AM_GNU_GETTEXT_VERSION([0.25]) ++AM_GNU_GETTEXT([external]) ++ + AC_CONFIG_SRCDIR([xbindkeys.c]) + AM_CONFIG_HEADER(config.h) + diff --git a/pkgs/by-name/xb/xbindkeys/package.nix b/pkgs/by-name/xb/xbindkeys/package.nix index 1dd877e85d0e..c2d7208bf857 100644 --- a/pkgs/by-name/xb/xbindkeys/package.nix +++ b/pkgs/by-name/xb/xbindkeys/package.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; }; + # FIXME: remove when gettext is fixed + patches = [ ./gettext-0.25.patch ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/by-name/xb/xborders/package.nix b/pkgs/by-name/xb/xborders/package.nix index 72d2c48bdbbe..d3e69da2884c 100644 --- a/pkgs/by-name/xb/xborders/package.nix +++ b/pkgs/by-name/xb/xborders/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { pname = "xborders"; version = "3.4"; # in version.txt - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "deter0"; @@ -33,7 +33,9 @@ python3Packages.buildPythonPackage rec { gobject-introspection ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pycairo requests pygobject3 diff --git a/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/pkgs/by-name/xd/xdg-terminal-exec/package.nix index 109e7df7a55b..aeadf2fe09ec 100644 --- a/pkgs/by-name/xd/xdg-terminal-exec/package.nix +++ b/pkgs/by-name/xd/xdg-terminal-exec/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "xdg-terminal-exec"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "xdg-terminal-exec"; rev = "v${finalAttrs.version}"; - hash = "sha256-fZ9GSY0Wm6V86wxPmG7YQX882orpKyl9YBrDorxTemY="; + hash = "sha256-W2g0cnJbgrEu/XPCz86Q7OIUBP4onu4nvbSQ7G43Ptg="; }; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/by-name/xd/xdg-user-dirs/gettext-0.25.patch b/pkgs/by-name/xd/xdg-user-dirs/gettext-0.25.patch new file mode 100644 index 000000000000..f292da934d59 --- /dev/null +++ b/pkgs/by-name/xd/xdg-user-dirs/gettext-0.25.patch @@ -0,0 +1,20 @@ +diff --git a/configure.ac b/configure.ac +index dc389db..45a35df 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,6 +2,7 @@ AC_INIT(xdg-user-dirs-update.c) + + AM_INIT_AUTOMAKE(xdg-user-dirs, 0.18) + AM_CONFIG_HEADER(config.h) ++AC_CONFIG_MACRO_DIRS([m4]) + + AM_SANITY_CHECK + AM_MAINTAINER_MODE +@@ -20,6 +21,7 @@ GETTEXT_PACKAGE=xdg-user-dirs + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name]) + AC_SUBST(GETTEXT_PACKAGE) + ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.14.4]) + AM_GNU_GETTEXT([external]) + + dnl ========================================================================== diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix index d11223121392..e8797598ad88 100644 --- a/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7G8G10lc26N6cyA5+bXhV4vLKWV2/eDaQO2y9SIg3zw="; }; + patches = [ + # https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/16 + ./gettext-0.25.patch + ]; + postPatch = '' substituteInPlace Makefile.am \ --replace-fail 'libraries = $(LIBINTL)' 'libraries = $(LIBICONV) $(LIBINTL)' @@ -32,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_43 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; + NIX_LDFLAGS = if stdenv.isDarwin then "-liconv" else null; + preFixup = '' # fallback values need to be last wrapProgram "$out/bin/xdg-user-dirs-update" \ diff --git a/pkgs/by-name/xd/xdxf2slob/package.nix b/pkgs/by-name/xd/xdxf2slob/package.nix index c694ca396bb6..dc0a015d44d6 100644 --- a/pkgs/by-name/xd/xdxf2slob/package.nix +++ b/pkgs/by-name/xd/xdxf2slob/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "xdxf2slob"; version = "unstable-2015-06-30"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "itkach"; @@ -16,11 +16,15 @@ python3Packages.buildPythonApplication { sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd"; }; - propagatedBuildInputs = [ - python3Packages.pyicu - python3Packages.slob + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + pyicu + slob ]; + pythonImportsCheck = [ "xdxf2slob" ]; + meta = with lib; { description = "Tool to convert XDXF dictionary files to slob format"; homepage = "https://github.com/itkach/xdxf2slob/"; diff --git a/pkgs/by-name/xe/xed/package.nix b/pkgs/by-name/xe/xed/package.nix index e3fea2801bcf..505b337a86f2 100644 --- a/pkgs/by-name/xe/xed/package.nix +++ b/pkgs/by-name/xe/xed/package.nix @@ -13,7 +13,7 @@ let mbuild = python3Packages.buildPythonPackage rec { pname = "mbuild"; version = "2024.11.04"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "intelxed"; @@ -22,6 +22,8 @@ let hash = "sha256-iQVykBG3tEPxI1HmqBkvO1q+K8vi64qBfVC63/rcTOk="; }; + build-system = with python3Packages; [ setuptools ]; + meta = { description = "Python-based build system used for building XED"; homepage = "https://github.com/intelxed/mbuild"; diff --git a/pkgs/by-name/xe/xenomapper/package.nix b/pkgs/by-name/xe/xenomapper/package.nix index 5e269bfc91be..f25f6b249d90 100644 --- a/pkgs/by-name/xe/xenomapper/package.nix +++ b/pkgs/by-name/xe/xenomapper/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "xenomapper"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "genomematt"; @@ -16,7 +16,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr"; }; - propagatedBuildInputs = with python3.pkgs; [ statistics ]; + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ statistics ]; + + pythonImportsCheck = [ + "xenomapper.xenomapper" + "xenomapper.mappability" + ]; meta = with lib; { homepage = "https://github.com/genomematt/xenomapper"; diff --git a/pkgs/by-name/xe/xenon/package.nix b/pkgs/by-name/xe/xenon/package.nix index 583036442ec3..6907c94bf947 100644 --- a/pkgs/by-name/xe/xenon/package.nix +++ b/pkgs/by-name/xe/xenon/package.nix @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -20,12 +20,16 @@ python3.pkgs.buildPythonApplication { doCheck = false; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ requests radon pyaml ]; + pythonImportsCheck = [ "xenon" ]; + meta = with lib; { description = "Monitoring tool based on radon"; homepage = "https://github.com/rubik/xenon"; diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index 74fcbc2f8399..2d1eeec6210d 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -73,7 +73,6 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda - aaronjheng defelo ]; mainProgram = "xh"; diff --git a/pkgs/by-name/xk/xkeyboard-config/package.nix b/pkgs/by-name/xk/xkeyboard-config/package.nix index 1e92d87503ae..2862769bb6cb 100644 --- a/pkgs/by-name/xk/xkeyboard-config/package.nix +++ b/pkgs/by-name/xk/xkeyboard-config/package.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xkeyboard-config"; - version = "2.44"; + version = "2.45"; src = fetchurl { url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-${finalAttrs.version}.tar.xz"; - hash = "sha256-VNLDPu67Ax1I+lkMVD5Uyby9DwA4brxkibL0eg2kNCo="; + hash = "sha256-Fp4HWpLZV6V3h8GZ6E41nfKTG3GWwcW0o9V27mI1qHw="; }; strictDeps = true; diff --git a/pkgs/by-name/xk/xkeysnail/package.nix b/pkgs/by-name/xk/xkeysnail/package.nix index 68ff0ffbc24f..c9c50863f34c 100644 --- a/pkgs/by-name/xk/xkeysnail/package.nix +++ b/pkgs/by-name/xk/xkeysnail/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { pname = "xkeysnail"; version = "0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mooz"; @@ -24,7 +24,9 @@ python3Packages.buildPythonApplication { }) ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ evdev xlib inotify-simple @@ -38,6 +40,8 @@ python3Packages.buildPythonApplication { --add-flags "-q" --add-flags "$out/share/browser.py" ''; + pythonImportsCheck = [ "xkeysnail" ]; + meta = { description = "Yet another keyboard remapping tool for X environment"; homepage = "https://github.com/mooz/xkeysnail"; diff --git a/pkgs/by-name/xl/xlockmore/package.nix b/pkgs/by-name/xl/xlockmore/package.nix index b3d209294a1e..861292b3f423 100644 --- a/pkgs/by-name/xl/xlockmore/package.nix +++ b/pkgs/by-name/xl/xlockmore/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.83"; + version = "5.84"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-ppjQmf1qPBnEHhl8EG2ejDo4pOj/B3wqpLrHYp1pyMM="; + sha256 = "sha256-HiZ89pIL6nmBNemMJZBaj1Q21H5cYLJOCbIXZgWpRtQ="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/by-name/xm/xmldiff/package.nix b/pkgs/by-name/xm/xmldiff/package.nix index 2c68e6b83c1f..4eccca0ffc50 100644 --- a/pkgs/by-name/xm/xmldiff/package.nix +++ b/pkgs/by-name/xm/xmldiff/package.nix @@ -14,13 +14,15 @@ let }; in python3.pkgs.buildPythonApplication { - format = "setuptools"; pname = "xmldiff"; inherit version src; + pyproject = true; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ lxml - setuptools + setuptools # pkg_resources is imported during runtime ]; meta = { diff --git a/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix index 8cba53b3d479..536e71569c02 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "xonsh-direnv"; version = "1.6.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "74th"; diff --git a/pkgs/by-name/xp/xpaste/package.nix b/pkgs/by-name/xp/xpaste/package.nix index 2e1050ec8db6..c56c664402c3 100644 --- a/pkgs/by-name/xp/xpaste/package.nix +++ b/pkgs/by-name/xp/xpaste/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "xpaste"; version = "1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ossobv"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-eVnoLG+06UTOkvGhzL/XS4JBrEwbXYZ1fuNTIW7YAfE="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ xlib ]; diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 37eee295a66a..2cb64a2a9517 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-BQNynZwQevXl+PlAi+OhaIUIf9TaNW5JowD3mLGgJxE="; + x86_64-linux = "sha256-2ZkFVhOTBfGWsyDTWRCFq0FXzuewWOsuZ9lH/0q8jEw="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "16.6"; + version = "16.7"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix index e02f96562936..62ec22428439 100644 --- a/pkgs/by-name/xs/xscreensaver/package.nix +++ b/pkgs/by-name/xs/xscreensaver/package.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xscreensaver"; - version = "6.11"; + version = "6.12"; src = fetchurl { url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz"; - hash = "sha256-lIi3ouZVkSh7lEMB8x+WjXcX/5vGswmJ46vtZiyH4eg="; + hash = "sha256-T/Z5ghfju7w8cza+7afoPq+/AzAawpsiNtpmoPExdkM="; }; outputs = [ diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index a60d3ab31362..92f0964117f4 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "399"; + version = "400"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-nbNK0PU92xIj1wskfIOR5S8+SxZtathUJqTEeBPRseM="; + hash = "sha256-7thOzAXvpj1YnFoqP1qUfhS3mNA7U0LMaINxD2SPGgY="; }; patches = [ ./sixel-256.support.patch ]; diff --git a/pkgs/by-name/ya/yad/gettext-0.25.patch b/pkgs/by-name/ya/yad/gettext-0.25.patch new file mode 100644 index 000000000000..02f551459ef9 --- /dev/null +++ b/pkgs/by-name/ya/yad/gettext-0.25.patch @@ -0,0 +1,18 @@ +diff --git a/configure.ac b/configure.ac +index 20a4e42..921ba18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,9 +8,13 @@ AC_PREREQ([2.59]) + + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_SRCDIR([src]) ++AC_CONFIG_MACRO_DIRS([m4]) + + AM_MAINTAINER_MODE + ++AM_GNU_GETTEXT_VERSION([0.25]) ++AM_GNU_GETTEXT([external]) ++ + IT_PROG_INTLTOOL([0.40.0]) + + AC_PROG_CC diff --git a/pkgs/by-name/ya/yad/package.nix b/pkgs/by-name/ya/yad/package.nix index 7b1bf736bcd0..18ba4405374c 100644 --- a/pkgs/by-name/ya/yad/package.nix +++ b/pkgs/by-name/ya/yad/package.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M="; }; + # FIXME: remove when gettext is fixed + patches = [ ./gettext-0.25.patch ]; + configureFlags = [ "--enable-icon-browser" "--with-gtk=gtk3" diff --git a/pkgs/by-name/ya/yams/package.nix b/pkgs/by-name/ya/yams/package.nix index d5745e2ea7a5..732bbc4e81d3 100644 --- a/pkgs/by-name/ya/yams/package.nix +++ b/pkgs/by-name/ya/yams/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { pname = "yams"; # nixpkgs-update: no auto update version = "0.7.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Berulacks"; @@ -17,7 +17,9 @@ python3Packages.buildPythonPackage rec { sha256 = "1zkhcys9i0s6jkaz24an690rvnkv1r84jxpaa84sf46abi59ijh8"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pyyaml psutil mpd2 @@ -26,6 +28,8 @@ python3Packages.buildPythonPackage rec { doCheck = false; + pythonImportsCheck = [ "yams.scrobble" ]; + meta = with lib; { homepage = "https://github.com/Berulacks/yams"; description = "Last.FM scrobbler for MPD"; diff --git a/pkgs/by-name/ye/yew-fmt/package.nix b/pkgs/by-name/ye/yew-fmt/package.nix index 52763818adc1..7dc716500b6f 100644 --- a/pkgs/by-name/ye/yew-fmt/package.nix +++ b/pkgs/by-name/ye/yew-fmt/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "yew-fmt"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "its-the-shrimp"; repo = "yew-fmt"; tag = "v${version}"; - hash = "sha256-kUelvhWUj9+nEHNWolhTJa8emdBInKV9cK2dF/H7dNQ="; + hash = "sha256-IrfL4t92neaJS8UybnHeAg9hShER6TLK1nuFqPHYoMg="; }; - cargoHash = "sha256-oIliRYc6HU8KFmlTTIlV+nmeRUx1gJhy93QjPnGxiK8="; + cargoHash = "sha256-AvtrqqsUGW9qG+ZHd/PrCLAHKk9psS3tnd1SPkdsNXw="; nativeCheckInputs = [ rustfmt ]; passthru.updateScript = nix-update-script { }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/yo/you-get/package.nix b/pkgs/by-name/yo/you-get/package.nix index c9a32a82e0db..d7e4ec0976c5 100644 --- a/pkgs/by-name/yo/you-get/package.nix +++ b/pkgs/by-name/yo/you-get/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "you-get"; version = "0.4.1700"; - format = "setuptools"; + pyproject = true; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -31,6 +31,8 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; + build-system = with python3.pkgs; [ setuptools ]; + postInstall = '' installShellCompletion --cmd you-get \ --zsh contrib/completion/_you-get \ diff --git a/pkgs/by-name/yt/ytmdl/package.nix b/pkgs/by-name/yt/ytmdl/package.nix index dfbadc146b71..7869aedf1aa7 100644 --- a/pkgs/by-name/yt/ytmdl/package.nix +++ b/pkgs/by-name/yt/ytmdl/package.nix @@ -2,14 +2,14 @@ lib, python3Packages, fetchPypi, - yt-dlp, ffmpeg, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "ytmdl"; version = "2023.11.26"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname; @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" \ - --replace "/etc/bash_completion.d" "share/bash-completion/completions" \ - --replace "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions" - sed -i '/python_requires=/d' setup.py + --replace-fail "/etc/bash_completion.d" "share/bash-completion/completions" \ + --replace-fail "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions" ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ ffmpeg-python musicbrainzngs rich @@ -51,8 +51,11 @@ python3Packages.buildPythonApplication rec { (lib.makeBinPath [ ffmpeg ]) ]; - # This application has no tests - doCheck = false; + nativeCheckInputs = [ + writableTmpDirAsHomeHook # the app tries to log stuff into xdg_cache_home + ]; + + pythonImportsCheck = [ "ytmdl" ]; meta = with lib; { homepage = "https://github.com/deepjyoti30/ytmdl"; diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix index 5e994ac4b21a..16d9dd41c465 100644 --- a/pkgs/by-name/za/zammad/package.nix +++ b/pkgs/by-name/za/zammad/package.nix @@ -82,6 +82,7 @@ stdenvNoCC.mkDerivation { inherit pname src; hash = "sha256-mfdzb/LXQYL8kaQpWi9wD3OOroOOonDlJrhy9Dwl1no"; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index 3d68b11b4b1d..720fd3ed5bbe 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "zapzap"; version = "6.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; @@ -17,8 +17,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-g3J9oVIRiar0QoksRjJZsbvSKiFBILaUdSUscNs1VXE="; }; - nativeBuildInputs = with python3Packages; [ - setuptools + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; @@ -31,7 +30,9 @@ python3Packages.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ dbus-python pyqt6 pyqt6-webengine @@ -51,6 +52,8 @@ python3Packages.buildPythonApplication rec { # has no tests doCheck = false; + pythonImportsCheck = [ "zapzap" ]; + meta = with lib; { description = "WhatsApp desktop application written in Pyqt6 + PyQt6-WebEngine."; homepage = "https://rtosta.com/zapzap-web/"; diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index 9a80dd69c623..99921816e3eb 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-aiSZS6FEs7kqGXxC9Tx6Rngv3qrPMi5gOuh5Z3/oZyc="; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 6f4e92fdd96c..9c25ecd1b900 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.193.3"; + version = "0.194.3"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-6/WRuO0UgQFtV0nK8/u3mZPYfAqVzemi3LzuCprOSgY="; + hash = "sha256-KF83XTCOWi78Uq720YSpJ6+JzllhqJQKLCqzq2WFS/U="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-FG2JFnruGqUbIbCeBCqhuzrT/pwDv1tqpAYRMnmvxHk="; + cargoHash = "sha256-gSM3Qd87rhtG/oPLe3b1ItJmz9G4AEJY5h81lTz9Kl0="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix index 380b4cc8fc9b..9f1a07298756 100644 --- a/pkgs/by-name/ze/zenn-cli/package.nix +++ b/pkgs/by-name/ze/zenn-cli/package.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-AjdXclrNl1AHJ4LXq9I5Rk6KGyDaWXW187o2uLwRy/o="; + fetcherVersion = 1; }; preBuild = diff --git a/pkgs/by-name/zf/zfs-autobackup/package.nix b/pkgs/by-name/zf/zfs-autobackup/package.nix index db4eb62abcbc..12ef9ebfa6b2 100644 --- a/pkgs/by-name/zf/zfs-autobackup/package.nix +++ b/pkgs/by-name/zf/zfs-autobackup/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "zfs-autobackup"; version = "3.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -15,7 +15,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-nAc1mdrtIEmUS0uMqOdvV07xP02MFj6F5uCTiCXtnMs="; }; - propagatedBuildInputs = with python3Packages; [ colorama ]; + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ colorama ]; pythonRemoveDeps = [ "argparse" ]; diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix index 20eebac9e1e0..eb0c4c21d2b5 100644 --- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix +++ b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-OPfs9WiUehKPaAqqgMOiIELoCPVBFYpNKeesfmA8Db0="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zi/zim/package.nix b/pkgs/by-name/zi/zim/package.nix index 28b741256cc8..57ec16d3168e 100644 --- a/pkgs/by-name/zi/zim/package.nix +++ b/pkgs/by-name/zi/zim/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pname = "zim"; version = "0.76.3"; - format = "setuptools"; + pyproject = true; src = fetchurl { url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; @@ -36,6 +36,8 @@ python3Packages.buildPythonApplication rec { adwaita-icon-theme ]; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ pyxdg pygobject3 diff --git a/pkgs/by-name/zi/zint/fix-installation-of-cmake-files.patch b/pkgs/by-name/zi/zint-qt/fix-installation-of-cmake-files.patch similarity index 100% rename from pkgs/by-name/zi/zint/fix-installation-of-cmake-files.patch rename to pkgs/by-name/zi/zint-qt/fix-installation-of-cmake-files.patch diff --git a/pkgs/by-name/zi/zint/package.nix b/pkgs/by-name/zi/zint-qt/package.nix similarity index 70% rename from pkgs/by-name/zi/zint/package.nix rename to pkgs/by-name/zi/zint-qt/package.nix index 605e6c26ce29..624a0e9fb4b7 100644 --- a/pkgs/by-name/zi/zint/package.nix +++ b/pkgs/by-name/zi/zint-qt/package.nix @@ -8,9 +8,10 @@ qt6, versionCheckHook, zlib, + withGUI ? true, }: stdenv.mkDerivation (finalAttrs: { - pname = "zint"; + pname = "zint${lib.optionalString withGUI "-qt"}"; version = "2.15.0"; outputs = [ @@ -32,13 +33,16 @@ stdenv.mkDerivation (finalAttrs: { ./fix-installation-of-cmake-files.patch ]; - nativeBuildInputs = [ - cmake - ninja - qt6.wrapQtAppsHook - ]; + nativeBuildInputs = + [ + cmake + ninja + ] + ++ lib.optionals withGUI [ + qt6.wrapQtAppsHook + ]; - buildInputs = [ + buildInputs = lib.optionals withGUI [ qt6.qtbase qt6.qtsvg qt6.qttools @@ -49,12 +53,18 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - cmakeFlags = [ (lib.cmakeBool "ZINT_QT6" true) ]; + cmakeFlags = + [ + (lib.cmakeBool "ZINT_USE_QT" withGUI) + ] + ++ lib.optionals withGUI [ + (lib.cmakeBool "ZINT_QT6" true) # do not use Qt 5 + ]; doInstallCheck = true; nativeCheckInputs = [ versionCheckHook ]; - postInstall = '' + postInstall = lib.optionalString withGUI '' install -Dm644 -t $out/share/applications $src/zint-qt.desktop install -Dm644 -t $out/share/pixmaps $src/zint-qt.png install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/frontend_qt/images/scalable/zint-qt.svg @@ -64,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: { description = "Barcode generating tool and library"; longDescription = '' The Zint project aims to provide a complete cross-platform open source - barcode generating solution. The package currently consists of a Qt based - GUI, a CLI command line executable and a library with an API to allow + barcode generating solution. The package currently consists of "${lib.optionalString withGUI "a Qt based GUI, "} + a CLI command line executable and a library with an API to allow developers access to the capabilities of Zint. ''; homepage = "https://www.zint.org.uk"; @@ -73,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = [ lib.maintainers.azahi ]; platforms = platforms.all; - mainProgram = "zint"; + mainProgram = "zint${lib.optionalString withGUI "-qt"}"; }; }) diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 22deed18f2c6..a44a9b099dc8 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-kIneqtLPZ29PzluKUGO4XbQYHbNddu0kTfoP4C22k7U="; + fetcherVersion = 1; }; buildInputs = [ diff --git a/pkgs/by-name/zi/zix/package.nix b/pkgs/by-name/zi/zix/package.nix index 30df1154459d..4aefc8fbecb2 100644 --- a/pkgs/by-name/zi/zix/package.nix +++ b/pkgs/by-name/zi/zix/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, meson, ninja, pkg-config, @@ -10,25 +9,15 @@ stdenv.mkDerivation rec { pname = "zix"; - version = "0.4.2"; + version = "0.6.2"; src = fetchFromGitLab { owner = "drobilla"; repo = "zix"; rev = "v${version}"; - hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4="; + hash = "sha256-1fdW014QKvTYHaEmDsivUVPzF/vZgnW3Srk6edp6G1o="; }; - patches = [ - # clang-16 support on Darwin: - # https://gitlab.com/drobilla/zix/-/issues/3 - (fetchpatch { - name = "darwin-sync.patch"; - url = "https://gitlab.com/drobilla/zix/-/commit/a6f804073de1f1e626464a9dd0a169fd3f69fdff.patch"; - hash = "sha256-ZkDPjtUzIyqnYarQR+7aCj7S/gSngbd6d75aRT+h7Ww="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/by-name/zs/zsh-history-to-fish/package.nix b/pkgs/by-name/zs/zsh-history-to-fish/package.nix index bbd6ee4b8c25..9932ed8e7a31 100644 --- a/pkgs/by-name/zs/zsh-history-to-fish/package.nix +++ b/pkgs/by-name/zs/zsh-history-to-fish/package.nix @@ -7,14 +7,16 @@ python3.pkgs.buildPythonApplication rec { pname = "zsh-history-to-fish"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-expPuffZttyXNRreplPC5Ee/jfWAyOnmjTIMXONtrnw="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ click ]; diff --git a/pkgs/by-name/zx/zxing-cpp/package.nix b/pkgs/by-name/zx/zxing-cpp/package.nix index df47193fa32c..684152b4d73c 100644 --- a/pkgs/by-name/zx/zxing-cpp/package.nix +++ b/pkgs/by-name/zx/zxing-cpp/package.nix @@ -5,7 +5,7 @@ gitUpdater, python3, stdenv, - zint, + libzint, }: stdenv.mkDerivation (finalAttrs: { @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - zint + libzint ]; cmakeFlags = [ diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 3dcdbe931e97..e66063f416b5 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/util/dsvgrenderer.cpp \ --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")' + sed '1i#include ' \ + -i 'src/kernel/dguiapplicationhelper.cpp' ''; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index a97cb6f9aa82..d5c0862b857c 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -1,8 +1,10 @@ { - stdenv, lib, + stdenv, fetchurl, unzip, + bintools, + versionCheckHook, runCommand, cctools, darwin, @@ -23,16 +25,25 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' - mkdir -p $out - cp -R * $out/ - echo $libPath + runHook preInstall + + cp -R . $out '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' - find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; + find $out/bin -executable -type f -exec patchelf --set-interpreter ${bintools.dynamicLinker} {} \; + '' + + '' + runHook postInstall ''; - libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; dontStrip = true; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + passthru = { updateScript = ./update.sh; tests = { @@ -67,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { homepage = "https://dart.dev"; - maintainers = with maintainers; [ grburst ]; + maintainers = with lib.maintainers; [ grburst ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' Dart is a class-based, single inheritance, object-oriented language @@ -79,12 +90,11 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "dart"; platforms = [ "x86_64-linux" - "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.bsd3; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index d5ae0fef55d8..6c50501ae087 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,27 +1,23 @@ let - version = "3.8.0"; + version = "3.8.1"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "0qkhzk9mn7xhdg03g3nj24zfalm4fd8k054gnncdsjn2vz1fhgpg"; + hash = "sha256-OTcd89ZPlPWz2cERnD9UkWTFYoxqE7lFG3tEhZ8fkRQ="; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1vlyncm8hyfvwkdjvvkmra3b3mj7rz7sxwy2xjh07dkrmvw0n4cy"; + hash = "sha256-UIC8b0p4zM4OOOceRkdsCNYeCBRTZGlI8/DHcXepKPg="; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "09gmkyg0h662n8wd3k1mx8sglvwa9l5cfhaq934hvcvpc16ajssy"; + hash = "sha256-eKMkAJe+47ebAJxp6tIuGq7e3ty+CT6qmACExWYQlsg="; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "1kpkd1c48y0v6hi5pabxhijd04aqbq1fqw3lcsrfkyig84gawbhj"; - }; - "${version}-i686-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0bcb95wadwhq0m64h9mrycdzp9ssnkh4lh3x3hf19py0ak6ix14v"; + hash = "sha256-DVjAEKNh8/FYixwvV5QvfMr3t6u+A0BP73oQLrY48J0="; }; } diff --git a/pkgs/development/compilers/dart/update.sh b/pkgs/development/compilers/dart/update.sh index 38940a696b19..e8cfc3b432a6 100755 --- a/pkgs/development/compilers/dart/update.sh +++ b/pkgs/development/compilers/dart/update.sh @@ -1,80 +1,21 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq +#!nix-shell -i bash -p curl jq common-updater-scripts set -euo pipefail -# so if the script fails, debug logs are on stderr -log() { - >&2 echo "DART_UPDATER: $@" -} +latestVersion=$(curl -sL https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION | jq --raw-output .version) +currentVersion=$(nix eval --raw -f . dart.version) -# fetch the latest version number from upstream -NEW_VER_DETAILS=$(curl -sL https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION) -NEW_VER=$(jq -r '.version' <<< "$NEW_VER_DETAILS") +if [[ "$latestVersion" == "$currentVersion" ]]; then + exit 0 +fi MY_PATH=$(dirname $(realpath "$0")) -SRC_FILE=$(mktemp) -log "file to write is $SRC_FILE" +update-source-version dart $latestVersion --file=$MY_PATH/sources.nix -PRELUDE="let - version = \"$NEW_VER\"; -in -{ fetchurl }: -{ - versionUsed = version;" -echo "$PRELUDE" > "$SRC_FILE" -log "wrote prelude" - -# Fetches the source, then writes the fetcher and hash into the sources file. -# Arguments: -# - $1: VARIABLE NAME of (table of nix platform -> dart platform mappings) ("DARWIN_PLATFORMS"|"LIN_PLATFORMS") -# - $2: Dart-OS ("macos"|"linux") -write_for_platform() { - BASE_OF_ALL_URLS='https://storage.googleapis.com/dart-archive/channels/stable/release' - BASE_URL_WRITTEN="$BASE_OF_ALL_URLS/\${version}/sdk" - BASE_URL_FETCHED="$BASE_OF_ALL_URLS/$NEW_VER/sdk" - - TABLE_NAME=$1 - declare -n TABLE=$TABLE_NAME - - for platform in "${!TABLE[@]}"; do - DART_PLATFORM="${TABLE[$platform]}" - log "trying for dartplatform $DART_PLATFORM (platform $platform) (OS $2)" - - URL_POSTFIX="dartsdk-$2-$DART_PLATFORM-release.zip" - URL="$BASE_URL_FETCHED/$URL_POSTFIX" - log "URL for $DART_PLATFORM: $URL" - - HASH=$(nix-prefetch-url "$URL" --type sha256) - log "hash for platform $platform: $HASH" - - FETCHER=" \"\${version}-$platform\" = fetchurl { - url = \"$BASE_URL_WRITTEN/$URL_POSTFIX\"; - sha256 = \"$HASH\"; - };" - - echo "$FETCHER" >> $SRC_FILE - done - log "finished for $1" - -} - -# Map nix platforms -> Dart platforms -X8664="x64" -AARCH64="arm64" -I686="ia32" -declare -A DARWIN_PLATFORMS=(["aarch64-darwin"]="$AARCH64" - ["x86_64-darwin"]="$X8664") - -declare -A LIN_PLATFORMS=( ["x86_64-linux"]="$X8664" - ["i686-linux"]="$I686" - ["aarch64-linux"]="$AARCH64") - -write_for_platform "DARWIN_PLATFORMS" "macos" -write_for_platform "LIN_PLATFORMS" "linux" - -echo '}' >> $SRC_FILE - -log "moving tempfile to target directory" -mv "$SRC_FILE" "$MY_PATH/sources.nix" +systems=$(nix eval --json -f . dart.meta.platforms | jq --raw-output '.[]') +for system in $systems; do + hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw -f . dart.src.url --system "$system"))) + update-source-version dart $latestVersion $hash --file=$MY_PATH/sources.nix --system=$system --ignore-same-version --ignore-same-hash +done diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix index ee62f1da0e1f..38cbcc2682b1 100644 --- a/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -12,6 +12,7 @@ gmp, mpfr, libmpc, + sanitiseHeaderPathsHook, libucontext ? null, libxcrypt ? null, isSnapshot ? false, @@ -42,6 +43,10 @@ in texinfo which gettext + + # Prevent GCC leaking into the runtime closure of C++ packages + # through headers using `__FILE__`. + sanitiseHeaderPathsHook ] ++ optionals (perl != null) [ perl ] ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox || isSnapshot && flex != null) [ flex ] diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 1cd81dc4f669..a3d54f1b8525 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -49,6 +49,7 @@ !enablePlugin || (stdenv.targetPlatform.isAvr && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64), nukeReferences, + sanitiseHeaderPathsHook, callPackage, majorMinorVersion, apple-sdk, @@ -179,6 +180,7 @@ let pkgsBuildTarget profiledCompiler reproducibleBuild + sanitiseHeaderPathsHook staticCompiler stdenv targetPackages diff --git a/pkgs/development/compilers/gcc/ng/15/gcc/custom-threading-model.patch b/pkgs/development/compilers/gcc/ng/15/gcc/custom-threading-model.patch index 1a61dbbd7446..fb82e194263f 100644 --- a/pkgs/development/compilers/gcc/ng/15/gcc/custom-threading-model.patch +++ b/pkgs/development/compilers/gcc/ng/15/gcc/custom-threading-model.patch @@ -1,59 +1,50 @@ -From 1eaf7ce77bb4eb73e5565ede220557c2ef0290b0 Mon Sep 17 00:00:00 2001 +From 46280d27a5c96b2efa7a61f49ee8dc14f7e10d0c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 22 Aug 2021 01:14:22 -0400 -Subject: [PATCH] Allow explicitly specifying the thread model for runtime libs +Subject: [PATCH] Factor out thread model detection with `GCC_AC_THREAD_MODEL` +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit -Previously, they always scraped the thread mode from `$CC -v', now, that -is the default but one may pass `--with-threads=MODEL` to be explicit -instead. +This macro deduplicates the -One use-case is bootstraping with a shorter critical path. The -traditionally route was to build an entire "static stage" GCC, build -libc, and then build GCC again supporting dynamic linking, -multithreading, etc. But this is wasteful in that GCC itself is built -twice. + $CC -v 2>&1 | sed -n 's/^Thread model: //p' -With this change, rather than having to mess with spec files we can just -configure the runtime libraries the way we want directly. In turn, that -opens to just building libgcc twice rather than all of GCC. +check that was occurring in various runtime libs. -Frankly, specs were always a rather indirect approach to coordinate this -during GCC's bootstrap, since GCC itself really doesn't care what the -threading model is, just that the runtime libraries agree among -themselves. Relying on a hard-coded spec for this also keeps us one step -further from the long-term goal of multi-target GCC, for what it's -worth. +Additionally, as a bit of an Easter egg, this also allows overriding +what the compiler would return by setting the +`gcc_cv_target_thread_file` cache variable first. I admit that it is in +fact this Easter egg that led me to write the patch. The use-case for it +is for making multilib builds where the library sets do not all share +the same thread model easier. See also `THREAD_MODEL_SPEC` for more +about the varying thread models use-case. -For the record, "single stage" builds of GCC have some precedent in -downstream packaging, for example with [1]. That one, as far as I can -tell, builds libgcc once, but with the headers of the libc -implementation provided and then cyclic linking down later. They are -both fine approaches, but I don't think one should have to be forced -into cyclic dependencies if they don't want to. That opens the door to -non-terminating programs due to, e.g., atomics used in a threads -implementation being lowered to threads absent hardware support. +Arguably one could could try to define on `THREAD_MODEL_SPEC` on more +platforms (besides e.g. AIX) but the ramifications of this are a bit +unclear. Setting `gcc_cv_target_thread_file` directly is a "low tech" +solution that will work for now for sure. Of course, since setting a +cache variable like this a hacky trick, I will not expect this to be at +all stable/guaranteed to work, going forward. -Finally, I understand that such custom bootstrapping is not officially -supported. I don't mean to imply it should be --- a lot more cleanup -work to the build system would be necessary before supporting it -wouldn't be a huge additional maintainer burden --- I just hope to add a -reasonable knob for those comfortable with doing unsupported things -already. +Thanks to Arsen who on IRC discussed these things with me, including in +particular making it a cache var not `--with-model` flag, to not +prematurely foster expectations that this is stable. -[1]: https://github.com/richfelker/musl-cross-make +Suggested-by: Arsen Arsenović --- - config/gthr.m4 | 32 ++++++++++++++++++++++++++++++++ + config/gthr.m4 | 23 +++++++++++++++++++++++ libatomic/configure.ac | 4 +--- libgcc/configure.ac | 4 +--- libphobos/m4/druntime/os.m4 | 2 +- libstdc++-v3/acinclude.m4 | 8 +++----- - 5 files changed, 38 insertions(+), 12 deletions(-) + 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/config/gthr.m4 b/config/gthr.m4 -index 11996247f15..7aed5d3df0d 100644 +index 11996247f15..e8fac4a5721 100644 --- a/config/gthr.m4 +++ b/config/gthr.m4 -@@ -5,6 +5,35 @@ dnl Public License, this file may be distributed as part of a program +@@ -5,6 +5,26 @@ dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. @@ -62,34 +53,25 @@ index 11996247f15..7aed5d3df0d 100644 +dnl usage: GCC_AC_THREAD_MODEL +AC_DEFUN([GCC_AC_THREAD_MODEL], +[ -+# With threads ++# Specify the threading model for this GCC runtime library +# Pass with no value to take from compiler's metadata +# Pass with a value to specify a thread package +# 'single' means single threaded -- without threads. -+AC_ARG_WITH(threads, -+[AS_HELP_STRING([[--with-threads=MODEL]], -+ [specify thread model for this GCC -+ runtime library])],, -+[with_threads='']) -+ -+if test x"$with_threads" = x'yes'; then -+ AC_MSG_ERROR([Cannot pass bare --with-threads, must pass explicit --with-threads=MODEL]) -+elif test x"$with_threads" = x'no'; then -+ target_thread_file=single -+elif test x"$with_threads" = x''; then -+ AC_MSG_CHECKING([for thread model used by GCC]) -+ target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` -+ AC_MSG_RESULT([$target_thread_file]) -+else -+ target_thread_file=$with_threads -+fi ++AC_CACHE_CHECK([for the threading model used by GCC], [gcc_cv_target_thread_file], [ ++ # Set new cache variable ++ gcc_cv_target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` ++]) ++# Set variable name (not prefixed enough to be a good cache variable ++# name) traditionally used for this purpose, to avoid having to change ++# a bunch of configure scripts. ++target_thread_file="$gcc_cv_target_thread_file" +]) + + dnl Define header location by thread model dnl usage: GCC_AC_THREAD_HEADER([thread_model]) -@@ -23,6 +52,9 @@ case $1 in +@@ -23,6 +43,9 @@ case $1 in vxworks) thread_header=config/gthr-vxworks.h ;; win32) thread_header=config/i386/gthr-win32.h ;; mcf) thread_header=config/i386/gthr-mcf.h ;; @@ -100,7 +82,7 @@ index 11996247f15..7aed5d3df0d 100644 AC_SUBST(thread_header) ]) diff --git a/libatomic/configure.ac b/libatomic/configure.ac -index 85824fa7614..691f4948f6c 100644 +index aafae71028d..a1aa3bdf69f 100644 --- a/libatomic/configure.ac +++ b/libatomic/configure.ac @@ -162,9 +162,7 @@ libtool_VERSION=3:0:2 @@ -115,7 +97,7 @@ index 85824fa7614..691f4948f6c 100644 case "$target" in *aarch64*) diff --git a/libgcc/configure.ac b/libgcc/configure.ac -index 4e8c036990f..acf54e24c79 100644 +index 85e4f1bc48b..d44493f9653 100644 --- a/libgcc/configure.ac +++ b/libgcc/configure.ac @@ -305,9 +305,7 @@ AC_SUBST([use_tm_clone_registry]) @@ -130,7 +112,7 @@ index 4e8c036990f..acf54e24c79 100644 # Check for assembler CFI support. AC_CACHE_CHECK([whether assembler supports CFI directives], [libgcc_cv_cfi], diff --git a/libphobos/m4/druntime/os.m4 b/libphobos/m4/druntime/os.m4 -index 15cde3b04b8..28bd4d3d2bd 100644 +index ef8ca434407..7bb91362dbe 100644 --- a/libphobos/m4/druntime/os.m4 +++ b/libphobos/m4/druntime/os.m4 @@ -32,7 +32,7 @@ case $1 in @@ -143,10 +125,10 @@ index 15cde3b04b8..28bd4d3d2bd 100644 AC_SUBST(DCFG_THREAD_MODEL) ]) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 -index 51a08bcc8b1..71697f59d6d 100644 +index a0094c2dd95..66fc3abe4fd 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 -@@ -4342,9 +4342,7 @@ dnl Substs: +@@ -4345,9 +4345,7 @@ dnl Substs: dnl thread_header dnl AC_DEFUN([GLIBCXX_ENABLE_THREADS], [ @@ -157,7 +139,7 @@ index 51a08bcc8b1..71697f59d6d 100644 GCC_AC_THREAD_HEADER([$target_thread_file]) ]) -@@ -4354,7 +4352,8 @@ dnl Check if gthread implementation defines the types and functions +@@ -4357,7 +4355,8 @@ dnl Check if gthread implementation defines the types and functions dnl required by the c++0x thread library. Conforming gthread dnl implementations can define __GTHREADS_CXX0X to enable use with c++0x. dnl @@ -167,7 +149,7 @@ index 51a08bcc8b1..71697f59d6d 100644 dnl AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [ GLIBCXX_ENABLE(libstdcxx-threads,auto,,[enable C++11 threads support]) -@@ -4369,7 +4368,6 @@ AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [ +@@ -4372,7 +4371,6 @@ AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [ CXXFLAGS="$CXXFLAGS -fno-exceptions \ -I${toplevel_srcdir}/libgcc -I${toplevel_builddir}/libgcc" @@ -176,5 +158,5 @@ index 51a08bcc8b1..71697f59d6d 100644 posix) CXXFLAGS="$CXXFLAGS -DSUPPORTS_WEAK -DGTHREAD_USE_WEAK -D_PTHREADS" -- -2.44.1 +2.47.2 diff --git a/pkgs/development/compilers/gcc/ng/common/default.nix b/pkgs/development/compilers/gcc/ng/common/default.nix index 1b83e75015f9..98ce3bb89c1e 100644 --- a/pkgs/development/compilers/gcc/ng/common/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/default.nix @@ -121,6 +121,21 @@ makeScopeWithSplicing' { }; gfortran = wrapCCWith rec { + cc = gccPackages.gfortran-unwrapped; + libcxx = targetGccPackages.libstdcxx; + bintools = binutils; + extraPackages = [ + targetGccPackages.libgcc + ]; + nixSupport.cc-cflags = [ + "-B${targetGccPackages.libgcc}/lib" + "-B${targetGccPackages.libssp}/lib" + "-B${targetGccPackages.libatomic}/lib" + "-B${targetGccPackages.libgfortran}/lib/" + ]; + }; + + gfortranNoLibgfortran = wrapCCWith rec { cc = gccPackages.gfortran-unwrapped; libcxx = targetGccPackages.libstdcxx; bintools = binutils; @@ -211,7 +226,7 @@ makeScopeWithSplicing' { libgfortran = callPackage ./libgfortran { stdenv = overrideCC stdenv buildGccPackages.gcc; - inherit (buildGccPackages) gfortran; + gfortran = buildGccPackages.gfortranNoLibgfortran; }; libstdcxx = callPackage ./libstdcxx { diff --git a/pkgs/development/compilers/gcc/ng/common/gcc/default.nix b/pkgs/development/compilers/gcc/ng/common/gcc/default.nix index 1be2f007df5d..76454ebcaa99 100644 --- a/pkgs/development/compilers/gcc/ng/common/gcc/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/gcc/default.nix @@ -51,21 +51,10 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Submitted: - # - https://gcc.gnu.org/pipermail/gcc-patches/2021-August/577639.html - # - https://gcc.gnu.org/pipermail/gcc-patches/2021-August/577640.html - # - https://gcc.gnu.org/pipermail/gcc-patches/2021-August/577638.html - # - # In Git: https://github.com/Ericson2314/gcc/tree/prog-target-15 (getVersionFile "gcc/0001-find_a_program-First-search-with-machine-prefix.patch") (getVersionFile "gcc/0002-driver-for_each_pass-Pass-to-callback-whether-dir-is.patch") (getVersionFile "gcc/0003-find_a_program-Only-search-for-prefixed-paths-in-und.patch") - # Submitted: https://inbox.sourceware.org/gcc-patches/20210818203840.1550133-1-John.Ericson@Obsidian.Systems/T/#t - # In Git: https://github.com/Ericson2314/gcc/tree/libgcc-custom-threading-model-15 - (getVersionFile "gcc/custom-threading-model.patch") - - # TODO: fix up and send to upstream (getVersionFile "gcc/fix-collect2-paths.diff") ]; diff --git a/pkgs/development/compilers/gcc/ng/common/libgcc/default.nix b/pkgs/development/compilers/gcc/ng/common/libgcc/default.nix index 375ebc747a2f..907534c8f6f8 100644 --- a/pkgs/development/compilers/gcc/ng/common/libgcc/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libgcc/default.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-dependency-tracking" - "--with-threads=single" + "gcc_cv_target_thread_file=single" # $CC cannot link binaries, let alone run then "cross_compiling=true" # Do not have dynamic linker without libc diff --git a/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix b/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix index 4c328fe11632..7e2c5bc4fcd7 100644 --- a/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-dependency-tracking" - "--with-threads=single" + "gcc_cv_target_thread_file=single" # $CC cannot link binaries, let alone run then "cross_compiling=true" ]; diff --git a/pkgs/development/compilers/gcc/ng/common/libstdcxx/default.nix b/pkgs/development/compilers/gcc/ng/common/libstdcxx/default.nix index 3fed3ada0492..c8fbc047c515 100644 --- a/pkgs/development/compilers/gcc/ng/common/libstdcxx/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libstdcxx/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-dependency-tracking" "--with-toolexeclibdir=${builtins.placeholder "out"}/lib" - "--with-threads=posix" + "gcc_cv_target_thread_file=posix" "cross_compiling=true" "--disable-multilib" diff --git a/pkgs/development/compilers/gcc/ng/common/patches.nix b/pkgs/development/compilers/gcc/ng/common/patches.nix index 0db7ec10262b..d69ec0098fab 100644 --- a/pkgs/development/compilers/gcc/ng/common/patches.nix +++ b/pkgs/development/compilers/gcc/ng/common/patches.nix @@ -1,10 +1,18 @@ { + # TODO: fix up and send to upstream "gcc/fix-collect2-paths.diff" = [ { after = "15"; path = ../15; } ]; + + # Submitted (001--003): + # - https://gcc.gnu.org/pipermail/gcc-patches/2021-August/577639.html + # - https://gcc.gnu.org/pipermail/gcc-patches/2021-August/577640.html + # - https://gcc.gnu.org/pipermail/gcc-patches/2021-August/577638.html + # + # In Git: https://github.com/Ericson2314/gcc/tree/prog-target-15 "gcc/0001-find_a_program-First-search-with-machine-prefix.patch" = [ { after = "15"; @@ -23,6 +31,9 @@ path = ../15; } ]; + + # Submitted: https://gcc.gnu.org/pipermail/gcc-patches/2025-July/689429.html + # In Git: https://github.com/Ericson2314/gcc/tree/libgcc-custom-threading-model-15 "gcc/custom-threading-model.patch" = [ { after = "15"; diff --git a/pkgs/development/compilers/gcc/patches/11/gcc-issue-103910.patch b/pkgs/development/compilers/gcc/patches/11/gcc-issue-103910.patch deleted file mode 100644 index c3edd960f097..000000000000 --- a/pkgs/development/compilers/gcc/patches/11/gcc-issue-103910.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d243f4009d8071b734df16cd70f4c5d09a373769 Mon Sep 17 00:00:00 2001 -From: Andrew Pinski -Date: Wed, 5 Jan 2022 22:00:07 +0000 -Subject: [PATCH] Fix target/103910: missing GTY on x86_mfence causing PCH - usage to ICE - -With -O3 -march=opteron, a mfence builtin is added after the loop -to say the nontemporal stores are no longer needed. This all good -without precompiled headers as the function decl that is referneced -by x86_mfence is referenced in another variable but with precompiled -headers, x86_mfence is all messed up and the decl was GC'ed away. -This fixes the problem by marking x86_mfence as GTY to save/restore -during precompiled headers just like most other variables in -the header file. - -Committed as obvious after a bootstrap/test on x86_64-linux-gnu. - -gcc/ChangeLog: - - PR target/103910 - * config/i386/i386.h (x86_mfence): Mark with GTY. ---- - gcc/config/i386/i386.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h -index f027608eefa..3ac0f698ae2 100644 ---- a/gcc/config/i386/i386.h -+++ b/gcc/config/i386/i386.h -@@ -486,7 +486,7 @@ extern unsigned char ix86_prefetch_sse; - - /* Fence to use after loop using storent. */ - --extern tree x86_mfence; -+extern GTY(()) tree x86_mfence; - #define FENCE_FOLLOWING_MOVNT x86_mfence - - /* Once GDB has been enhanced to deal with functions without frame --- -2.31.1 - diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 0d6a9c66808d..9a55332ade9b 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -63,14 +63,26 @@ in ## 1. Patches relevant to gcc>=12 on every platform #################################### [ ] -++ optional (!atLeast12) ./fix-bug-80431.patch +# Backport "c++: conversion to base of vbase in NSDMI" +# Fixes https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 +++ optional (!atLeast12) (fetchpatch { + name = "gcc-bug80431-fix"; + url = "https://github.com/gcc-mirror/gcc/commit/de31f5445b12fd9ab9969dc536d821fe6f0edad0.patch"; + hash = "sha256-bnHKJP5jR8rNJjRTi58/N/qZ5fPkuFBk7WblJWQpKOs="; +}) +# Pass the path to a C++ compiler directly in the Makefile.in ++ optional (!lib.systems.equals targetPlatform hostPlatform) ./libstdc++-target.patch ++ optionals (noSysDirs) ( - [ (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch) ] + [ + # Do not try looking for binaries and libraries in /lib and /usr/lib + (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch) + ] ++ ( { "15" = [ + # Do not try looking for binaries and libraries in /lib and /usr/lib ./13/no-sys-dirs-riscv.patch + # Mangle the nix store hash in __FILE__ to prevent unneeded runtime references ./13/mangle-NIX_STORE-in-__FILE__.patch ]; "14" = [ @@ -92,12 +104,25 @@ in ."${majorVersion}" or [ ] ) ) +# Pass CFLAGS on to gnat ++ optional (atLeast12 && langAda) ./gnat-cflags-11.patch ++ optional langFortran ( + # Fix interaction of gfortran and libtool + # Fixes the output of -v + # See also https://github.com/nixOS/nixpkgs/commit/cc6f814a8f0e9b70ede5b24192558664fa1f98a2 if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch ) +# Do not pass a default include dir on PowerPC+Musl +# See https://github.com/NixOS/nixpkgs/pull/45340/commits/d6bb7d45162ac93e017cc9b665ae4836f6410710 ++ [ ./ppc-musl.patch ] +# Patches for libphobos, the standard library of the D language +# - Forces libphobos to be built with -j1, as libtool misbehaves in parallel +# - Gets rid of -idirafter flags added by our gcc wrappers, as gdc does not understand them +# See https://github.com/NixOS/nixpkgs/pull/69144#issuecomment-535176453 ++ optional langD ./libphobos.patch +# Moves the .cfi_starproc instruction to after the function label +# Needed to build llvm-18 and later +# See https://github.com/NixOS/nixpkgs/pull/354107/commits/2de1b4b14e17f42ba8b4bf43a29347c91511e008 ++ optional (!atLeast14) ./cfi_startproc-reorder-label-09-1.diff ++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff @@ -107,36 +132,54 @@ in # backport fixes to build gccgo with musl libc ++ optionals (stdenv.hostPlatform.isMusl && langGo && atLeast12) [ + # libgo: handle stat st_atim32 field and SYS_SECCOMP + # syscall: gofmt + # Add blank lines after //sys comments where needed, and then run gofmt + # on the syscall package with the new formatter. + # See https://go-review.googlesource.com/c/gofrontend/+/412074 (fetchpatch { excludes = [ "gcc/go/gofrontend/MERGE" ]; url = "https://github.com/gcc-mirror/gcc/commit/cf79b1117bd177d3d4c6ed24b6fa243c3628ac2d.diff"; hash = "sha256-mS5ZiYi5D8CpGXrWg3tXlbhp4o86ew1imCTwaHLfl+I="; }) + # libgo: permit loff_t and off_t to be macros + # See https://go-review.googlesource.com/c/gofrontend/+/412075 (fetchpatch { excludes = [ "gcc/go/gofrontend/MERGE" ]; url = "https://github.com/gcc-mirror/gcc/commit/7f195a2270910a6ed08bd76e3a16b0a6503f9faf.diff"; hash = "sha256-Ze/cFM0dQofKH00PWPDoklXUlwWhwA1nyTuiDAZ6FKo="; }) + # libgo: handle stat st_atim32 field and SYS_SECCOMP + # See https://go-review.googlesource.com/c/gofrontend/+/415294 (fetchpatch { excludes = [ "gcc/go/gofrontend/MERGE" ]; url = "https://github.com/gcc-mirror/gcc/commit/762fd5e5547e464e25b4bee435db6df4eda0de90.diff"; hash = "sha256-o28upwTcHAnHG2Iq0OewzwSBEhHs+XpBGdIfZdT81pk="; }) + # runtime: portable access to sigev_notify_thread_id + # See https://sourceware.org/bugzilla/show_bug.cgi?id=27417 + # See https://go-review.googlesource.com/c/gofrontend/+/434755 (fetchpatch { excludes = [ "gcc/go/gofrontend/MERGE" ]; url = "https://github.com/gcc-mirror/gcc/commit/e73d9fcafbd07bc3714fbaf8a82db71d50015c92.diff"; hash = "sha256-1SjYCVHLEUihdON2TOC3Z2ufM+jf2vH0LvYtZL+c1Fo="; }) + # syscall, runtime: always call XSI strerror_r + # See https://go-review.googlesource.com/c/gofrontend/+/454176 (fetchpatch { excludes = [ "gcc/go/gofrontend/MERGE" ]; url = "https://github.com/gcc-mirror/gcc/commit/b6c6a3d64f2e4e9347733290aca3c75898c44b2e.diff"; hash = "sha256-RycJ3YCHd3MXtYFjxP0zY2Wuw7/C4bWoBAQtTKJZPOQ="; }) + # libgo: check for makecontext in -lucontext + # See https://go-review.googlesource.com/c/gofrontend/+/458396 (fetchpatch { excludes = [ "gcc/go/gofrontend/MERGE" ]; url = "https://github.com/gcc-mirror/gcc/commit/2b1a604a9b28fbf4f382060bebd04adb83acc2f9.diff"; hash = "sha256-WiBQG0Xbk75rHk+AMDvsbrm+dc7lDH0EONJXSdEeMGE="; }) + # x86: Fix -fsplit-stack feature detection via TARGET_CAN_SPLIT_STACK + # Fixes compiling for non-glibc target (fetchpatch { url = "https://github.com/gcc-mirror/gcc/commit/c86b726c048eddc1be320c0bf64a897658bee13d.diff"; hash = "sha256-QSIlqDB6JRQhbj/c3ejlmbfWz9l9FurdSWxpwDebnlI="; @@ -174,9 +217,13 @@ in .${majorVersion} or [ ] ) +# Here we apply patches by Iains (https://github.com/iains) +# GitHub's "compare" API produces unstable diffs, so we resort to reusing +# diffs from the Homebrew repo. ++ optionals canApplyIainsDarwinPatches ( { "15" = [ + # Patches from https://github.com/iains/gcc-15-branch/compare/releases/gcc-15..gcc-15.1-darwin-rc1 (fetchpatch { name = "gcc-15-darwin-aarch64-support.patch"; url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a25079204c1cb3d78ba9dd7dd22b8aecce7ce264/gcc/gcc-15.1.0.diff"; @@ -184,6 +231,7 @@ in }) ]; "14" = [ + # Patches from https://github.com/iains/gcc-14-branch/compare/04696df09633baf97cdbbdd6e9929b9d472161d3..gcc-14.2-darwin-r2 (fetchpatch { # There are no upstream release tags nor a static branch for 14.3.0 in https://github.com/iains/gcc-14-branch. # aa4cd614456de65ee3417acb83c6cff0640144e9 is the merge base of https://github.com/iains/gcc-14-branch/tree/gcc-14-3-darwin-pre-0 and https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.3.0 @@ -193,20 +241,24 @@ in hash = "sha256-BSTSYnkBJBEm++mGerVVyaCUC4dUyXq0N1tqbk25bO4="; }) ]; + # Patches from https://github.com/iains/gcc-13-branch/compare/b71f1de6e9cf7181a288c0f39f9b1ef6580cf5c8..gcc-13-3-darwin "13" = [ (fetchpatch { name = "gcc-13-darwin-aarch64-support.patch"; url = "https://raw.githubusercontent.com/Homebrew/formula-patches/bda0faddfbfb392e7b9c9101056b2c5ab2500508/gcc/gcc-13.3.0.diff"; sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo="; }) + # Needed to build LLVM>18 ./cfi_startproc-reorder-label-2.diff ]; + # Patches from https://github.com/iains/gcc-12-branch/compare/2bada4bc59bed4be34fab463bdb3c3ebfd2b41bb..gcc-12-4-darwin "12" = [ (fetchurl { name = "gcc-12-darwin-aarch64-support.patch"; url = "https://raw.githubusercontent.com/Homebrew/formula-patches/1ed9eaea059f1677d27382c62f21462b476b37fe/gcc/gcc-12.4.0.diff"; sha256 = "sha256-wOjpT79lps4TKG5/E761odhLGCphBIkCbOPiQg/D1Fw="; }) + # Needed to build LLVM>18 ./cfi_startproc-reorder-label-2.diff ]; "11" = [ @@ -216,6 +268,7 @@ in url = "https://github.com/iains/gcc-11-branch/compare/5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6..gcc-11.5-darwin-r0.diff"; hash = "sha256-7lH+GkgkrE6nOp9PMdIoqlQNWK31s6oW+lDt1LIkadE="; }) + # Needed to build LLVM>18 ./cfi_startproc-reorder-label-2.diff ]; "10" = [ @@ -225,6 +278,7 @@ in url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...gcc-10-5Dr0-pre-0.diff"; hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk="; }) + # Needed to build LLVM>18 ./cfi_startproc-reorder-label-2.diff ]; } @@ -241,7 +295,8 @@ in ## Windows -# Obtain latest patch with ../update-mcfgthread-patches.sh +# Backported mcf thread model support from gcc13: +# https://github.com/gcc-mirror/gcc/commit/f036d759ecee538555fa8c6b11963e4033732463 ++ optional ( !atLeast13 && !withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf" ) (./. + "/${majorVersion}/Added-mcf-thread-model-support-from-mcfgthread.patch") @@ -259,12 +314,19 @@ in ## gcc 11.0 and older ############################################################################## # openjdk build fails without this on -march=opteron; is upstream in gcc12 -++ optionals (is11) [ ./11/gcc-issue-103910.patch ] +++ optional is11 (fetchpatch { + name = "darwin-aarch64-self-host-driver.patch"; + url = "https://github.com/gcc-mirror/gcc/commit/d243f4009d8071b734df16cd70f4c5d09a373769.patch"; + sha256 = "sha256-H97GZs2wwzfFGiFOgds/5KaweC+luCsWX3hRFf7+Sm4="; +}) ## gcc 10.0 and older ############################################################################## +# Probably needed for gnat wrapper https://github.com/NixOS/nixpkgs/pull/62314 ++ optional (langAda && (is9 || is10)) ./gnat-cflags.patch ++ + # Backport native aarch64-darwin compilation fix from gcc12 + # https://github.com/NixOS/nixpkgs/pull/167595 optional ( is10 @@ -272,7 +334,8 @@ in && (!lib.systems.equals targetPlatform buildPlatform) ) (fetchpatch { - url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch"; + name = "0008-darwin-aarch64-self-host-driver.patch"; + url = "https://github.com/gcc-mirror/gcc/commit/834c8749ced550af3f17ebae4072fb7dfb90d271.diff"; sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA="; }) @@ -284,6 +347,9 @@ in ## gcc 9.0 and older ############################################################################## ++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch +# Needed for NetBSD cross comp in older versions +# https://gcc.gnu.org/pipermail/gcc-patches/2020-January/thread.html#537548 +# https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=98d56ea8900fdcff8f1987cf2bf499a5b7399857 ++ optional (!atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch # Make Darwin bootstrap respect whether the assembler supports `--gstabs`, diff --git a/pkgs/development/compilers/gcc/patches/fix-bug-80431.patch b/pkgs/development/compilers/gcc/patches/fix-bug-80431.patch deleted file mode 100644 index 2d688b8c7997..000000000000 --- a/pkgs/development/compilers/gcc/patches/fix-bug-80431.patch +++ /dev/null @@ -1,92 +0,0 @@ -From de31f5445b12fd9ab9969dc536d821fe6f0edad0 Mon Sep 17 00:00:00 2001 -From: Patrick Palka -Date: Mon, 21 Jun 2021 07:54:26 -0400 -Subject: [PATCH] c++: conversion to base of vbase in NSDMI [PR80431] - -The delayed processing of conversions to a virtual base in an NSDMI -assumes the target base type is a (possibly indirect) virtual base of -the current class, but the target base type could also be a base of a -virtual base, as in the testcase below. Since such a base isn't a part -of CLASSTYPE_VBASECLASSES, we end up miscompiling the testcase due to -the call to build_base_path (with binfo=NULL_TREE) silently returning -error_mark_node. Fix this by using convert_to_base to build the -conversion instead. - - PR c++/80431 - -gcc/cp/ChangeLog: - - * tree.c (bot_replace): Use convert_to_base to build the - conversion to the (morally) virtual base. - -gcc/testsuite/ChangeLog: - - * g++.dg/cpp0x/nsdmi-virtual1a.C: New test. ---- - gcc/cp/tree.c | 14 ++++------ - gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C | 28 ++++++++++++++++++++ - 2 files changed, 33 insertions(+), 9 deletions(-) - create mode 100644 gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C - -diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c -index fec5afaa2be..297da2b1550 100644 ---- a/gcc/cp/tree.c -+++ b/gcc/cp/tree.c -@@ -3242,15 +3242,11 @@ bot_replace (tree* t, int* /*walk_subtrees*/, void* data_) - else if (TREE_CODE (*t) == CONVERT_EXPR - && CONVERT_EXPR_VBASE_PATH (*t)) - { -- /* In an NSDMI build_base_path defers building conversions to virtual -- bases, and we handle it here. */ -- tree basetype = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (*t))); -- vec *vbases = CLASSTYPE_VBASECLASSES (current_class_type); -- int i; tree binfo; -- FOR_EACH_VEC_SAFE_ELT (vbases, i, binfo) -- if (BINFO_TYPE (binfo) == basetype) -- break; -- *t = build_base_path (PLUS_EXPR, TREE_OPERAND (*t, 0), binfo, true, -+ /* In an NSDMI build_base_path defers building conversions to morally -+ virtual bases, and we handle it here. */ -+ tree basetype = TREE_TYPE (*t); -+ *t = convert_to_base (TREE_OPERAND (*t, 0), basetype, -+ /*check_access=*/false, /*nonnull=*/true, - tf_warning_or_error); - } - -diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C -new file mode 100644 -index 00000000000..dc847cc16e5 ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C -@@ -0,0 +1,28 @@ -+// PR c++/80431 -+// { dg-do run { target c++11 } } -+ -+// A variant of nsdmi-virtual1.C where A is only a morally virtual base of B. -+ -+struct A -+{ -+ A(): i(42) { } -+ int i; -+ int f() { return i; } -+}; -+ -+struct D : A { int pad; }; -+ -+struct B : virtual D -+{ -+ int j = i + f(); -+ int k = A::i + A::f(); -+}; -+ -+struct C: B { int pad; }; -+ -+int main() -+{ -+ C c; -+ if (c.j != 84 || c.k != 84) -+ __builtin_abort(); -+} --- -2.31.1 - diff --git a/pkgs/development/compilers/gcc/patches/update-mcfgthread-patches.sh b/pkgs/development/compilers/gcc/patches/update-mcfgthread-patches.sh deleted file mode 100755 index c4fd79b26c34..000000000000 --- a/pkgs/development/compilers/gcc/patches/update-mcfgthread-patches.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl - -# We use this script to download local copies instead of using -# fetchpatch because lmhouse/MINGW-packages-dev is constantly rebased -# against msys2/MINGW-packages-dev and won't have stable commit hashes. - -name=Added-mcf-thread-model-support-from-mcfgthread.patch -source=https://raw.githubusercontent.com/lhmouse/MINGW-packages-dev/master/mingw-w64-gcc-git -dest=$(dirname "$0") - -for majorVersion in 6 7 8 9 10; do - curl "$source/9000-gcc-$majorVersion-branch-$name" \ - > "$dest/$majorVersion/$name" -done diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix index 65f6d133287a..ff70b4587eb3 100644 --- a/pkgs/development/compilers/ghc/9.0.2-binary.nix +++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix @@ -136,6 +136,7 @@ let fileToCheckFor = null; } ]; + isHadrian = true; }; aarch64-darwin = { variantSuffix = ""; @@ -158,6 +159,7 @@ let fileToCheckFor = null; } ]; + isHadrian = true; }; }; # Binary distributions for the musl libc for the respective system. @@ -179,6 +181,7 @@ let fileToCheckFor = "libncursesw.so.6"; } ]; + isHadrian = true; }; }; }; @@ -310,7 +313,7 @@ stdenv.mkDerivation { # To link RTS in the end we also need libffi now find . -name 'rts*.conf' \ -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libffi}/lib' \ - -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \ + -e 's@/.*/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \ -i {} \; '' + @@ -360,13 +363,23 @@ stdenv.mkDerivation { makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ]; # Patch scripts to include runtime dependencies in $PATH. - postInstall = '' - for i in "$out/bin/"*; do - test ! -h "$i" || continue - isScript "$i" || continue - sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" - done - ''; + postInstall = + '' + for i in "$out/bin/"*; do + test ! -h "$i" || continue + isScript "$i" || continue + sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" + done + '' + # On Darwin, GHC doesn't install a bundled libffi.so, but instead uses the + # system one (see postUnpack). Due to a bug in Hadrian, the (bundled) libffi + # headers are installed anyways. This problem has been fixed in GHC 9.2: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8189. While the system + # header should shadow the GHC installed ones, remove them to be safe. + + lib.optionalString (stdenv.hostPlatform.isDarwin && binDistUsed.isHadrian or false) '' + echo Deleting redundant libffi headers: + find "$out" '(' -name ffi.h -or -name ffitarget.h ')' -print -delete + ''; # Apparently necessary for the ghc Alpine (musl) bindist: # When we strip, and then run the diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 850a58fa594b..64fd4ee4b139 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -33,9 +33,9 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y="; "21.0.0-git".gitRelease = { - rev = "be4cd9f4da981af3b93a180239cd631910b542d8"; - rev-version = "21.0.0-unstable-2025-07-06"; - sha256 = "sha256-cNJL0374m1LL5G7aS9CO/ufild5wfvhXcqwhqJXUZYA="; + rev = "e08833443256f8dde2f864853fa9491ffa7112d5"; + rev-version = "21.0.0-unstable-2025-07-13"; + sha256 = "sha256-O0mh9Kq6PHvGiCigjb5rDDqHNFBhy5Dv+IP67TstX8U="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index f397a7c2105b..a6913dc9bdc8 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -428,6 +428,7 @@ stdenv.mkDerivation (finalAttrs: { buildFlags = if atLeast17 then [ "images" ] else [ "all" ]; separateDebugInfo = true; + __structuredAttrs = true; # -j flag is explicitly rejected by the build system: # Error: 'make -jN' is not supported, use 'make JOBS=N' diff --git a/pkgs/development/compilers/rust/1_87.nix b/pkgs/development/compilers/rust/1_88.nix similarity index 66% rename from pkgs/development/compilers/rust/1_87.nix rename to pkgs/development/compilers/rust/1_88.nix index a47f3dfca8ae..2bf2a6c2875f 100644 --- a/pkgs/development/compilers/rust/1_87.nix +++ b/pkgs/development/compilers/rust/1_88.nix @@ -45,8 +45,8 @@ let in import ./default.nix { - rustcVersion = "1.87.0"; - rustcSha256 = "sha256-FJu5/Sm+WS2k6HkA/GjwYpo3v2hQtGM53URDTAT9jnY="; + rustcVersion = "1.88.0"; + rustcSha256 = "sha256-OpdURDSEiuPRk9HWvIPW8ky4XCYa2V+VX95H7GTPz74="; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; @@ -104,29 +104,29 @@ import ./default.nix # Note: the version MUST be the same version that we are building. Upstream # ensures that each released compiler can compile itself: # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 - bootstrapVersion = "1.87.0"; + bootstrapVersion = "1.88.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "53138ed9a47d520e4734fb73224925e84c8a90d391db388dcfc03a1b38dac530"; - x86_64-unknown-linux-gnu = "1f6f18ce19387c42968a474cf175e67f99280614ded9c752d5d2e37af3204bcd"; - x86_64-unknown-linux-musl = "ab3951f30b08104de8b578df4776645a81939d7d918000ce231a35389ae59df8"; - arm-unknown-linux-gnueabihf = "9e62054e809534c1b2f62036d8331423a113ab3b8265bca08a715f339dec89c5"; - armv7-unknown-linux-gnueabihf = "9c9133e8a88dede2036d240ed3b792b93a1bbf444b6b2b6998df58b0c7bcdd83"; - aarch64-unknown-linux-gnu = "2c66e31d774a0dcd4422db74584ebc6362ff3ae90c452caff9d2fb912c821e8d"; - aarch64-unknown-linux-musl = "6f301f0ee7d3be2fdd245432c01543a4c61413b5d0a62493e5b0d57d9756b0b6"; - x86_64-apple-darwin = "867a84a93c6ba0b468b78b52004a6307d6f5e2e5598e64f65726c6810b6f7c82"; - aarch64-apple-darwin = "249496972e6f845f052036b9d7e73f816418412de2b266ec717b9050c1810dc3"; - powerpc64-unknown-linux-gnu = "27dd377367d7ba1757e1c768b259622d25a9cd927e126c9788dce9e880ffa925"; - powerpc64le-unknown-linux-gnu = "3f8f68d79460475396a52b5ae70eee73d6fb194fff1c4ff4286b64fbebee4429"; - riscv64gc-unknown-linux-gnu = "ea25b048bad7737188345392d1a0dfa92aa3ed6c00834b0974bdba52cb2398c4"; - s390x-unknown-linux-gnu = "198d3bda0daef12f86b8171025c62fee0a3caa59fa82c22c364d1a69305d8f46"; - loongarch64-unknown-linux-gnu = "61eee03a25a51a74b057d661c3be6c4052e781adcb118b555cb41e0b108cabf4"; - loongarch64-unknown-linux-musl = "b002ed82c1b7ccec039d18c5ee131e953a350c535b710d56ae204935810eb11e"; - x86_64-unknown-freebsd = "b675d11e521e50a45506001479e77a65b9d89cf4caf588381264a511a3c1c49a"; + i686-unknown-linux-gnu = "987738444da172dc2d8c9ab93c6178f0000ced44a3089013839e5916755c4844"; + x86_64-unknown-linux-gnu = "ad6f0cc845e7fcca17fd451bafd2c04a7bbcb543f8f3ef5bc412fd1fef99ef7b"; + x86_64-unknown-linux-musl = "8bea28e71582d1bb29031ea2783a6cf2be626fdbcec24b5bca75c85b9b3ca92d"; + arm-unknown-linux-gnueabihf = "cd269f3d53c286c0d0b0014947a4023d86698eac96b456ce746260ef21eec6af"; + armv7-unknown-linux-gnueabihf = "718b8110c8f8ea40282b4a0e2efa09c4a91472eec45739f3b37ecc03f2b53954"; + aarch64-unknown-linux-gnu = "dbc75abc31d142eacf15e60d0e51c4f291539974221d217b80786756b0ce1d6b"; + aarch64-unknown-linux-musl = "9ccb8f16656d2d4e412553ebaf13489198b915519873752dcebb886de50063c6"; + x86_64-apple-darwin = "b36b0bfac17e0a1f6cc06b9fdc4e2131ad578b4122a67792236b58650ae4c5c8"; + aarch64-apple-darwin = "dee921b9a41b1c3fbb088ad31dcca3b232de2cb89c268db75f40912eeaa474db"; + powerpc64-unknown-linux-gnu = "b56e903c6e4d661b6025d45b2675c31d513db207dbd85929c1a25473129275e3"; + powerpc64le-unknown-linux-gnu = "e1f16b2885237695f3cce7fc2f0128a938fc07462b076cb61bd2f06e5f8baf38"; + riscv64gc-unknown-linux-gnu = "6a72741671555fad7ffaceeaa32510c877438087ae71901ccf4a2b03a76c8439"; + s390x-unknown-linux-gnu = "498ec8be66b2c6d8bc77dd06e226d3cc7448bc508ebb9f6d7650db79350d0cb7"; + loongarch64-unknown-linux-gnu = "d4cb16ce9e2f04a7c44efe0abe5fc6cf2b9084f349fac042070882300719cbde"; + loongarch64-unknown-linux-musl = "b9c0c6ca12312dbf8ab80571816fc68b615628ae4fdd0f204c11b71264550b87"; + x86_64-unknown-freebsd = "961de5d723b034c1308d2b4a4d710fe006fb87bdbf914d045c01a5df87a0b332"; }; - selectRustPackage = pkgs: pkgs.rust_1_87; + selectRustPackage = pkgs: pkgs.rust_1_88; } ( diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 01bcdfd11fb0..18a889fe9349 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -260,6 +260,17 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/311930 "--llvm-libunwind=${if withBundledLLVM then "in-tree" else "system"}" "--enable-use-libcxx" + ] + ++ optionals (!stdenv.hostPlatform.isx86_32) [ + # This enables frame pointers for the compiler itself. + # + # Note that when compiling std, frame pointers (or at least non-leaf + # frame pointers, depending on version) are unconditionally enabled and + # cannot be overridden, so we do not touch that. (Also note this only + # applies to functions that can be immediately compiled when building + # std. Generic functions that do codegen when called in user code obey + # -Cforce-frame-pointers specified then, if any) + "--set rust.frame-pointers" ]; # if we already have a rust compiler for build just compile the target std diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 26ff6f45891d..d1a5e9bd3928 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -24,21 +24,13 @@ let versionMap = { # Necessary for Nyxt - "2.4.6" = { - sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; - }; + "2.4.6".sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; # Necessary for stumpwm - "2.4.10" = { - sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; - }; + "2.4.10".sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.5.2" = { - sha256 = "sha256-XcJ+un3aQz31P9dEHeixFHSoLNrBaJwfbOVfoGXWX6w="; - }; - "2.5.4" = { - sha256 = "sha256-XxS07ZKUKp44dZT6wAC5bbdGfpzlYTBn/8CSPfPsIHI="; - }; + "2.5.4".sha256 = "sha256-XxS07ZKUKp44dZT6wAC5bbdGfpzlYTBn/8CSPfPsIHI="; + "2.5.5".sha256 = "sha256-ZQJnCvs2G6m+RKL6/pr5tZ57JK5QmnkaZrVIHylVlQs="; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 107a34419b07..d1db6a2b711c 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,36 +6,36 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "4", - "sha256": "2e1f667395cdb1e872bd7320e3eda96c0f0978e29e574e75f9cdf61160e8974a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "5defac0a735690b04bc1bbe9d7e3b5faed6dd54f946858349ba114394f8fb386", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" } }, "openjdk17": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "259c85e16f7bbfdfb3e0a2ec1c5d6e2063300d413422286583265a9d8a882358", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "c596f5c627f84cd801bd7a443cd0743304a6aabb7397e0fdbfad16a9517f7f98", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "2798990401d9c47eaeddb7d5148f577770e4c1013b9223290a43765463204ae4", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "76dbb5152f15e509a5fc965936b2b912f806bb977853ab028c362c5340b1c4e9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "6c66470a9143ad562570a34c1583d9fa50bf904f6f9ced642e9d800ce043a0f3", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "79ecc4b213d21ae5c389bea13c6ed23ca4804a45b7b076983356c28105580013", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" } }, "openjdk23": { @@ -56,28 +56,28 @@ }, "openjdk24": { "aarch64": { - "build": "36", - "sha256": "4a673456aa6e726b86108a095a21868b7ebcdde050a92b3073d50105ff92f07f", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_alpine-linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "97b14f9c2f7e7ba4d4a958bba6835a23353b5fd858725031fc42af4f40a5a4ad", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_aarch64_alpine-linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "a642608f0da78344ee6812fb1490b8bc1d7ad5a18064c70994d6f330568c51cb", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "74627af4084a9eb65cc5bad3bb5723b89f1ffb5eaec9afbd696ec5bf684ed79a", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "9fcb96380b25c1d1caec65b7606c387716a7ae51caf359f5f3ff0dcca40f231f", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "be8abae7586c328ceb3252aefed9e51c29be91616968c0130b41e7e57c846f0f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" } } }, @@ -86,36 +86,36 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "4", - "sha256": "69031fc68d41189691dbeca73447ca543040d26995f61cef83fd7aed8fb4dbd2", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "5de5d17c737554ad3ba3b896679bb9af4d6c5dfe3b707931cc8b78f538a3f886", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "9dcc53a30676692e604571a6e0bd13ac0c1b15f4bc2b78d19f88bd316075f84a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "38c90337ca2471085f9292d24bec75413b4e56c7826ef25e150a40cc2f727e36", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "bcd459e70cdddaa6ada0d855ce944c592814042f1e12d53aa08fa89eedcdf893", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "53877576d3a9dcbf2024789208aa5f045cc65a5645b07d67124b09c2a84f4e1a", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "2330f38feb59ab7af0e2fffc12d5500005d35f7f53f49dd8a9f9aa1ae68aee5f", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "f252e13683b381f9f3bfa4948c827ebd80b8e5bd444a1f99de02c56d76c7ad4c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" } }, "openjdk23": { @@ -136,28 +136,28 @@ }, "openjdk24": { "aarch64": { - "build": "36", - "sha256": "0bc8181c7e85d55bba652503db62e60846439f279271d583b740ac70f9f5ae87", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_alpine-linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "1e8b49129ce3208299c93a73455b090909a65478313ed411b4574d09c8ae9670", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_aarch64_alpine-linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "0f738719d0483d6fe7f08a1371d1c696d68dcfe39f073b4241673f35ffc8d655", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_alpine-linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "409eaa7cf973e5d47b285cd86082b620422e6bbbcf0314c10346250f1e6c66d9", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_x64_alpine-linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "4fb0636534b0cd4534a3cdcbbe7cf2e937523d6376d9cef00cc6cfd5d19537e8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "3282abad4d63a1cdbfa9f98a3d73e7e09bc810a5612f5f37586c0df901478082", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" } } } @@ -166,104 +166,104 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "4", - "sha256": "e7b3d37c347fe7af2a53711f16da8b9b164748ce4a84e47bb0739c3be7f1c421", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "4decd2e5caf4667144091cf723458b14148dc990730b3ecb34bba5eb1aa4ad5d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "armv6l": { - "build": "4", - "sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "5eb00b18e37757775e6f46c706eae38d9e91be49de5712987801cba8ffd77767", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_arm_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "armv7l": { - "build": "4", - "sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "5eb00b18e37757775e6f46c706eae38d9e91be49de5712987801cba8ffd77767", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_arm_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "packageType": "jdk", "powerpc64le": { - "build": "4", - "sha256": "42c63651125a149cee2ba781300d75ffa67a25032f95038d50ee6d6177cb2e41", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "9407ecef765ec681fb187f084f1e029001abd5baf7a13b32067e9cbdfb140130", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "vmType": "hotspot", "x86_64": { - "build": "4", - "sha256": "7def4c5807b38ef1a7bb30a86572a795ca604127cc8d1f5b370abf23618104e6", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "dc6136eaa8c1898cbf8973bb1e203e1f653f4c9166be0f5bebe0b02c5f3b5ae3", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_x64_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "62efc3e83fc9bcd08db7c4f02977328cb3559a54519078d8337314cf025d19b7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "0db0d6cbe33238f33aa52837b1dc8fc6067b34d206b3e0f9243c7f8c9b9539a5", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "armv6l": { - "build": "7", - "sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "8a3c859355f898c119d154e4caf867263e0e4c8065a91d63ae10666c19bc1108", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_arm_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "armv7l": { - "build": "7", - "sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "8a3c859355f898c119d154e4caf867263e0e4c8065a91d63ae10666c19bc1108", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_arm_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "f4cb9ee5906a44d110fa381310cd7181d95498d27087d449e7e9b74bddd9def2", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "0823d92d9537fcdd56952abc450d1f9585b4d329f8f884dcb230a2e08db6bf5d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "riscv64": { - "build": "7", - "sha256": "d7ba818b1417b67f1f3cdcf7c5fac5e179998469dce7448349f24175eb9b2871", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "1a9a532a6c3e591c5eb72ef875d0f5825961bf8cb0eeea876d7f1e198575ed49", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "a3af83983fb94dd7d11b13ba2dba0fb6819dc2caaf87e6937afd22ad4680ae9a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "9616877c733c9249328ea9bd83a5c8c30e0f9a7af180cac8ffda9034161c2df2", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "04fe1273f624187d927f1b466e8cdb630d70786db07bee7599bfa5153060afd3", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "31dba70ba928c78c20d62049ac000f79f7a7ab11f9d9c11e703f52d60aa64f93", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "163724b70b86d5a8461f85092165a9cc5a098ed900fee90d1b0c0be9607ae3d2", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "2ddc0dc14b07d9e853875aac7f84c23826fff18b9cea618c93efe0bcc8f419c2", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "riscv64": { - "build": "7", - "sha256": "203796e4ba2689aa921b5e0cdc9e02984d88622f80fcb9acb05a118b05007be8", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "d75f33ee7f9e5532bce263db83443ffed7d9bae7ff3ed41e48d137808adfe513", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "a2650fba422283fbed20d936ce5d2a52906a5414ec17b2f7676dddb87201dbae", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "974d3acef0b7193f541acb61b76e81670890551366625d4f6ca01b91ac152ce0", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_x64_linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" } }, "openjdk23": { @@ -296,168 +296,168 @@ }, "openjdk24": { "aarch64": { - "build": "36", - "sha256": "18071047526ab4b53131f9bb323e8703485ae37fcb2f2c5ef0f1b7bab66d1b94", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "a598260e340028d9b2383c23df16aa286769a661bd3bf28a52e8c1a5774b1110", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_aarch64_linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "packageType": "jdk", "powerpc64le": { - "build": "36", - "sha256": "3a5641ab862a2bbae56886d4ec47f735052780bfe124df7aea2ca40e0f973b5a", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_ppc64le_linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "770e7e506d5ea3baf6c4c9004a82648e29508a1c731d8425acded34906e91b09", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_ppc64le_linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "riscv64": { - "build": "36", - "sha256": "a1d993ab0b4b80101ec2e2452bdd37735572b734c255576a47c5130eab55f09a", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_riscv64_linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "4e953ec63e141b667e02f7179304c6553cbd13ba94b60dcadd8e45c7f309c89d", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_riscv64_linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "c340dee97b6aa215d248bc196dcac5b56e7be9b5c5d45e691344d40d5d0b171d", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "78832cb5ea4074f2215cde0d01d6192d09c87636fc24b36647aea61fb23b8272", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_x64_linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" } }, "openjdk8": { "aarch64": { - "build": "6", - "sha256": "1d1662bd8ca7edc9281c723d9eebafea940e6a41464bdc43a83b564bc974c7e5", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "d8a1aecea0913b7a1e0d737ba6f7ea99059b3f6fd17813d4a24e8b3fc3aee278", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" }, "armv6l": { - "build": "6", - "sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "a467f86d0dc4c9077edeac5eeae0622a556399180628eee6969c745afb1deaf0", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" }, "armv7l": { - "build": "6", - "sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "a467f86d0dc4c9077edeac5eeae0622a556399180628eee6969c745afb1deaf0", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" }, "packageType": "jdk", "powerpc64le": { - "build": "6", - "sha256": "7eac77deb8fc6c6130f9445c9a68af0bcc40bf6736b5672ef5c3d737c025e84d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "ff6e0f7fad0f46fea47193b95e4187e294ba69bb9059704f5df9f2fb74125732", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" }, "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "5b0a0145e7790552a9c8767b4680074c4628ec276e5bb278b61d85cf90facafa", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "9448308a21841960a591b47927cf2d44fdc4c0533a5f8111a4b243a6bafb5d27", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "4", - "sha256": "4ececb5c229763107e9e4acf3b7035db38cf18a98a47176fa5ed1be3f3d15518", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "e486056040ea7878a6e676bf8fd9112128045b3c1e5230b5dcf73756fc63f7e5", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "armv6l": { - "build": "4", - "sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "4cdccdb7da9590635bc9ef60c5c1d3b6c74dd7df2b8c2d265957c54cc6afa274", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_arm_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "armv7l": { - "build": "4", - "sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "4cdccdb7da9590635bc9ef60c5c1d3b6c74dd7df2b8c2d265957c54cc6afa274", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_arm_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "packageType": "jre", "powerpc64le": { - "build": "4", - "sha256": "69b38f0dde128d8c606012335cd60f1f55afa09b4135582188943bee699ebf03", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "4f8d67bd58137bac307cd6a07f4454ca92dc21632505e9bd8e41652a741d10e9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "vmType": "hotspot", "x86_64": { - "build": "4", - "sha256": "d26c566a7010d1303d3979b6f076e7911b49419a609c9e4d81f27262bf47f87c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_linux_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "d854baf8fcf835e28142d1519b88a1367c117e01fa1c18e34f9a1435d02a0437", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_x64_linux_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "bab3f352fc7144ac1435924f056872d16f4b32c8bcda58b9a77b636eb1c664f4", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "c89467f543bd434b71f3b748adeeeb1b2692f90242824b78205be1ae72ba385f", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "armv6l": { - "build": "7", - "sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "c5ba30280b49f5654440c897265819ed749259afd2d46d3136720ab182933679", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_arm_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "armv7l": { - "build": "7", - "sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "c5ba30280b49f5654440c897265819ed749259afd2d46d3136720ab182933679", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_arm_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "2a730e9d34cce4d588739b626a034ed68c065a2db61048ee7886be48ec9fe460", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "f35795f3f62885460e96ebcc2ee4e34bb59ab0d1668f0dc0642070ed89e3dda9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "riscv64": { - "build": "7", - "sha256": "2f77e44aa9fec9cf35b0b1fd492055e7fec0a3ea4d4338def6b42bd46d485e02", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "392d179be0f9fde0b74aeb1f308be8324c2aa8c970a5c5ea456993fcbb7aa798", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "a4b0015872758aac6a5d17139e952a3951ee536ae6d9a99828823a80a71add56", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "aaed740c38ff1e87a4b920f9deb165d419d9fdf23f423740d2ecb280eeab9647", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_x64_linux_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "f1b78f2bd6d505d5e0539261737740ad11ade3233376b4ca52e6c72fbefd2bf6", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "ab455a401d25e0cd20e652d2ee72e9f56beba0d9faac5a5c62c9b27a19df804b", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "381e31581af3858d4c471829c3da3263e83dfe8ac5d36b58403babb57f6e202c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "721d3b374cb333269d487e7f99e2d247576c989d2e08a2842738ef62f432bcbd", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "riscv64": { - "build": "7", - "sha256": "a8d219a4a97f9c53ba88cb8927910005d4f3d08a87ab1bdebff921ef41afa93d", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "8fd14594d0ad8576ba9b698fd10df4a297c548cfdc81cfbe52ac660aeaf5e2b2", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "7fc9d6837da5fa1f12e0f41901fd70a73154914b8c8ecbbcad2d44176a989937", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "6d48379e00d47e6fdd417e96421e973898ac90765ea8ff2d09ae0af6d5d6a1c6", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_x64_linux_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" } }, "openjdk23": { @@ -490,64 +490,64 @@ }, "openjdk24": { "aarch64": { - "build": "36", - "sha256": "782a46008490272affe0b797155c2ae8e759e10c8ba4540f1f7285ef3d2902de", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "ef2841ac661b18554961da14ae39ce7fec795fb53f6d52f0df3736c95db42e70", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_aarch64_linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "packageType": "jre", "powerpc64le": { - "build": "36", - "sha256": "e7c90ab80d5e9419f794aee63c8f1bf3ed29e656d4e8e967a45d3069bd643c07", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_ppc64le_linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "8f24261481d61470c636ba3698ab8ebd697ab6b766ce468f82513eb60dfb48b9", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_ppc64le_linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "riscv64": { - "build": "36", - "sha256": "3a670b2116cfc7e806ebccf6ad3b5601936581afc666587653c47e642c0acf19", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_riscv64_linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "f61ecea7d2b74036b51ba5f173137344ea3909c92eebe75a1f2b0ecec2037fa0", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_riscv64_linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "e8d8f5707d765a6bfca3de61320e0bb2618191c77947bc467ac5021e6193f351", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_linux_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "88fb6ad6477ca160a554c8e636c4aa2096f6424828a7e1d90464e105df882875", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_x64_linux_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" } }, "openjdk8": { "aarch64": { - "build": "6", - "sha256": "730ed649ee973b7408cf7107e90576b67e8ed4b3aebb9e3e8a1056151f373152", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "5d0c81fd8bee49d1b9931acaecdc528fdc9393547cf5b24880445ade6b3f2384", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" }, "armv6l": { - "build": "6", - "sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "6c0f29b6011d0baa46f90a572691b77ea93a45b4e5037141777a236956945c50", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_arm_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" }, "armv7l": { - "build": "6", - "sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "6c0f29b6011d0baa46f90a572691b77ea93a45b4e5037141777a236956945c50", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_arm_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" }, "packageType": "jre", "powerpc64le": { - "build": "6", - "sha256": "812ebf110f1d1cfc26a135368850064f96689e7918aa6bbac1c8f210fad5752f", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "d9b523defdea8b82647726de8f62b57a19f2c64020b9ab6dbc5ae4929d0ee64e", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_ppc64le_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" }, "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "730fe33b1fc1f7da1e325d007b475d25a063850a167b548ea4bf689d4fcd867d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_linux_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "0c76f94e1b400a4da932a3f581b0788af2101819083184f40a6c76ac9b97081f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_x64_linux_hotspot_8u452b09.tar.gz", + "version": "8.0.452" } } } @@ -556,50 +556,50 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "4", - "sha256": "c970e5917964da1b50c0029ba88a6fbe962783def4de6a8a2835af6a6859002c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "780ae402dcd93fea0fee10d02dcd0a0b72cb7298f2ef4dddbad4d54c31a40a4d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "4", - "sha256": "b0142c2c85da43bb3565321164e8129b1166de5d6a43c88e567a92c39128c003", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_mac_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "805d225d46eab5702bf2f654856d846f426bebf6f143e5f06c8b1397855252e5", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_x64_mac_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "95bcc8052340394b87644d71a60fb26f31857f4090a7dfee57113e9e0f2dfacb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "1a2fa2bb9ea059cf2c1ab3e296a98e006fb6fdad2bd19ce52df48794eaa1836a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "bc2e9225d156d27149fc7a91817e6b64f76132b2b81d1f44cb8c90d7497b6ea7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "424d7f758a272718887bd93f4d8b63e560c0797a884e036c4b3dbf5d2cdfa1cd", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_mac_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "4ef4083919126a3d93e603284b405c7493905497485a92b375f5d6c3e8f7e8f2", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "6fcb25f3f71a5ff245dec4ebe8bd5c643f179a5cd0a61c08e58a8c65914d2f97", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "7aacfc400078ad65b7c7de3ec75ff74bf5c2077d6740b350f85ae10be4f71e76", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "8e6d876f60bc8b7866e91222ba9f27a78e5102d7a4ce4a6e915f95fe539b66ed", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_x64_mac_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" } }, "openjdk23": { @@ -620,78 +620,78 @@ }, "openjdk24": { "aarch64": { - "build": "36", - "sha256": "8e343d2aaa1d00fdee351d392a4a3f537d81fa4a36f5fdf05e2e2c26d5c50af9", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_mac_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "e3b1fe4cd3da335d07d62f335ae958f5a43c594be1ba333a06a03a49d2212cd4", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_aarch64_mac_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "07a99d4a81c4d5e0c4936bf4b9f901565213781c67e865f304a8d8eb75e880d8", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_mac_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "181593f79dd278e0f44712cd87fd9874fd191e211810a0712450963370badb0a", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_x64_mac_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "2f70725e032fe55629a2659d53646b14c538b12cdcedc2d3c9fa342e1b401cf1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "2df9adf6f68ea9768a7c38ab6cccc85a018739f47f65fb102b1da5f74f6794f9", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_x64_mac_hotspot_8u452b09.tar.gz", + "version": "8.0.452" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "4", - "sha256": "ea341e15094e8e892a2d9ff1d4960d1fd05937385278912618905d4b9e7c88e8", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "397578b4fb0aa4459e62f48415ebc1a9a7ae743fa49ab8f877bd873f3fe5095c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "4", - "sha256": "6d184fbcfa659675f52a7d789d4db05b9c9873c18ad9975a7b3c31e20ee4c878", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_mac_hotspot_11.0.26_4.tar.gz", - "version": "11.0.26" + "build": "6", + "sha256": "b14394593ea1fabcf37f59f0dc5c9cb69752e434d0201cd2d7b4b56656a086f2", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_x64_mac_hotspot_11.0.27_6.tar.gz", + "version": "11.0.27" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "9fb89125d5807f42cec588824fde487be42273a89c55ccfc5f44efda64e03e2c", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "2eb9548fbed1031355ca11a35b5a297e9872edd1dafacb40294f0c1a6677bbfb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "f2c7454f7aba076cd414887b31da92e4a50fda7a13d97f6e295c911af60de0b6", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.14_7.tar.gz", - "version": "17.0.14" + "build": "6", + "sha256": "38f7bb3faaa3aec90290e6dd912a050cc895ee2aa8fb9d8ea6aac86822bb108b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_x64_mac_hotspot_17.0.15_6.tar.gz", + "version": "17.0.15" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "9b792bbd408676483caaeb619439190abf1552fe11ab05b19c80d408e5f49c25", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "61dca7744d0b92d5d270f03e2ff32d64e95f3f7c8d0acbe642d7733ccb8523ac", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "632f7cba1aa752ae4108eccf3abc8b7e51b75d262e11e0cb9077b847438e5549", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.6_7.tar.gz", - "version": "21.0.6" + "build": "6", + "sha256": "c43f6adf33cc76f9060cedc879f004958296d8f924c6c9838d2f6eec4478ac0f", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_x64_mac_hotspot_21.0.7_6.tar.gz", + "version": "21.0.7" } }, "openjdk23": { @@ -712,28 +712,28 @@ }, "openjdk24": { "aarch64": { - "build": "36", - "sha256": "fa9783caf9298b7e927b4589435257cf9a2cf12e1eb915992911b988f3d310bc", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_mac_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "0c7789da2c90ea5623dea95d2815528ee83b0d2f0977b6bf830c4cac37251550", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_aarch64_mac_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "10b2a32a5544c03a4bf36f12efc3a770bb789be20ff3c9edf85102c5879479de", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_mac_hotspot_24_36.tar.gz", - "version": "24.0.0" + "build": "9", + "sha256": "c13e3f4f751eee02c324d6df66c65335fc887a9b62a0bdff26523ab1a83d242b", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_x64_mac_hotspot_24.0.1_9.tar.gz", + "version": "24.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "e2658d0808fd2f4d5ad261a8954366a9b277eabd55a404452674b56abc325fec", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_mac_hotspot_8u442b06.tar.gz", - "version": "8.0.442" + "build": "9", + "sha256": "9059321810b1d7b6a8168f73f320e83fd76196e57a5cc8459f87c72184b055e9", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_x64_mac_hotspot_8u452b09.tar.gz", + "version": "8.0.452" } } } diff --git a/pkgs/development/compilers/zulu/24.nix b/pkgs/development/compilers/zulu/24.nix index 28e876e4ca0b..530764d10742 100644 --- a/pkgs/development/compilers/zulu/24.nix +++ b/pkgs/development/compilers/zulu/24.nix @@ -5,8 +5,8 @@ }@args: let - # For 24 JDK FX is newer than regular JDK? - zuluVersion = if enableJavaFX then "24.28.85" else "24.28.83"; + # For 24 JDK FX is newer than regular JDK + zuluVersion = if enableJavaFX then "24.30.13" else "24.30.11"; in callPackage ./common.nix ( { @@ -15,42 +15,42 @@ callPackage ./common.nix ( dists = { x86_64-linux = { inherit zuluVersion; - jdkVersion = "24.0.0"; + jdkVersion = "24.0.1"; hash = if enableJavaFX then - "sha256-y8jiE5yECh96pHYZFM0Q/JTiVcm5a0PONYJDLYydCT0=" + "sha256-jbpWNE+X5GJABQERq126ediyzGRQE9NZy9oMW/sPUa0=" else - "sha256-Kf6gF8A8ZFIhujEgjlENeuSPVzW6QWnVZcRst35/ZvI="; + "sha256-EvaVfDoqdNNtaSz+467rlJ8VtdgNrQi/DT7ZMNZthlk="; }; aarch64-linux = { inherit zuluVersion; - jdkVersion = "24.0.0"; + jdkVersion = "24.0.1"; hash = if enableJavaFX then - "sha256-H6YD8uhk9rTpd+3/S1+7QVzpCi6jykWKyu7RPxMx/sI=" + "sha256-N9VOweloyX/2bFPH3L+Iw7nTkbiE7LvDNnTNM1b8Ghc=" else - "sha256-6J7szd/ax9xCMNA9efw9Bhgv/VwQFXz5glWIoj+UYIc="; + "sha256-4R5K5XTgpR9kq9WWE3SgvqVTq8CFvyb943zAiSsq3k0="; }; x86_64-darwin = { inherit zuluVersion; - jdkVersion = "24.0.0"; + jdkVersion = "24.0.1"; hash = if enableJavaFX then - "sha256-lMdbPkUdXyNcye8uMxGIhZTErrTI0P0SnqMS+8+Rjqg=" + "sha256-c6Gwj8ol2YLfo4sMeCMGfYQvtDz7029L0Yj1dqVQvsw=" else - "sha256-e7KJtJ9+mFFSdKCj68thfTXguWH5zXaSSb9phzXf/lQ="; + "sha256-VhGOiZaspXeVVLEp0MJZXxj/+ovGgmy+gRb2BZ9OuhY="; }; aarch64-darwin = { inherit zuluVersion; - jdkVersion = "24.0.0"; + jdkVersion = "24.0.1"; hash = if enableJavaFX then - "sha256-oR2x0vphBGgh3KkEkLAcmtIMNONny9/b32z9jLR98X0=" + "sha256-Sac+DxNyGqsiStpc/wZYd2K7rvPEjo901kOYERYi+Sw=" else - "sha256-7yXLOJCK0RZ8V1vsexOGxGR9NAwi/pCl95BlO8E8nGU="; + "sha256-pJsq2gKcTy44zbFbSAj6Kd5VZi095jKGkZqd8ceIz7E="; }; }; } diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix index 85e011d22dc1..8708ad84bf7d 100644 --- a/pkgs/development/embedded/fpga/apio/default.nix +++ b/pkgs/development/embedded/fpga/apio/default.nix @@ -76,7 +76,7 @@ buildPythonApplication rec { "test2" ]; - pytestFlagsArray = [ "--offline" ]; + pytestFlags = [ "--offline" ]; strictDeps = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bd96845634c7..9a6bddc1130d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -566,6 +566,18 @@ with haskellLib; # TODO(@sternenseemann): submit upstreamable patch resolving this # (this should be possible by also taking PREFIX into account). ./patches/git-annex-no-usr-prefix.patch + + # Pick fix for git 2.50 related test suite failures from 10.20250630 + # https://git-annex.branchable.com/bugs/test_suite_fail_with_git_2.50/ + (pkgs.fetchpatch { + name = "git-annex-workaround-for-git-2.50.patch"; + url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=fb155b1e3e59cc1f9cf8a4fe7d47cba49d1c81af"; + sha256 = "sha256-w6eXW0JqshXTd0/tNPZ0fOW2SVmA90G5eFhsd9y05BI="; + excludes = [ + "doc/**" + "CHANGELOG" + ]; + }) ]; postPatch = '' @@ -755,6 +767,14 @@ with haskellLib; HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; + # Apply patch fixing an incorrect QuickCheck property which occasionally causes false negatives + # https://github.com/Philonous/xml-picklers/issues/5 + xml-picklers = appendPatch (pkgs.fetchpatch { + name = "xml-picklers-fix-prop-xp-attribute.patch"; + url = "https://github.com/Philonous/xml-picklers/commit/887e5416b5e61c589cadf775d82013eb87751ea2.patch"; + sha256 = "sha256-EAyTVkAqCvJ0lRD0+q/htzBJ8iD5qP47j5i2fKhRrlw="; + }) super.xml-picklers; + # 2024-05-18: Upstream tests against a different pandoc version pandoc-crossref = dontCheck super.pandoc-crossref; @@ -2813,6 +2833,15 @@ with haskellLib; # The hackage source is somehow missing a file present in the repo (tests/ListStat.hs). sym = dontCheck super.sym; + # 2024-01-24: https://github.com/haskellari/tree-diff/issues/79 + # exprParser fails to parse pretty printed structure correctly when the randomizer uses newlines (?) + tree-diff = overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "-p" + "!/parsec-ansi-wl-pprint/" + ]; + }) super.tree-diff; + # base <4.19 # https://github.com/well-typed/large-records/issues/168 large-generics = doJailbreak super.large-generics; @@ -3101,6 +3130,18 @@ with haskellLib; brillo-juicy = warnAfterVersion "0.2.4" (doJailbreak super.brillo-juicy); brillo = warnAfterVersion "1.13.3" (doJailbreak super.brillo); + # Floating point precision issues. Test suite is only checked on x86_64. + # https://github.com/tweag/monad-bayes/issues/368 + monad-bayes = dontCheckIf ( + let + inherit (pkgs.stdenv) hostPlatform; + in + !hostPlatform.isx86_64 + # Presumably because we emulate x86_64-darwin via Rosetta, x86_64-darwin + # also fails on Hydra + || hostPlatform.isDarwin + ) super.monad-bayes; + # 2025-04-13: jailbreak to allow th-abstraction >= 0.7 crucible = warnAfterVersion "0.7.2" ( doJailbreak ( diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 473c05ea8383..ed0acd26e532 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -14,6 +14,7 @@ libxcrypt, makeWrapper, pkg-config, + autoreconfHook, pkgsBuildBuild, readline, writeScript, @@ -39,13 +40,19 @@ builder rec { ]; setOutputFlags = false; # $dev gets into the library otherwise - depsBuildBuild = [ - buildPackages.stdenv.cc - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_3_0; + depsBuildBuild = + [ + buildPackages.stdenv.cc + ] + ++ lib.optional ( + !lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform + ) pkgsBuildBuild.guile_3_0; + nativeBuildInputs = [ makeWrapper pkg-config - ]; + ] ++ lib.optional (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) autoreconfHook; + buildInputs = [ libffi @@ -72,16 +79,24 @@ builder rec { libxcrypt ]; + strictDeps = true; + # According to # https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/guile.scm?h=a39207f7afd977e4e4299c6f0bb34bcb6d153818#n405 # starting with Guile 3.0.8, parallel builds can be done # bit-reproducibly as long as we're not cross-compiling - enableParallelBuilding = stdenv.buildPlatform == stdenv.hostPlatform; + enableParallelBuilding = lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform; patches = [ ./eai_system.patch ] + # Fix cross-compilation, can be removed at next release (as well as the autoreconfHook) + # Include this only conditionally so we don't have to run the autoreconfHook for the native build. + ++ lib.optional (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) (fetchpatch { + url = "https://cgit.git.savannah.gnu.org/cgit/guile.git/patch/?id=c117f8edc471d3362043d88959d73c6a37e7e1e9"; + hash = "sha256-GFwJiwuU8lT1fNueMOcvHh8yvA4HYHcmPml2fY/HSjw="; + }) ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 03d0383402fd..a33bcec040e9 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -785,6 +785,7 @@ stdenv.mkDerivation (finalAttrs: { ]; separateDebugInfo = true; + __structuredAttrs = true; passthru = passthru // { doc = stdenv.mkDerivation { diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 98bc206bd201..bbf53dc22053 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -4,7 +4,6 @@ config, db, lib, - libffiBoot, makeScopeWithSplicing', pythonPackagesExtensions, stdenv, @@ -21,10 +20,10 @@ sourceVersion = { major = "3"; minor = "13"; - patch = "4"; + patch = "5"; suffix = ""; }; - hash = "sha256-J7FaeXViopcdzj/+MbshYELOC5lbOddozxX3hMx1c2U="; + hash = "sha256-k+WD8kNFTm6eRYjKLCZiIGrZYWWYYyd6/NuWgBZH1kA="; }; }; @@ -117,7 +116,7 @@ libxcrypt = null; xz = null; zlib = null; - libffi = libffiBoot; # without test suite + libffi = null; stripConfig = true; stripIdlelib = true; stripTests = true; @@ -136,7 +135,6 @@ */ allowedReferenceNames = [ "bashNonInteractive" - "libffi" ]; } // sources.python313 diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index 6825b5f4db04..b077438323dd 100644 --- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -69,4 +69,4 @@ installSphinxPhase() { runHook postInstallSphinx } -appendToVar preDistPhases buildSphinxPhase installSphinxPhase +appendToVar preFixupPhases buildSphinxPhase installSphinxPhase diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 044070d64f6e..d7edcbfba414 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -10,6 +10,7 @@ fixDarwinDylibNames, libiconv, libxcrypt, + sanitiseHeaderPathsHook, makePkgconfigItem, copyPkgconfigItems, boost-build, @@ -346,6 +347,7 @@ stdenv.mkDerivation { which boost-build copyPkgconfigItems + sanitiseHeaderPathsHook ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ @@ -394,15 +396,15 @@ stdenv.mkDerivation { runHook postInstall ''; - postFixup = - '' - # Make boost header paths relative so that they are not runtime dependencies - cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ - -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \; - '' - + lib.optionalString stdenv.hostPlatform.isMinGW '' - $RANLIB "$out/lib/"*.a - ''; + preFixup = '' + # Strip UTF‐8 BOMs for `sanitiseHeaderPathsHook`. + cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ + -exec sed '1s/^\xef\xbb\xbf//' -i '{}' \; + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isMinGW '' + $RANLIB "$out/lib/"*.a + ''; outputs = [ "out" diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 33bf1d44a544..67abcd886e15 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -436,6 +436,9 @@ stdenv.mkDerivation ( hash = "sha256-l1t4LcUDSW757diNu69NzvjenW5Mxb5aYtXz64Yl9gs="; }) ] + ++ optionals (lib.versionAtLeast version "5.1") [ + ./nvccflags-cpp14.patch + ] ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ (fetchpatch2 { # this can be removed post 6.1 diff --git a/pkgs/development/libraries/ffmpeg/nvccflags-cpp14.patch b/pkgs/development/libraries/ffmpeg/nvccflags-cpp14.patch new file mode 100644 index 000000000000..4c395ad13229 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/nvccflags-cpp14.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index ffa407d53d..f3e223cfac 100755 +--- a/configure ++++ b/configure +@@ -6742,7 +6742,7 @@ if [ -z "$nvccflags" ]; then + nvccflags=$nvccflags_default + fi + +-nvccflags="$nvccflags -std=c++11" ++nvccflags="$nvccflags -std=c++14" + + if enabled x86_64 || enabled ppc64 || enabled aarch64; then + nvccflags="$nvccflags -m64" diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c2ece509aed2..e43e44c5ff35 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "gettext"; - version = "0.22.5"; + version = "0.25"; src = fetchurl { url = "mirror://gnu/gettext/${pname}-${version}.tar.gz"; - hash = "sha256-7BcFselpuDqfBzFE7IBhUduIEn9eQP5alMtsj6SJlqA="; + hash = "sha256-ruAtq3nZE4/cxyJrZ+yYUSG85gB+3r4w0OOdQvaaNA4="; }; patches = [ ./absolute-paths.diff @@ -95,9 +95,16 @@ stdenv.mkDerivation rec { ../../../build-support/setup-hooks/role.bash ./gettext-setup-hook.sh ]; - env = { - gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl; - }; + env = + { + gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # macOS iconv implementation is slightly broken since Sonoma + # https://github.com/Homebrew/homebrew-core/pull/199639 + # https://savannah.gnu.org/bugs/index.php?66541 + am_cv_func_iconv_works = "yes"; + }; enableParallelBuilding = true; enableParallelChecking = false; # fails sometimes diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index dbf8bf7b0333..5d3ff4170d5d 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -21,7 +21,7 @@ tpmSupport ? false, trousers, which, - nettools, + net-tools, libunistring, withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit, @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals doCheck [ which - nettools + net-tools util-linux ]; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 9204d8dacabc..3bb415a23c8d 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.18.5"; + version = "4.18.6"; outputs = [ "out" @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-u1JnoGL1k2lH00yZmTkKZ0sLKw2Ko0cv4NBeIGSVWrw="; + hash = "sha256-4YF8ZQ3cMmH5qDRbOyKial2ArxVGMN7cA8x77O//0Po="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/isl/0.23.0.nix b/pkgs/development/libraries/isl/0.23.0.nix new file mode 100644 index 000000000000..f7b2ecdb0aa4 --- /dev/null +++ b/pkgs/development/libraries/isl/0.23.0.nix @@ -0,0 +1,11 @@ +import ./generic.nix rec { + version = "0.23"; + urls = [ + "mirror://sourceforge/libisl/isl-${version}.tar.xz" + "https://libisl.sourceforge.io/isl-${version}.tar.xz" + ]; + sha256 = "sha256-XvxT767xUTAfTn3eOFa2aBLYFT3t4k+rF2c/gByGmPI="; + configureFlags = [ + "--with-gcc-arch=generic" # don't guess -march=/mtune= + ]; +} diff --git a/pkgs/development/libraries/isl/generic.nix b/pkgs/development/libraries/isl/generic.nix index 77352080cc39..0ffec59b278c 100644 --- a/pkgs/development/libraries/isl/generic.nix +++ b/pkgs/development/libraries/isl/generic.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation { inherit patches; strictDeps = true; - depsBuildBuild = lib.optionals (lib.versionAtLeast version "0.24") [ buildPackages.stdenv.cc ]; + depsBuildBuild = lib.optionals (lib.versionAtLeast version "0.23") [ buildPackages.stdenv.cc ]; nativeBuildInputs = - lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.24") [ + lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.23") [ autoreconfHook ] ++ [ diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 8016c7374ea3..e30171351537 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -1,57 +1,32 @@ { - fetchurl, lib, stdenv, - unzip, - ant, - javac, - jvm, + fetchFromGitHub, + gradle, }: -let - xbeans = fetchurl { - url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; - sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk"; - }; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "rhino"; - version = "1.7R2"; + version = "1.8.0"; - src = fetchurl { - url = "mirror://mozilla/js/rhino1_7R2.zip"; - sha256 = "1p32hkghi6bkc3cf2dcqyaw5cjj7403mykcp0fy8f5bsnv0pszv7"; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "rhino"; + tag = "Rhino1_8_0_Release"; + hash = "sha256-H8DbcRPMm4SKmGf40dXnjGeEbbj9COzdHgUIkcCimTM="; }; - patches = [ ./gcj-type-mismatch.patch ]; + nativeBuildInputs = [ gradle ]; - hardeningDisable = [ - "fortify" - "format" - ]; + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; - preConfigure = '' - find -name \*.jar -or -name \*.class -exec rm -v {} \; - - # The build process tries to download it by itself. - mkdir -p "build/tmp-xbean" - ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip" - ''; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ - ant - javac - jvm - ]; - - buildPhase = "ant jar"; - doCheck = false; - - # FIXME: Install javadoc as well. installPhase = '' mkdir -p "$out/share/java" - cp -v *.jar "$out/share/java" + cp -v rhino-all/build/libs/rhino-all-*.jar "$out/share/java/js-$pkgver.jar" + ln -s "js-$pkgver.jar" "$out/share/java/js.jar" ''; meta = with lib; { @@ -71,4 +46,4 @@ stdenv.mkDerivation { ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/pkgs/development/libraries/java/rhino/deps.json b/pkgs/development/libraries/java/rhino/deps.json new file mode 100644 index 000000000000..ff2c2456eb13 --- /dev/null +++ b/pkgs/development/libraries/java/rhino/deps.json @@ -0,0 +1,601 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/durian#durian-swt.os/4.2.2": { + "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", + "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", + "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.45.0": { + "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", + "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", + "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + }, + "com/diffplug/spotless#spotless-lib/2.45.0": { + "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", + "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", + "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { + "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", + "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", + "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/github/johnrengelman#shadow/8.1.1": { + "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", + "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", + "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { + "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "dev/equo/ide#solstice/1.7.5": { + "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", + "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", + "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + }, + "io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "me/champeau/jmh#jmh-gradle-plugin/0.7.2": { + "jar": "sha256-2Wcgmf+Pw/m/PU0BWGThWG8H7L0qihd6ZhhO8LaKumU=", + "module": "sha256-bYSa50VKs5Fxjl/HDicWQY7z7SZEcjRb2Axt5k4AtsQ=", + "pom": "sha256-FdkdAH98O7wCJseQSM3cRf/BJPoegAgu//jhAwxoSg8=" + }, + "me/champeau/jmh#me.champeau.jmh.gradle.plugin/0.7.2": { + "pom": "sha256-V+DCOsYJRa77WgxKkzm+poopU2TKR8epB5oDL3kBOrs=" + }, + "net/ltgt/gradle#gradle-errorprone-plugin/4.0.0": { + "jar": "sha256-pKlc7+x8JsZgFQuBNo/2+4Ksi90vL0ChVaRn8KQtsXs=", + "module": "sha256-u9obPcdbvcZH/6wkeFyJU7A8HnZKGAqzucbRG+cjeFE=", + "pom": "sha256-thpbK0StvEjE674dUux0Bz+Yyv3hrgoeQNGkLuYb+KY=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache/ant#ant-launcher/1.10.13": { + "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", + "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" + }, + "org/apache/ant#ant-parent/1.10.13": { + "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" + }, + "org/apache/ant#ant/1.10.13": { + "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", + "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "org/codehaus/plexus#plexus-utils/3.5.1": { + "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", + "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" + }, + "org/codehaus/plexus#plexus/10": { + "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { + "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { + "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", + "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + }, + "org/eclipse/platform#org.eclipse.osgi/3.18.300": { + "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", + "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/openjdk/jmh#jmh-core/1.37": { + "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=", + "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o=" + }, + "org/openjdk/jmh#jmh-parent/1.37": { + "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-commons/9.4": { + "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", + "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" + }, + "org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "org/vafer#jdependency/2.8.0": { + "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", + "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" + } + }, + "https://repo.maven.apache.org/maven2": { + "aopalliance#aopalliance/1.0": { + "jar": "sha256-Ct3sZw/tzT8RPFyAkdeDKA0j9146y4QbYanNsHk3agg=", + "pom": "sha256-JugjMBV9a4RLZ6gGSUXiBlgedyl3GD4+Mf7GBYqppZs=" + }, + "com/github/ben-manes/caffeine#caffeine/3.0.5": { + "jar": "sha256-iptU01BqO5LuRrIXvO55GWshym1S3ClnxoaiBfsvnBU=", + "module": "sha256-MNqUAgRzgsSZ0djzcgH8Ead8mTTSxYa8WkKvrEr6wrI=", + "pom": "sha256-vM/bJH7Xa1K7sUMMIoLEO61BjtPGl7TiqVrQmbvyXPg=" + }, + "com/github/kevinstern#software-and-algorithms/1.0": { + "jar": "sha256-YauCQ5zvNzQ7FPUxVMRhYZN1NzpWuTOOiVcJ+1Tghkw=", + "pom": "sha256-7ZcfAJNU5owJQUyWT74aLIXCyLvUYBIrdJenuMXU84g=" + }, + "com/google#google/5": { + "pom": "sha256-4J00XnPKP7yn8+BfMN63Tp053Wt5qT/ujFEfI0F7aCg=" + }, + "com/google/auto#auto-common/1.2.2": { + "jar": "sha256-9Qsc6KQfrTGoqBnAUvj/o2LqCj2+nvj3x9yaNtRzilk=", + "pom": "sha256-A6mS+6T8+7z3ekYJgRgWMARuW64JZzpIGTxuD3YSceo=" + }, + "com/google/auto/service#auto-service-aggregator/1.0.1": { + "pom": "sha256-BIFGDbWZAzYrJvq9O9zV7CAHUPk5G7tlAv48fcLfPkw=" + }, + "com/google/auto/service#auto-service-annotations/1.0.1": { + "jar": "sha256-x77FS3tViLWWfocDQQkcVpEYHZVM8gOfG/Cm7rg3Rzs=", + "pom": "sha256-6bvxs9ZsoYAEpqB6INv6EMos6DZzSPdB3i/o/vzmjMI=" + }, + "com/google/auto/value#auto-value-annotations/1.9": { + "jar": "sha256-+lRp9MRO5Zii2PAzqwqdy8ZJigxeDJmN+gwq31E1gEQ=", + "pom": "sha256-kiCj2r51x5M08GGw5A34M0SGZrrCiouCO8Ho/VL4yYo=" + }, + "com/google/auto/value#auto-value-parent/1.9": { + "pom": "sha256-Lj2d/2OWAcq4gdfhcIBry9jgMffr/yWcu0W+V7TL14c=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotation/2.28.0": { + "jar": "sha256-H7c7F09Cd7vn7hZTBF+kSY9QQCilySQJJsDztNW1IbQ=", + "pom": "sha256-gmNP+45oXAyzHo+xU8hHVScrlIhzFS5zlfryFL17HCs=" + }, + "com/google/errorprone#error_prone_annotations/2.28.0": { + "jar": "sha256-8/yKOgpAIHBqNzsA5/V8JRLdJtH4PSjH04do+GgrIx4=", + "pom": "sha256-DOkJ8TpWgUhHbl7iAPOA+Yx1ugiXGq8V2ylet3WY7zo=" + }, + "com/google/errorprone#error_prone_check_api/2.28.0": { + "jar": "sha256-JQ0POIalzPkSMQf2a6LtF6DaDWZr/mOL07sMAcIfrtA=", + "pom": "sha256-H/VLXFVUGyrORWuOya+Tw8TRZkf+Mc8s/n0sDWzxlxE=" + }, + "com/google/errorprone#error_prone_core/2.28.0": { + "jar": "sha256-pd4c/izgInch1idQqCNWmyboDNdcR8oh6p2hVKhkzew=", + "pom": "sha256-+pUv36UYlqDOOtvEz7FHXrzSoy4tatFoPGSvtEyzE4o=" + }, + "com/google/errorprone#error_prone_parent/2.28.0": { + "pom": "sha256-rM79u1QWzvX80t3DfbTx/LNKIZPMGlXf5ZcKExs+doM=" + }, + "com/google/errorprone#error_prone_type_annotations/2.28.0": { + "jar": "sha256-8jeFPr+hAOcxBUPq8snpDF7TTV/ujjMTn1+yPm5lP14=", + "pom": "sha256-N6YrIHbszmhIFabNSGSmwgZGCb/laE383M7LYApq5TM=" + }, + "com/google/errorprone#javac/9+181-r4173-1": { + "jar": "sha256-HY00eg4VefP8hqwE0ZdOSJr8ZjV/AAmsmASnrDCRLtY=", + "pom": "sha256-FWnAgfqDWKBhZDcvn1Qbig6l7Alkkx9fdOrTb/UrQBU=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/32.1.1-jre": { + "pom": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0=" + }, + "com/google/guava#guava/32.1.1-jre": { + "jar": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE=", + "module": "sha256-pY+TjSOeaYtZs8OcrVgO/Ro/1MoTq5KzBCbUJFLE7z4=", + "pom": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs=" + }, + "com/google/inject#guice-parent/5.1.0": { + "pom": "sha256-Y9XAxkF5feumwFHEfV9pI/OhA+9x5OvDqF0Bw+h4WWw=" + }, + "com/google/inject#guice/5.1.0": { + "jar": "sha256-QTDlC/rEgJnIYPDZA7kYYMgaJJyQ84JF+P7Vj8gXvCY=", + "pom": "sha256-s7jcZSE9Yj+3DteVjb3WFjJCVrqDajFlJWDDiJmf2c0=" + }, + "com/google/protobuf#protobuf-bom/3.19.6": { + "pom": "sha256-8tqbt1IIO0yJDV69ZjFMRyb1M67+dvbCQn6dcfKIIxE=" + }, + "com/google/protobuf#protobuf-java/3.19.6": { + "jar": "sha256-apot/5Hc9x+FvnGulx9hZLWmMdzTS/8I8GGFNcpErQI=", + "pom": "sha256-0QlO6w21FqBQC7C+xZATbmBoqD0P94K3wcdxqeidHaQ=" + }, + "com/google/protobuf#protobuf-parent/3.19.6": { + "pom": "sha256-rM3kgjBu27qah3rfuxBoD+pME2tueX5TupuEaeolqlw=" + }, + "com/tngtech/archunit#archunit-junit4/1.3.0": { + "jar": "sha256-lGu5zP5h5viJ9x//5sKxsCOQvYm6EOUXBxTWuDk7yGE=", + "pom": "sha256-XAYdoxSOgubsxm+jQhYnEPJF+zrRY5R1uOJkPovDgLY=" + }, + "com/tngtech/archunit#archunit/1.3.0": { + "jar": "sha256-U2JATLWVsxvZKk0PrvQK3MS9Jz2gyIEavvf8yHnnyyY=", + "pom": "sha256-8xM35B4lX6BfWBsMtjpdmq6E6Udg4Qa5k7FcinF4fQo=" + }, + "io/github/eisop#dataflow-errorprone/3.41.0-eisop1": { + "jar": "sha256-EENPuk5T9V+px2kEzeQUuRiTJUjJ38Ti1jSsBf96fRA=", + "pom": "sha256-I/HN+kYTwAzG6lyfU2DhRxtEn4JjPxPPX/bNs0+jHr0=" + }, + "io/github/java-diff-utils#java-diff-utils-parent/4.12": { + "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk=" + }, + "io/github/java-diff-utils#java-diff-utils/4.12": { + "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", + "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" + }, + "javax/inject#javax.inject/1": { + "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", + "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" + }, + "javax/xml/soap#javax.xml.soap-api/1.4.0": { + "jar": "sha256-FBN04zvpl2hhGi1CudM1caDFuXY77KnC3JCQDYzI92c=", + "pom": "sha256-f0QbXEpuotXviFh1zw4wrbjDy4+dCpK+cJVMc7kGwK0=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/commons#commons-math3/3.2": { + "jar": "sha256-YmipoOo+dp/Ek6IURmZMDvZo5IyT0SZ5H28/dXl4/uI=", + "pom": "sha256-LNDbe843DBQEAlzAE8Efj9SfPzw0Cm0tz5nTY9eUimk=" + }, + "org/apache/commons#commons-parent/28": { + "pom": "sha256-FHM6aOixILad5gzZbSIhRtzzLwPBxsxqdQsSabr+hsc=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/checkerframework#checker-qual/3.19.0": { + "module": "sha256-U+GJnd48UTyh79N2q/+sDmkH6OhKvV+WYkJjTJXk0Vc=", + "pom": "sha256-KbqcXOGpS3AL2CPE7WEvWCe1kPGaSXdf1+uPmX+Ko3E=" + }, + "org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jacoco#org.jacoco.agent/0.8.13": { + "jar": "sha256-nbPJ1ddPqHCyYbZKMIJBLhvW4i6fqY9HN7G/+K+cxk0=", + "pom": "sha256-auuUf988z1Qlydq41oPWu+MPCSjEWnAuYlWMblXmRLc=" + }, + "org/jacoco#org.jacoco.ant/0.8.13": { + "jar": "sha256-ZDS4VS/z0OSi+70Tpu+xJODJykU4F8YsA96DkNh//RE=", + "pom": "sha256-I4tCPVxuZQ9LQPF1T42iYQDHpzYz5d1RKIxzgHRj744=" + }, + "org/jacoco#org.jacoco.build/0.8.13": { + "pom": "sha256-mUw64c/KZ2WWj+Pt5PN5mGrrLn61GiAUyqSgnXGo9KM=" + }, + "org/jacoco#org.jacoco.core/0.8.13": { + "jar": "sha256-UUwj32z9AV19g8EKeS41q2int+gvPWo6RIF2LBMuM6k=", + "pom": "sha256-73/2F3zZcB1QXv6C9N1P6l5fcssEesK088qitBbaD08=" + }, + "org/jacoco#org.jacoco.report/0.8.13": { + "jar": "sha256-gTMoCgqkQ1i+nRNrUjcDQvRVzLlEquB0OCIKd2YleKI=", + "pom": "sha256-EBBlOpAAx+qoVqJx+E0HH/Rt6nojdbhKitmiOz5lPOg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.3": { + "jar": "sha256-bv5uAcof95t79Mbx7tCykpLhZsJ+r3sArJgaFNTeYao=", + "module": "sha256-HH5GU3/EOyd29N5BmpCEpkAREQn6QLSHiUCynOI4vh4=", + "pom": "sha256-c0ocaMNMWt870vW8pL9JjLtPScSJ18JNgM8OIQK+bxQ=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.3": { + "jar": "sha256-u9POjcEemSUHHvlpHWivGrbnEvqmhR98UnW8iq/IhnM=", + "module": "sha256-t34vIrhuzSrvh/C3LGoHDwsOdqNKvaqKd1ECweDRYSE=", + "pom": "sha256-g+8P1otgv2vHmnj+sRiCxiXEgu9p1iv+LRFwQKZEgUQ=" + }, + "org/junit/jupiter#junit-jupiter-params/5.10.3": { + "jar": "sha256-fD7YzvsSSWt2xTw9qYbqjwvz9CZ4GGlHVVGuOlBsGtg=", + "module": "sha256-TnM9YVyqFuDs17mum/6I+YqUAgkpMzx+4rT6CaegTZE=", + "pom": "sha256-bNnfkGpi/mTMMBw9YAeX9iTb1CJff6UFpajtsx/5iQY=" + }, + "org/junit/jupiter#junit-jupiter/5.10.3": { + "jar": "sha256-5vwJ+IHrqLjYp2YKbH9NWC+niB8wYTav4tgpZKLnwi8=", + "module": "sha256-hrCGx1WStDQ9pPdL6V4mhSxMqqWzToLVaqg/MYBLyBA=", + "pom": "sha256-Jd7AgvAkZ81iKQ7xOJv0smhu9QVKGo7d+xtbfVTeGZE=" + }, + "org/junit/platform#junit-platform-commons/1.10.3": { + "jar": "sha256-l4fwTUnbWTl83XVV1CGlvS0URWZpl9MnuU+F44vtV/E=", + "module": "sha256-n9gMr9DRm5pTrhnq4Eq94bIwVfQXXXbI52ibzkRImCs=", + "pom": "sha256-dZdXLFnxl1Ji+Nj8+I7GeDN2hUvwjOipPZnb3InuQ/k=" + }, + "org/junit/platform#junit-platform-engine/1.10.3": { + "jar": "sha256-33wyv3XPR8TI3dGUIJECeUen12XTC3Mf4AgwEV+voTM=", + "module": "sha256-D7CUb/Z+Q9A2K71CwjRNUUc4nkMVKCN3EW/rZOJrgNE=", + "pom": "sha256-b5uZvKDBfdwZ9RvAN+OxfKsPx+bx2nA4ejCrTgUgcig=" + }, + "org/junit/platform#junit-platform-launcher/1.10.3": { + "jar": "sha256-3q7t4vAR6vlPW8aB4E7uL0oPbWl3Hhp5qpUNiYtAXY0=", + "module": "sha256-t8tPKSY20uTbEbgazAMRJsfOvhLotss9JF6t5/3Qg0M=", + "pom": "sha256-cBNMufwHJ1YgZdX+faWPEF5KHHh36JnUkUm10/j9bRc=" + }, + "org/junit/vintage#junit-vintage-engine/5.10.3": { + "jar": "sha256-1gKI0+hQup8q9HASA6UXHvMGNO/TTaQKtH+s69LGXWw=", + "module": "sha256-nsdj0t+xBgbUdX7Jodku/362xiBt2urEexpZmQCI1Zo=", + "pom": "sha256-T558FJjpb+ai9S++LViw1/FQq+H4SspuPTo12m+go4g=" + }, + "org/openjdk/jmh#jmh-core/1.36": { + "jar": "sha256-+Ql0430NqIhrXAXm4+fiBVaQDXR8WkHBAjtHwzAepzw=", + "pom": "sha256-mBI0JlrAQfFmsXxa3GsdRZ6JTKv/6vawnAB08PQDguQ=" + }, + "org/openjdk/jmh#jmh-generator-asm/1.36": { + "jar": "sha256-dGCxG4I97nSz4ZYX011ZEbASRTA9bjHDD4NBfPwvVLU=", + "pom": "sha256-V7u+h4OU+LP8G4DEEWHdSItCwNez1wpeR09CcbHqOkk=" + }, + "org/openjdk/jmh#jmh-generator-bytecode/1.36": { + "jar": "sha256-M3ZUL4lQvNcGxRbOBiDR34IjCecJK4+TOJFygxgdWF0=", + "pom": "sha256-URABHSX7lGay8Am/99fsCmLop6uvBomb+2tjBbBOKUQ=" + }, + "org/openjdk/jmh#jmh-generator-reflection/1.36": { + "jar": "sha256-qccnYOEsGZ4qLCjxoSbr8MxbUcC1jUZHJZb8Mvf5JTQ=", + "pom": "sha256-msCIMyyp0UcTCJk55zzaHn/0Q8fIx3usiFsIo7eHUUY=" + }, + "org/openjdk/jmh#jmh-parent/1.36": { + "pom": "sha256-O2PObo/vrLMgN24F6fuzuuhqiJI5AIdZGJoLDVylxdY=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-bom/9.8": { + "pom": "sha256-DaHcsibmzf2ttNrFkZFruRe1c3RnTZG9LxMAMTe0FSA=" + }, + "org/ow2/asm#asm-commons/9.8": { + "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=", + "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI=" + }, + "org/ow2/asm#asm-tree/9.8": { + "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=", + "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c=" + }, + "org/ow2/asm#asm/9.0": { + "jar": "sha256-Dfl1dJFK7pL9NJ0MtOAPM0XUWywjngu1DwqQ6tR4iOA=", + "module": "sha256-ivgQlu06/6OaRyn8kApVtmOJSRHWfE1L7w6kJDk90/k=", + "pom": "sha256-3gNVWQ3Rv8zNyNeQJK6ZKXLoVSaKztua1oLQheA6lK0=" + }, + "org/ow2/asm#asm/9.8": { + "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", + "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" + }, + "org/pcollections#pcollections/4.0.1": { + "jar": "sha256-H4J2bXwyIZMIVAM76/9Qc+pGtD8nMmB0u+FdFIwYv7M=", + "module": "sha256-nr2nwMnbETTTQd/3yK0LxZUyhvvwuZiuyil6HuboCfA=", + "pom": "sha256-+j8pi1AlO5bpz7BvARw7zHj9m0DY3NJZCbygRUlzjHE=" + }, + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" + }, + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, + "org/slf4j#slf4j-simple/2.0.16": { + "jar": "sha256-7/wyAYZYvqCdHgjH0QYMytRsCGlg9YPQfdf/6cEXKkc=", + "pom": "sha256-z2xVMUjop3lRz9oTHSCUgZgf1uLAKntI3G1mBVI83xw=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/yaml#snakeyaml/1.33": { + "jar": "sha256-Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=", + "pom": "sha256-6n1I/UUyGmAz2XzSiBhtSOXpLMDHBm5ziNfEzrSvWVc=" + } + } +} diff --git a/pkgs/development/libraries/java/rhino/gcj-type-mismatch.patch b/pkgs/development/libraries/java/rhino/gcj-type-mismatch.patch deleted file mode 100644 index dac7b209069a..000000000000 --- a/pkgs/development/libraries/java/rhino/gcj-type-mismatch.patch +++ /dev/null @@ -1,103 +0,0 @@ -Work around GCJ bug #35410: -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35410 . - -diff --git a/src/org/mozilla/javascript/Arguments.java b/src/org/mozilla/javascript/Arguments.java -index d914294..d658f12 100644 ---- a/src/org/mozilla/javascript/Arguments.java -+++ b/src/org/mozilla/javascript/Arguments.java -@@ -144,7 +144,7 @@ final class Arguments extends IdScriptableObject - synchronized (this) { - if (args[index] != NOT_FOUND) { - if (args == activation.originalArgs) { -- args = args.clone(); -+ args = (Object[]) args.clone(); - } - args[index] = value; - return; -@@ -162,7 +162,7 @@ final class Arguments extends IdScriptableObject - synchronized (this) { - if (args[index] != NOT_FOUND) { - if (args == activation.originalArgs) { -- args = args.clone(); -+ args = (Object[]) args.clone(); - } - args[index] = NOT_FOUND; - return; -diff --git a/src/org/mozilla/javascript/FunctionObject.java b/src/org/mozilla/javascript/FunctionObject.java -index 1d6c752..3adc100 100644 ---- a/src/org/mozilla/javascript/FunctionObject.java -+++ b/src/org/mozilla/javascript/FunctionObject.java -@@ -455,7 +455,7 @@ public class FunctionObject extends BaseFunction - Object converted = convertArg(cx, scope, arg, typeTags[i]); - if (arg != converted) { - if (invokeArgs == args) { -- invokeArgs = args.clone(); -+ invokeArgs = (Object[]) args.clone(); - } - invokeArgs[i] = converted; - } -diff --git a/src/org/mozilla/javascript/Interpreter.java b/src/org/mozilla/javascript/Interpreter.java -index f7f544d..e125e2f 100644 ---- a/src/org/mozilla/javascript/Interpreter.java -+++ b/src/org/mozilla/javascript/Interpreter.java -@@ -285,9 +285,9 @@ public class Interpreter implements Evaluator - // clone stack but keep varSource to point to values - // from this frame to share variables. - -- copy.stack = stack.clone(); -- copy.stackAttributes = stackAttributes.clone(); -- copy.sDbl = sDbl.clone(); -+ copy.stack = (Object[]) stack.clone(); -+ copy.stackAttributes = (int[]) stackAttributes.clone(); -+ copy.sDbl = (double[]) sDbl.clone(); - - copy.frozen = false; - return copy; -diff --git a/src/org/mozilla/javascript/NativeJavaClass.java b/src/org/mozilla/javascript/NativeJavaClass.java -index f72f9e7..25c6757 100644 ---- a/src/org/mozilla/javascript/NativeJavaClass.java -+++ b/src/org/mozilla/javascript/NativeJavaClass.java -@@ -271,7 +271,7 @@ public class NativeJavaClass extends NativeJavaObject implements Function - Object x = Context.jsToJava(arg, argTypes[i]); - if (x != arg) { - if (args == origArgs) { -- args = origArgs.clone(); -+ args = (Object[]) origArgs.clone(); - } - args[i] = x; - } -diff --git a/src/org/mozilla/javascript/NativeJavaMethod.java b/src/org/mozilla/javascript/NativeJavaMethod.java -index b6eaf8b..dc699a0 100644 ---- a/src/org/mozilla/javascript/NativeJavaMethod.java -+++ b/src/org/mozilla/javascript/NativeJavaMethod.java -@@ -213,7 +213,7 @@ public class NativeJavaMethod extends BaseFunction - Object coerced = Context.jsToJava(arg, argTypes[i]); - if (coerced != arg) { - if (origArgs == args) { -- args = args.clone(); -+ args = (Object[]) args.clone(); - } - args[i] = coerced; - } -diff --git a/src/org/mozilla/javascript/regexp/NativeRegExp.java b/src/org/mozilla/javascript/regexp/NativeRegExp.java -index 0bae489..f7124bf 100644 ---- a/src/org/mozilla/javascript/regexp/NativeRegExp.java -+++ b/src/org/mozilla/javascript/regexp/NativeRegExp.java -@@ -2168,7 +2168,7 @@ System.out.println("Testing at " + gData.cp + ", op = " + op); - // XXX: If backTrackData will no longer be used, then - // there is no need to clone backTrackData.parens - if (backTrackData.parens != null) { -- gData.parens = backTrackData.parens.clone(); -+ gData.parens = (long[]) backTrackData.parens.clone(); - } - - gData.cp = backTrackData.cp; -@@ -2708,7 +2708,7 @@ class REBackTrackData { - continuation_pc = pc; - lastParen = gData.lastParen; - if (gData.parens != null) { -- parens = gData.parens.clone(); -+ parens = (long[]) gData.parens.clone(); - } - cp = gData.cp; - stateStackTop = gData.stateStackTop; diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index bc1b86099939..763e866a1c51 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -23,7 +23,8 @@ mkDerivation { buildInputs = [ karchive openexr - libavif + # FIXME: cmake files are broken, disabled for now + # libavif libheif libjxl libraw diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index e64851bb6d83..35111e8c7516 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxml2"; - version = "2.14.3"; + version = "2.14.4-unstable-2025-06-20"; outputs = [ @@ -50,10 +50,19 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libxml2"; - rev = "5133461b05f0f66e6c5b0fecd5f29dc5cd967302"; # some security- and bugfixes ahead of 2.14 - hash = "sha256-xLRey6mRsRhgfASIQWOTofcQcLU0Daeg33pxGN0l66I="; + rev = "356542324fa439de544b5e419b91ae68d42c306c"; # some bugfixes right behind 2.14.4 + hash = "sha256-0jo08ECX+oP7Ekjgw3ZgOh+fSiNjlbjoZc4p3PqomJA="; }; + patches = [ + # Unmerged ABI-breaking patch required to fix the following security issues: + # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139 + # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140 + # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906 + # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch + ./xml-attr-extra.patch + ]; + strictDeps = true; nativeBuildInputs = [ @@ -142,6 +151,10 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "LibXml2" ]; + package = finalAttrs.finalPackage; + }; }; }; diff --git a/pkgs/development/libraries/libxml2/xml-attr-extra.patch b/pkgs/development/libraries/libxml2/xml-attr-extra.patch new file mode 100644 index 000000000000..8753c30e3893 --- /dev/null +++ b/pkgs/development/libraries/libxml2/xml-attr-extra.patch @@ -0,0 +1,20 @@ +diff --git a/include/libxml/tree.h b/include/libxml/tree.h +index e5a8fb709471f..7819d5819b427 100644 +--- a/include/libxml/tree.h ++++ b/include/libxml/tree.h +@@ -454,6 +454,7 @@ struct _xmlAttr { + xmlAttributeType atype; /* the attribute type if validating */ + void *psvi; /* for type/PSVI information */ + struct _xmlID *id; /* the ID struct */ ++ unsigned int extra; /* extra data for XPath/XSLT */ + }; + + /** +@@ -592,6 +593,7 @@ struct _xmlDoc { + document */ + int properties; /* set of xmlDocProperties for this document + set at the end of parsing */ ++ unsigned int extra; /* extra data for XPath/XSLT */ + }; + + diff --git a/pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch b/pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch new file mode 100644 index 000000000000..19a569eb318f --- /dev/null +++ b/pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch @@ -0,0 +1,704 @@ +From afbaf5fcf0a92973ffaeb38fe4ab3e8a818f4c5a Mon Sep 17 00:00:00 2001 +From: Daniel Cheng +Date: Thu, 5 Jun 2025 09:43:53 -0700 +Subject: [PATCH] Use a dedicated node type to maintain the list of cached RVTs + +While evaluating a stylesheet, result value trees (result tree fragments +in the XSLT spec) are represented as xmlDocs and cached on the transform +context in a linked list, using xmlDoc's prev and next pointers to +maintain the list. + +However, XPath evaluations can inadvertently traverse these links, which +are an implementation detail and do not reflect the actual document +structure. Using a dedicated node type avoids these unintended +traversals. +--- + libxslt/transform.c | 87 ++++++++-------- + libxslt/variables.c | 219 +++++++++++++++++++++++++--------------- + libxslt/xsltInternals.h | 23 +++-- + 3 files changed, 199 insertions(+), 130 deletions(-) + +diff --git a/libxslt/transform.c b/libxslt/transform.c +index 54ef821b..2d06ae77 100644 +--- a/libxslt/transform.c ++++ b/libxslt/transform.c +@@ -518,19 +518,20 @@ xsltTransformCacheFree(xsltTransformCachePtr cache) + /* + * Free tree fragments. + */ +- if (cache->RVT) { +- xmlDocPtr tmp, cur = cache->RVT; ++ if (cache->rvtList) { ++ xsltRVTListPtr tmp, cur = cache->rvtList; + while (cur) { + tmp = cur; +- cur = (xmlDocPtr) cur->next; +- if (tmp->_private != NULL) { ++ cur = cur->next; ++ if (tmp->RVT->_private != NULL) { + /* +- * Tree the document info. ++ * Free the document info. + */ +- xsltFreeDocumentKeys((xsltDocumentPtr) tmp->_private); +- xmlFree(tmp->_private); ++ xsltFreeDocumentKeys((xsltDocumentPtr) tmp->RVT->_private); ++ xmlFree(tmp->RVT->_private); + } +- xmlFreeDoc(tmp); ++ xmlFreeDoc(tmp->RVT); ++ xmlFree(tmp); + } + } + /* +@@ -2263,38 +2264,36 @@ xsltLocalVariablePush(xsltTransformContextPtr ctxt, + * are preserved; all other fragments are freed/cached. + */ + static void +-xsltReleaseLocalRVTs(xsltTransformContextPtr ctxt, xmlDocPtr base) ++xsltReleaseLocalRVTs(xsltTransformContextPtr ctxt, xsltRVTListPtr base) + { +- xmlDocPtr cur = ctxt->localRVT, tmp; ++ xsltRVTListPtr cur = ctxt->localRVTList, tmp; + + if (cur == base) + return; +- if (cur->prev != NULL) +- xsltTransformError(ctxt, NULL, NULL, "localRVT not head of list\n"); + +- /* Reset localRVT early because some RVTs might be registered again. */ +- ctxt->localRVT = base; +- if (base != NULL) +- base->prev = NULL; ++ /* Reset localRVTList early because some RVTs might be registered again. */ ++ ctxt->localRVTList = base; + + do { + tmp = cur; +- cur = (xmlDocPtr) cur->next; +- if (tmp->compression == XSLT_RVT_LOCAL) { +- xsltReleaseRVT(ctxt, tmp); +- } else if (tmp->compression == XSLT_RVT_GLOBAL) { +- xsltRegisterPersistRVT(ctxt, tmp); +- } else if (tmp->compression == XSLT_RVT_FUNC_RESULT) { ++ cur = cur->next; ++ if (tmp->RVT->compression == XSLT_RVT_LOCAL) { ++ xsltReleaseRVTList(ctxt, tmp); ++ } else if (tmp->RVT->compression == XSLT_RVT_GLOBAL) { ++ xsltRegisterPersistRVT(ctxt, tmp->RVT); ++ xmlFree(tmp); ++ } else if (tmp->RVT->compression == XSLT_RVT_FUNC_RESULT) { + /* + * This will either register the RVT again or move it to the + * context variable. + */ +- xsltRegisterLocalRVT(ctxt, tmp); +- tmp->compression = XSLT_RVT_FUNC_RESULT; ++ xsltRegisterLocalRVT(ctxt, tmp->RVT); ++ tmp->RVT->compression = XSLT_RVT_FUNC_RESULT; ++ xmlFree(tmp); + } else { + xmlGenericError(xmlGenericErrorContext, +- "xsltReleaseLocalRVTs: Unexpected RVT flag %p\n", +- tmp->psvi); ++ "xsltReleaseLocalRVTs: Unexpected RVT flag %d\n", ++ tmp->RVT->compression); + } + } while (cur != base); + } +@@ -2322,7 +2321,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt, + xmlNodePtr oldInsert, oldInst, oldCurInst, oldContextNode; + xmlNodePtr cur, insert, copy = NULL; + int level = 0, oldVarsNr; +- xmlDocPtr oldLocalFragmentTop; ++ xsltRVTListPtr oldLocalFragmentTop; + + #ifdef XSLT_REFACTORED + xsltStylePreCompPtr info; +@@ -2368,7 +2367,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt, + } + ctxt->depth++; + +- oldLocalFragmentTop = ctxt->localRVT; ++ oldLocalFragmentTop = ctxt->localRVTList; + oldInsert = insert = ctxt->insert; + oldInst = oldCurInst = ctxt->inst; + oldContextNode = ctxt->node; +@@ -2602,7 +2601,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt, + /* + * Cleanup temporary tree fragments. + */ +- if (oldLocalFragmentTop != ctxt->localRVT) ++ if (oldLocalFragmentTop != ctxt->localRVTList) + xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop); + + ctxt->insert = oldInsert; +@@ -2697,7 +2696,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt, + /* + * Cleanup temporary tree fragments. + */ +- if (oldLocalFragmentTop != ctxt->localRVT) ++ if (oldLocalFragmentTop != ctxt->localRVTList) + xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop); + + ctxt->insert = oldInsert; +@@ -2763,7 +2762,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt, + /* + * Cleanup temporary tree fragments. + */ +- if (oldLocalFragmentTop != ctxt->localRVT) ++ if (oldLocalFragmentTop != ctxt->localRVTList) + xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop); + + ctxt->insert = oldInsert; +@@ -2893,7 +2892,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt, + /* + * Cleanup temporary tree fragments. + */ +- if (oldLocalFragmentTop != ctxt->localRVT) ++ if (oldLocalFragmentTop != ctxt->localRVTList) + xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop); + + ctxt->insert = oldInsert; +@@ -3072,7 +3071,7 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt, + int oldVarsBase = 0; + xmlNodePtr cur; + xsltStackElemPtr tmpParam = NULL; +- xmlDocPtr oldUserFragmentTop; ++ xsltRVTListPtr oldUserFragmentTop; + #ifdef WITH_PROFILER + long start = 0; + #endif +@@ -3120,8 +3119,8 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt, + return; + } + +- oldUserFragmentTop = ctxt->tmpRVT; +- ctxt->tmpRVT = NULL; ++ oldUserFragmentTop = ctxt->tmpRVTList; ++ ctxt->tmpRVTList = NULL; + + /* + * Initiate a distinct scope of local params/variables. +@@ -3232,16 +3231,16 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt, + * user code should now use xsltRegisterLocalRVT() instead + * of the obsolete xsltRegisterTmpRVT(). + */ +- if (ctxt->tmpRVT) { +- xmlDocPtr curdoc = ctxt->tmpRVT, tmp; ++ if (ctxt->tmpRVTList) { ++ xsltRVTListPtr curRVTList = ctxt->tmpRVTList, tmp; + +- while (curdoc != NULL) { +- tmp = curdoc; +- curdoc = (xmlDocPtr) curdoc->next; +- xsltReleaseRVT(ctxt, tmp); ++ while (curRVTList != NULL) { ++ tmp = curRVTList; ++ curRVTList = curRVTList->next; ++ xsltReleaseRVTList(ctxt, tmp); + } + } +- ctxt->tmpRVT = oldUserFragmentTop; ++ ctxt->tmpRVTList = oldUserFragmentTop; + + /* + * Pop the xsl:template declaration from the stack. +@@ -5319,7 +5318,7 @@ xsltIf(xsltTransformContextPtr ctxt, xmlNodePtr contextNode, + + #ifdef XSLT_FAST_IF + { +- xmlDocPtr oldLocalFragmentTop = ctxt->localRVT; ++ xsltRVTListPtr oldLocalFragmentTop = ctxt->localRVTList; + + res = xsltPreCompEvalToBoolean(ctxt, contextNode, comp); + +@@ -5327,7 +5326,7 @@ xsltIf(xsltTransformContextPtr ctxt, xmlNodePtr contextNode, + * Cleanup fragments created during evaluation of the + * "select" expression. + */ +- if (oldLocalFragmentTop != ctxt->localRVT) ++ if (oldLocalFragmentTop != ctxt->localRVTList) + xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop); + } + +diff --git a/libxslt/variables.c b/libxslt/variables.c +index eb98aab2..6696d9a1 100644 +--- a/libxslt/variables.c ++++ b/libxslt/variables.c +@@ -47,6 +47,21 @@ static const xmlChar *xsltComputingGlobalVarMarker = + #define XSLT_VAR_IN_SELECT (1<<1) + #define XSLT_TCTXT_VARIABLE(c) ((xsltStackElemPtr) (c)->contextVariable) + ++static xsltRVTListPtr ++xsltRVTListCreate(void) ++{ ++ xsltRVTListPtr ret; ++ ++ ret = (xsltRVTListPtr) xmlMalloc(sizeof(xsltRVTList)); ++ if (ret == NULL) { ++ xsltTransformError(NULL, NULL, NULL, ++ "xsltRVTListCreate: malloc failed\n"); ++ return(NULL); ++ } ++ memset(ret, 0, sizeof(xsltRVTList)); ++ return(ret); ++} ++ + /************************************************************************ + * * + * Result Value Tree (Result Tree Fragment) interfaces * +@@ -64,6 +79,7 @@ static const xmlChar *xsltComputingGlobalVarMarker = + xmlDocPtr + xsltCreateRVT(xsltTransformContextPtr ctxt) + { ++ xsltRVTListPtr rvtList; + xmlDocPtr container; + + /* +@@ -76,12 +92,11 @@ xsltCreateRVT(xsltTransformContextPtr ctxt) + /* + * Reuse a RTF from the cache if available. + */ +- if (ctxt->cache->RVT) { +- container = ctxt->cache->RVT; +- ctxt->cache->RVT = (xmlDocPtr) container->next; +- /* clear the internal pointers */ +- container->next = NULL; +- container->prev = NULL; ++ if (ctxt->cache->rvtList) { ++ rvtList = ctxt->cache->rvtList; ++ container = ctxt->cache->rvtList->RVT; ++ ctxt->cache->rvtList = rvtList->next; ++ xmlFree(rvtList); + if (ctxt->cache->nbRVT > 0) + ctxt->cache->nbRVT--; + #ifdef XSLT_DEBUG_PROFILE_CACHE +@@ -119,11 +134,16 @@ xsltCreateRVT(xsltTransformContextPtr ctxt) + int + xsltRegisterTmpRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT) + { ++ xsltRVTListPtr list; ++ + if ((ctxt == NULL) || (RVT == NULL)) + return(-1); + +- RVT->prev = NULL; ++ list = xsltRVTListCreate(); ++ if (list == NULL) return(-1); ++ + RVT->compression = XSLT_RVT_LOCAL; ++ list->RVT = RVT; + + /* + * We'll restrict the lifetime of user-created fragments +@@ -131,15 +151,13 @@ xsltRegisterTmpRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT) + * var/param itself. + */ + if (ctxt->contextVariable != NULL) { +- RVT->next = (xmlNodePtr) XSLT_TCTXT_VARIABLE(ctxt)->fragment; +- XSLT_TCTXT_VARIABLE(ctxt)->fragment = RVT; ++ list->next = XSLT_TCTXT_VARIABLE(ctxt)->fragment; ++ XSLT_TCTXT_VARIABLE(ctxt)->fragment = list; + return(0); + } + +- RVT->next = (xmlNodePtr) ctxt->tmpRVT; +- if (ctxt->tmpRVT != NULL) +- ctxt->tmpRVT->prev = (xmlNodePtr) RVT; +- ctxt->tmpRVT = RVT; ++ list->next = ctxt->tmpRVTList; ++ ctxt->tmpRVTList = list; + return(0); + } + +@@ -159,11 +177,16 @@ int + xsltRegisterLocalRVT(xsltTransformContextPtr ctxt, + xmlDocPtr RVT) + { ++ xsltRVTListPtr list; ++ + if ((ctxt == NULL) || (RVT == NULL)) + return(-1); + +- RVT->prev = NULL; ++ list = xsltRVTListCreate(); ++ if (list == NULL) return(-1); ++ + RVT->compression = XSLT_RVT_LOCAL; ++ list->RVT = RVT; + + /* + * When evaluating "select" expressions of xsl:variable +@@ -174,8 +197,8 @@ xsltRegisterLocalRVT(xsltTransformContextPtr ctxt, + if ((ctxt->contextVariable != NULL) && + (XSLT_TCTXT_VARIABLE(ctxt)->flags & XSLT_VAR_IN_SELECT)) + { +- RVT->next = (xmlNodePtr) XSLT_TCTXT_VARIABLE(ctxt)->fragment; +- XSLT_TCTXT_VARIABLE(ctxt)->fragment = RVT; ++ list->next = XSLT_TCTXT_VARIABLE(ctxt)->fragment; ++ XSLT_TCTXT_VARIABLE(ctxt)->fragment = list; + return(0); + } + /* +@@ -183,10 +206,8 @@ xsltRegisterLocalRVT(xsltTransformContextPtr ctxt, + * If not reference by a returning instruction (like EXSLT's function), + * then this fragment will be freed, when the instruction exits. + */ +- RVT->next = (xmlNodePtr) ctxt->localRVT; +- if (ctxt->localRVT != NULL) +- ctxt->localRVT->prev = (xmlNodePtr) RVT; +- ctxt->localRVT = RVT; ++ list->next = ctxt->localRVTList; ++ ctxt->localRVTList = list; + return(0); + } + +@@ -344,8 +365,9 @@ xsltFlagRVTs(xsltTransformContextPtr ctxt, xmlXPathObjectPtr obj, int val) { + * @ctxt: an XSLT transformation context + * @RVT: a result value tree (Result Tree Fragment) + * +- * Either frees the RVT (which is an xmlDoc) or stores +- * it in the context's cache for later reuse. ++ * Either frees the RVT (which is an xmlDoc) or stores it in the context's ++ * cache for later reuse. Preserved for ABI/API compatibility; internal use ++ * has all migrated to xsltReleaseRVTList(). + */ + void + xsltReleaseRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT) +@@ -353,36 +375,64 @@ xsltReleaseRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT) + if (RVT == NULL) + return; + ++ xsltRVTListPtr list = xsltRVTListCreate(); ++ if (list == NULL) { ++ if (RVT->_private != NULL) { ++ xsltFreeDocumentKeys((xsltDocumentPtr) RVT->_private); ++ xmlFree(RVT->_private); ++ } ++ xmlFreeDoc(RVT); ++ return; ++ } ++ ++ xsltReleaseRVTList(ctxt, list); ++} ++ ++/** ++ * xsltReleaseRVTList: ++ * @ctxt: an XSLT transformation context ++ * @list: a list node containing a result value tree (Result Tree Fragment) ++ * ++ * Either frees the list node or stores it in the context's cache for later ++ * reuse. Optimization to avoid adding a fallible allocation path when the ++ * caller already has a RVT list node. ++ */ ++void ++xsltReleaseRVTList(xsltTransformContextPtr ctxt, xsltRVTListPtr list) ++{ ++ if (list == NULL) ++ return; ++ + if (ctxt && (ctxt->cache->nbRVT < 40)) { + /* + * Store the Result Tree Fragment. + * Free the document info. + */ +- if (RVT->_private != NULL) { +- xsltFreeDocumentKeys((xsltDocumentPtr) RVT->_private); +- xmlFree(RVT->_private); +- RVT->_private = NULL; ++ if (list->RVT->_private != NULL) { ++ xsltFreeDocumentKeys((xsltDocumentPtr) list->RVT->_private); ++ xmlFree(list->RVT->_private); ++ list->RVT->_private = NULL; + } + /* + * Clear the document tree. + */ +- if (RVT->children != NULL) { +- xmlFreeNodeList(RVT->children); +- RVT->children = NULL; +- RVT->last = NULL; ++ if (list->RVT->children != NULL) { ++ xmlFreeNodeList(list->RVT->children); ++ list->RVT->children = NULL; ++ list->RVT->last = NULL; + } +- if (RVT->ids != NULL) { +- xmlFreeIDTable((xmlIDTablePtr) RVT->ids); +- RVT->ids = NULL; ++ if (list->RVT->ids != NULL) { ++ xmlFreeIDTable((xmlIDTablePtr) list->RVT->ids); ++ list->RVT->ids = NULL; + } + + /* + * Reset the ownership information. + */ +- RVT->compression = 0; ++ list->RVT->compression = 0; + +- RVT->next = (xmlNodePtr) ctxt->cache->RVT; +- ctxt->cache->RVT = RVT; ++ list->next = ctxt->cache->rvtList; ++ ctxt->cache->rvtList = list; + + ctxt->cache->nbRVT++; + +@@ -394,11 +444,12 @@ xsltReleaseRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT) + /* + * Free it. + */ +- if (RVT->_private != NULL) { +- xsltFreeDocumentKeys((xsltDocumentPtr) RVT->_private); +- xmlFree(RVT->_private); ++ if (list->RVT->_private != NULL) { ++ xsltFreeDocumentKeys((xsltDocumentPtr) list->RVT->_private); ++ xmlFree(list->RVT->_private); + } +- xmlFreeDoc(RVT); ++ xmlFreeDoc(list->RVT); ++ xmlFree(list); + } + + /** +@@ -416,14 +467,17 @@ xsltReleaseRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT) + int + xsltRegisterPersistRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT) + { ++ xsltRVTListPtr list; ++ + if ((ctxt == NULL) || (RVT == NULL)) return(-1); + ++ list = xsltRVTListCreate(); ++ if (list == NULL) return(-1); ++ + RVT->compression = XSLT_RVT_GLOBAL; +- RVT->prev = NULL; +- RVT->next = (xmlNodePtr) ctxt->persistRVT; +- if (ctxt->persistRVT != NULL) +- ctxt->persistRVT->prev = (xmlNodePtr) RVT; +- ctxt->persistRVT = RVT; ++ list->RVT = RVT; ++ list->next = ctxt->persistRVTList; ++ ctxt->persistRVTList = list; + return(0); + } + +@@ -438,52 +492,55 @@ xsltRegisterPersistRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT) + void + xsltFreeRVTs(xsltTransformContextPtr ctxt) + { +- xmlDocPtr cur, next; ++ xsltRVTListPtr cur, next; + + if (ctxt == NULL) + return; + /* + * Local fragments. + */ +- cur = ctxt->localRVT; ++ cur = ctxt->localRVTList; + while (cur != NULL) { +- next = (xmlDocPtr) cur->next; +- if (cur->_private != NULL) { +- xsltFreeDocumentKeys(cur->_private); +- xmlFree(cur->_private); ++ next = cur->next; ++ if (cur->RVT->_private != NULL) { ++ xsltFreeDocumentKeys(cur->RVT->_private); ++ xmlFree(cur->RVT->_private); + } +- xmlFreeDoc(cur); ++ xmlFreeDoc(cur->RVT); ++ xmlFree(cur); + cur = next; + } +- ctxt->localRVT = NULL; ++ ctxt->localRVTList = NULL; + /* + * User-created per-template fragments. + */ +- cur = ctxt->tmpRVT; ++ cur = ctxt->tmpRVTList; + while (cur != NULL) { +- next = (xmlDocPtr) cur->next; +- if (cur->_private != NULL) { +- xsltFreeDocumentKeys(cur->_private); +- xmlFree(cur->_private); ++ next = cur->next; ++ if (cur->RVT->_private != NULL) { ++ xsltFreeDocumentKeys(cur->RVT->_private); ++ xmlFree(cur->RVT->_private); + } +- xmlFreeDoc(cur); ++ xmlFreeDoc(cur->RVT); ++ xmlFree(cur); + cur = next; + } +- ctxt->tmpRVT = NULL; ++ ctxt->tmpRVTList = NULL; + /* + * Global fragments. + */ +- cur = ctxt->persistRVT; ++ cur = ctxt->persistRVTList; + while (cur != NULL) { +- next = (xmlDocPtr) cur->next; +- if (cur->_private != NULL) { +- xsltFreeDocumentKeys(cur->_private); +- xmlFree(cur->_private); ++ next = cur->next; ++ if (cur->RVT->_private != NULL) { ++ xsltFreeDocumentKeys(cur->RVT->_private); ++ xmlFree(cur->RVT->_private); + } +- xmlFreeDoc(cur); ++ xmlFreeDoc(cur->RVT); ++ xmlFree(cur); + cur = next; + } +- ctxt->persistRVT = NULL; ++ ctxt->persistRVTList = NULL; + } + + /************************************************************************ +@@ -571,21 +628,22 @@ xsltFreeStackElem(xsltStackElemPtr elem) { + * Release the list of temporary Result Tree Fragments. + */ + if (elem->context) { +- xmlDocPtr cur; ++ xsltRVTListPtr cur; + + while (elem->fragment != NULL) { + cur = elem->fragment; +- elem->fragment = (xmlDocPtr) cur->next; +- +- if (cur->compression == XSLT_RVT_LOCAL) { +- xsltReleaseRVT(elem->context, cur); +- } else if (cur->compression == XSLT_RVT_FUNC_RESULT) { +- xsltRegisterLocalRVT(elem->context, cur); +- cur->compression = XSLT_RVT_FUNC_RESULT; ++ elem->fragment = cur->next; ++ ++ if (cur->RVT->compression == XSLT_RVT_LOCAL) { ++ xsltReleaseRVTList(elem->context, cur); ++ } else if (cur->RVT->compression == XSLT_RVT_FUNC_RESULT) { ++ xsltRegisterLocalRVT(elem->context, cur->RVT); ++ cur->RVT->compression = XSLT_RVT_FUNC_RESULT; ++ xmlFree(cur); + } else { + xmlGenericError(xmlGenericErrorContext, + "xsltFreeStackElem: Unexpected RVT flag %d\n", +- cur->compression); ++ cur->RVT->compression); + } + } + } +@@ -944,6 +1002,7 @@ xsltEvalVariable(xsltTransformContextPtr ctxt, xsltStackElemPtr variable, + } else { + if (variable->tree) { + xmlDocPtr container; ++ xsltRVTListPtr rvtList; + xmlNodePtr oldInsert; + xmlDocPtr oldOutput; + const xmlChar *oldLastText; +@@ -968,7 +1027,11 @@ xsltEvalVariable(xsltTransformContextPtr ctxt, xsltStackElemPtr variable, + * when the variable is freed, it will also free + * the Result Tree Fragment. + */ +- variable->fragment = container; ++ rvtList = xsltRVTListCreate(); ++ if (rvtList == NULL) ++ goto error; ++ rvtList->RVT = container; ++ variable->fragment = rvtList; + container->compression = XSLT_RVT_LOCAL; + + oldOutput = ctxt->output; +@@ -2361,5 +2424,3 @@ local_variable_found: + + return(valueObj); + } +- +- +diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h +index 6faa07db..ec84e1df 100644 +--- a/libxslt/xsltInternals.h ++++ b/libxslt/xsltInternals.h +@@ -1410,6 +1410,8 @@ struct _xsltStylePreComp { + + #endif /* XSLT_REFACTORED */ + ++typedef struct _xsltRVTList xsltRVTList; ++typedef xsltRVTList *xsltRVTListPtr; + + /* + * The in-memory structure corresponding to an XSLT Variable +@@ -1427,7 +1429,7 @@ struct _xsltStackElem { + xmlNodePtr tree; /* the sequence constructor if no eval + string or the location */ + xmlXPathObjectPtr value; /* The value if computed */ +- xmlDocPtr fragment; /* The Result Tree Fragments (needed for XSLT 1.0) ++ xsltRVTListPtr fragment; /* The Result Tree Fragments (needed for XSLT 1.0) + which are bound to the variable's lifetime. */ + int level; /* the depth in the tree; + -1 if persistent (e.g. a given xsl:with-param) */ +@@ -1639,10 +1641,15 @@ struct _xsltStylesheet { + unsigned long opCount; + }; + ++struct _xsltRVTList { ++ xmlDocPtr RVT; ++ xsltRVTListPtr next; ++}; ++ + typedef struct _xsltTransformCache xsltTransformCache; + typedef xsltTransformCache *xsltTransformCachePtr; + struct _xsltTransformCache { +- xmlDocPtr RVT; ++ xsltRVTListPtr rvtList; + int nbRVT; + xsltStackElemPtr stackItems; + int nbStackItems; +@@ -1749,8 +1756,8 @@ struct _xsltTransformContext { + * handling of temporary Result Value Tree + * (XSLT 1.0 term: "Result Tree Fragment") + */ +- xmlDocPtr tmpRVT; /* list of RVT without persistance */ +- xmlDocPtr persistRVT; /* list of persistant RVTs */ ++ xsltRVTListPtr tmpRVTList; /* list of RVT without persistance */ ++ xsltRVTListPtr persistRVTList; /* list of persistant RVTs */ + int ctxtflags; /* context processing flags */ + + /* +@@ -1783,7 +1790,7 @@ struct _xsltTransformContext { + xmlDocPtr initialContextDoc; + xsltTransformCachePtr cache; + void *contextVariable; /* the current variable item */ +- xmlDocPtr localRVT; /* list of local tree fragments; will be freed when ++ xsltRVTListPtr localRVTList; /* list of local tree fragments; will be freed when + the instruction which created the fragment + exits */ + xmlDocPtr localRVTBase; /* Obsolete */ +@@ -1932,8 +1939,11 @@ XSLTPUBFUN int XSLTCALL + XSLTPUBFUN void XSLTCALL + xsltFreeRVTs (xsltTransformContextPtr ctxt); + XSLTPUBFUN void XSLTCALL +- xsltReleaseRVT (xsltTransformContextPtr ctxt, ++ xsltReleaseRVT (xsltTransformContextPtr ctxt, + xmlDocPtr RVT); ++XSLTPUBFUN void XSLTCALL ++ xsltReleaseRVTList (xsltTransformContextPtr ctxt, ++ xsltRVTListPtr list); + /* + * Extra functions for Attribute Value Templates + */ +@@ -1992,4 +2002,3 @@ XSLTPUBFUN int XSLTCALL + #endif + + #endif /* __XML_XSLT_H__ */ +- +-- +GitLab + diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 206fe487fd0a..429fcbdf798d 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -33,6 +33,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Wj1rODylr8I1sXERjpD1/2qifp/qMwMGUjGm1APwGDo="; }; + patches = [ + # Fix use-after-free with key data stored cross-RVT + # https://gitlab.gnome.org/GNOME/libxslt/-/issues/144 + # Source: https://gitlab.gnome.org/GNOME/libxslt/-/merge_requests/77 + ./77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch + + # Fix type confusion in xmlNode.psvi between stylesheet and source nodes + # https://gitlab.gnome.org/GNOME/libxslt/-/issues/139 + # Fix heap-use-after-free in xmlFreeID caused by `atype` corruption + # https://gitlab.gnome.org/GNOME/libxslt/-/issues/140 + # + # Depends on unmerged libxml2 patch that breaks ABI. + # + # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxslt/chromium/new-unified-atype-extra.patch + ./new-unified-atype-extra.patch + ]; + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libxslt/new-unified-atype-extra.patch b/pkgs/development/libraries/libxslt/new-unified-atype-extra.patch new file mode 100644 index 000000000000..0b729e4fe728 --- /dev/null +++ b/pkgs/development/libraries/libxslt/new-unified-atype-extra.patch @@ -0,0 +1,206 @@ +diff --git a/libxslt/functions.c b/libxslt/functions.c +index 72a58dc4d6592..309af458c22f7 100644 +--- a/libxslt/functions.c ++++ b/libxslt/functions.c +@@ -760,7 +760,7 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + } + + if (xsltGetSourceNodeFlags(cur) & XSLT_SOURCE_NODE_HAS_ID) { +- id = (unsigned long) (size_t) *psviPtr; ++ id = (unsigned long) xsltGetSourceNodeValue(cur); + } else { + if (cur->type == XML_TEXT_NODE && cur->line == USHRT_MAX) { + /* Text nodes store big line numbers in psvi. */ +@@ -772,7 +772,7 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + goto out; + } + +- if (tctxt->currentId == ULONG_MAX) { ++ if (tctxt->currentId == XSLT_SOURCE_NODE_VALUE_MAX) { + xsltTransformError(tctxt, NULL, NULL, + "generate-id(): id overflow\n"); + ctxt->error = XPATH_MEMORY_ERROR; +@@ -780,7 +780,7 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + } + + id = ++tctxt->currentId; +- *psviPtr = (void *) (size_t) id; ++ xsltSetSourceNodeValue(cur, id); + xsltSetSourceNodeFlags(tctxt, cur, XSLT_SOURCE_NODE_HAS_ID); + } + +diff --git a/libxslt/transform.c b/libxslt/transform.c +index 54ef821b5016f..1ac2471d6441b 100644 +--- a/libxslt/transform.c ++++ b/libxslt/transform.c +@@ -5772,7 +5772,8 @@ xsltCleanupSourceDoc(xmlDocPtr doc) { + xmlAttrPtr prop = cur->properties; + + while (prop) { +- prop->atype &= ~(XSLT_SOURCE_NODE_MASK << 27); ++ prop->extra &= ++ ~(XSLT_SOURCE_NODE_MASK << XSLT_SOURCE_NODE_SHIFT_32); + prop->psvi = NULL; + prop = prop->next; + } +diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c +index a20da96182289..b431fafbbb441 100644 +--- a/libxslt/xsltutils.c ++++ b/libxslt/xsltutils.c +@@ -1920,26 +1920,26 @@ xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len, + int + xsltGetSourceNodeFlags(xmlNodePtr node) { + /* +- * Squeeze the bit flags into the upper bits of ++ * Squeeze the bit flags into the upper 4 bits of + * +- * - 'int properties' member in struct _xmlDoc +- * - 'xmlAttributeType atype' member in struct _xmlAttr ++ * - 'unsigned int extra' member in struct _xmlDoc ++ * - 'unsigned int extra' member in struct _xmlAttr + * - 'unsigned short extra' member in struct _xmlNode + */ + switch (node->type) { + case XML_DOCUMENT_NODE: + case XML_HTML_DOCUMENT_NODE: +- return ((xmlDocPtr) node)->properties >> 27; ++ return ((xmlDocPtr) node)->extra >> XSLT_SOURCE_NODE_SHIFT_32; + + case XML_ATTRIBUTE_NODE: +- return ((xmlAttrPtr) node)->atype >> 27; ++ return ((xmlAttrPtr) node)->extra >> XSLT_SOURCE_NODE_SHIFT_32; + + case XML_ELEMENT_NODE: + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: +- return node->extra >> 12; ++ return node->extra >> XSLT_SOURCE_NODE_SHIFT_32; + + default: + return 0; +@@ -1964,11 +1964,13 @@ xsltSetSourceNodeFlags(xsltTransformContextPtr ctxt, xmlNodePtr node, + switch (node->type) { + case XML_DOCUMENT_NODE: + case XML_HTML_DOCUMENT_NODE: +- ((xmlDocPtr) node)->properties |= flags << 27; ++ ((xmlDocPtr) node)->extra |= ++ ((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_32); + return 0; + + case XML_ATTRIBUTE_NODE: +- ((xmlAttrPtr) node)->atype |= flags << 27; ++ ((xmlAttrPtr) node)->extra |= ++ ((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_32); + return 0; + + case XML_ELEMENT_NODE: +@@ -1976,7 +1978,7 @@ xsltSetSourceNodeFlags(xsltTransformContextPtr ctxt, xmlNodePtr node, + case XML_CDATA_SECTION_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: +- node->extra |= flags << 12; ++ node->extra |= ((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_16); + return 0; + + default: +@@ -1998,11 +2000,13 @@ xsltClearSourceNodeFlags(xmlNodePtr node, int flags) { + switch (node->type) { + case XML_DOCUMENT_NODE: + case XML_HTML_DOCUMENT_NODE: +- ((xmlDocPtr) node)->properties &= ~(flags << 27); ++ ((xmlDocPtr) node)->extra &= ++ ~((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_32); + return 0; + + case XML_ATTRIBUTE_NODE: +- ((xmlAttrPtr) node)->atype &= ~(flags << 27); ++ ((xmlAttrPtr) node)->extra &= ++ ~((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_32); + return 0; + + case XML_ELEMENT_NODE: +@@ -2010,7 +2014,55 @@ xsltClearSourceNodeFlags(xmlNodePtr node, int flags) { + case XML_CDATA_SECTION_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: +- node->extra &= ~(flags << 12); ++ node->extra &= ~((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_16); ++ return 0; ++ ++ default: ++ return -1; ++ } ++} ++ ++/** ++ * xsltGetSourceNodeValue: ++ * @node: Node from source document ++ * ++ * Returns the associated 28 bit unsigned value for a source node, ++ * or 0 if node does not have an associated value. ++ */ ++int ++xsltGetSourceNodeValue(xmlNodePtr node) { ++ switch (node->type) { ++ case XML_DOCUMENT_NODE: ++ case XML_HTML_DOCUMENT_NODE: ++ return (((xmlDocPtr) node)->extra & XSLT_SOURCE_NODE_VALUE_MASK); ++ ++ case XML_ATTRIBUTE_NODE: ++ return (((xmlAttrPtr) node)->extra & XSLT_SOURCE_NODE_VALUE_MASK); ++ ++ default: ++ return 0; ++ } ++} ++ ++/** ++ * xsltSetSourceNodeValue: ++ * @node: Node from source document ++ * @value: 28 bit unsigned value to associate with the node. ++ * ++ * Returns 0 on success, -1 on error. ++ */ ++int ++xsltSetSourceNodeValue(xmlNodePtr node, int value) { ++ switch (node->type) { ++ case XML_DOCUMENT_NODE: ++ case XML_HTML_DOCUMENT_NODE: ++ ((xmlDocPtr) node)->extra &= ~XSLT_SOURCE_NODE_VALUE_MASK; ++ ((xmlDocPtr) node)->extra |= (value & XSLT_SOURCE_NODE_VALUE_MASK); ++ return 0; ++ ++ case XML_ATTRIBUTE_NODE: ++ ((xmlAttrPtr) node)->extra &= ~XSLT_SOURCE_NODE_VALUE_MASK; ++ ((xmlAttrPtr) node)->extra |= (value & XSLT_SOURCE_NODE_VALUE_MASK); + return 0; + + default: +diff --git a/libxslt/xsltutils.h b/libxslt/xsltutils.h +index 2514774b3f11a..1e753eebadd98 100644 +--- a/libxslt/xsltutils.h ++++ b/libxslt/xsltutils.h +@@ -261,6 +261,10 @@ XSLTPUBFUN xmlXPathCompExprPtr XSLTCALL + #define XSLT_SOURCE_NODE_MASK 15u + #define XSLT_SOURCE_NODE_HAS_KEY 1u + #define XSLT_SOURCE_NODE_HAS_ID 2u ++#define XSLT_SOURCE_NODE_SHIFT_16 12u ++#define XSLT_SOURCE_NODE_SHIFT_32 28u ++#define XSLT_SOURCE_NODE_VALUE_MASK ((1 << XSLT_SOURCE_NODE_SHIFT_32) - 1) ++#define XSLT_SOURCE_NODE_VALUE_MAX XSLT_SOURCE_NODE_VALUE_MASK + int + xsltGetSourceNodeFlags(xmlNodePtr node); + int +@@ -268,6 +272,10 @@ xsltSetSourceNodeFlags(xsltTransformContextPtr ctxt, xmlNodePtr node, + int flags); + int + xsltClearSourceNodeFlags(xmlNodePtr node, int flags); ++int ++xsltSetSourceNodeValue(xmlNodePtr node, int value); ++int ++xsltGetSourceNodeValue(xmlNodePtr node); + void ** + xsltGetPSVIPtr(xmlNodePtr cur); + /** DOC_ENABLE */ diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b2145088cbf8..db9ec5273585 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation { # Keep build-ids so drivers can use them for caching, etc. # Also some drivers segfault without this. separateDebugInfo = true; + __structuredAttrs = true; # Needed to discover llvm-config for cross preConfigure = '' diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index dff5ba112bca..ce8675aa6db8 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.2.4"; + version = "3.3.4"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - hash = "sha256-mVUxxYe6teiJ18PQ9703/kjBpJ9+a7vcDme+NwtQQQM="; + hash = "sha256-dPPL9ML5O/u0FXuLxE3bkkgetOzNU3qni3n0pq25bT0="; }; outputs = [ diff --git a/pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs-darwin.patch similarity index 100% rename from pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs-darwin.patch rename to pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs-darwin.patch diff --git a/pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs.patch similarity index 100% rename from pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs.patch rename to pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0cd7d15a92d9..9a6b55ac6af6 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -15,6 +15,11 @@ enableSSL3 ? false, enableMD2 ? false, enableKTLS ? stdenv.hostPlatform.isLinux, + # change this to a value between 0 and 5 (as of OpenSSL 3.5) + # if null, default is used, changes the permitted algorithms + # and key lengths in the default config + # see: https://docs.openssl.org/3.5/man3/SSL_CTX_set_security_level/ + securityLevel ? null, static ? stdenv.hostPlatform.isStatic, # path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default conf ? null, @@ -27,6 +32,9 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. +# check from time to time, if this range is still correct +assert (securityLevel == null) || (securityLevel >= 0 && securityLevel <= 5); + let common = { @@ -181,6 +189,15 @@ let "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" ] + # enable optimized EC curve primitives on x86_64, + # can provide a 2x up to 4x speedup at best + # with combined PQC and conventional crypto handshakes + # starting with 3.5 its nice to speed things up for free + ++ lib.optional stdenv.hostPlatform.isx86_64 "enable-ec_nistp_64_gcc_128" + # useful to set e.g. 256 bit security level with setting this to 5 + ++ lib.optional ( + securityLevel != null + ) "-DOPENSSL_TLS_SECURITY_LEVEL=${builtins.toString securityLevel}" ++ lib.optional enableMD2 "enable-md2" ++ lib.optional enableSSL2 "enable-ssl2" ++ lib.optional enableSSL3 "enable-ssl3" @@ -348,8 +365,8 @@ in }; openssl_3 = common { - version = "3.0.16"; - hash = "sha256-V+A8UP6rXTGxUq8rdk8QN5rs2O6S8WyYWYPOSpn374Y="; + version = "3.0.17"; + hash = "sha256-39135OobV/86bb3msL3D8x21rJnn/dTq+eH7tuwtuM4="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -370,9 +387,9 @@ in }; }; - openssl_3_4 = common { - version = "3.4.1"; - hash = "sha256-ACotazC1i/S+pGxDvdljZar42qbEKHgqpP7uBtoZffM="; + openssl_3_5 = common { + version = "3.5.1"; + hash = "sha256-UpBDsVz/pfNgd6TQr4Pz3jmYBxgdYHRB1zQZbYibZB8="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -383,9 +400,9 @@ in ( if stdenv.hostPlatform.isDarwin then - ./3.4/use-etc-ssl-certs-darwin.patch + ./3.5/use-etc-ssl-certs-darwin.patch else - ./3.4/use-etc-ssl-certs.patch + ./3.5/use-etc-ssl-certs.patch ) ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 9e4ad498dc9a..04f7ea09e50d 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -28,7 +28,6 @@ vulkan-headers, vulkan-loader, webrtc-audio-processing, - webrtc-audio-processing_1, ncurses, readline, # meson can't find <7 as those versions don't have a .pc file lilv, @@ -70,19 +69,15 @@ }: let - webrtc-audio-processings = lib.filter (lib.meta.availableOn stdenv.hostPlatform) [ - webrtc-audio-processing_1 - webrtc-audio-processing - ]; - modemmanagerSupport = lib.meta.availableOn stdenv.hostPlatform modemmanager; libcameraSupport = lib.meta.availableOn stdenv.hostPlatform libcamera; ldacbtSupport = lib.meta.availableOn stdenv.hostPlatform ldacbt; + webrtcAudioProcessingSupport = lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing; in stdenv.mkDerivation (finalAttrs: { pname = "pipewire"; - version = "1.4.5"; + version = "1.4.6"; outputs = [ "out" @@ -98,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-5fBpthIGsvMYrQyRb6n1uiNtJ3pl2ejAFr1e/UUga8w="; + sha256 = "sha256-Hk43rKrKCJA6njQ9ap/Pje9AQKygrDc+GTlimaMh/pg="; }; patches = [ @@ -156,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { epoll-shim freebsd.libstdthreads ] - ++ lib.take 1 webrtc-audio-processings + ++ lib.optional webrtcAudioProcessingSupport webrtc-audio-processing ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional ldacbtSupport ldacbt ++ lib.optional libcameraSupport libcamera @@ -195,7 +190,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "installed_tests" true) (lib.mesonOption "installed_test_prefix" (placeholder "installedTests")) (lib.mesonOption "libjack-path" "${placeholder "jack"}/lib") - (lib.mesonEnable "echo-cancel-webrtc" (webrtc-audio-processings != [ ])) + (lib.mesonEnable "echo-cancel-webrtc" webrtcAudioProcessingSupport) (lib.mesonEnable "libcamera" (lib.meta.availableOn stdenv.hostPlatform libcamera)) (lib.mesonEnable "libffado" ffadoSupport) (lib.mesonEnable "roc" rocSupport) diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 3d13c959eff2..9de688a268bf 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -8,11 +8,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-y9RLRA5rfMdrZQ2pOocIl+WpSt94grGf34/iItT3Sk8="; + hash = "sha256-JWdHJnGtXZifiLUbrvndWTU6Xnw/LtfmuYl1XLkAQjM="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/protobuf/24.nix b/pkgs/development/libraries/protobuf/24.nix deleted file mode 100644 index ad808810ad63..000000000000 --- a/pkgs/development/libraries/protobuf/24.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, ... }@args: - -callPackage ./generic.nix ( - { - version = "24.4"; - hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; - } - // args -) diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 25f1555d2cd3..9284b2d2ea80 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.0/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.1/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index 2a94c8a6aabf..4e1b5e76bab1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -10,7 +10,7 @@ lib, pkgsBuildBuild, replaceVars, - fetchpatch2, + fetchpatch, }: qtModule { @@ -38,19 +38,10 @@ qtModule { }) # add version specific QML import path ./use-versioned-import-path.patch - - # The build attempts to sign qmltestrunner, which may already be signed, causing it to fail unless forced. - # FIXME: remove for 6.9.1 - (fetchpatch2 { - url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/8effbbcefd8cae27cd5da07b4ffe3aa86dad83bf.diff"; - hash = "sha256-wKrKXdr1ddshpRVIZZ/dsn87wjPXSaoUvXT9edlPtzA="; - }) - - # Backport patch to fix qmlsc crash on "if + for" - # FIXME: remove for 6.9.1 - (fetchpatch2 { - url = "https://github.com/qt/qtdeclarative/commit/d1aa2e8466bab73c3e4d120356238b482b55f02a.patch?full_index=1"; - hash = "sha256-8W1xpULqESP81S4UbQugoU/D6KFy7DoTbJ3xfK9Q5PI="; + # This should make it into the 6.9.2 release. + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/672e6777e8e6a8fd.diff"; + hash = "sha256-nPczX6SHZPcdg7AqpRIwPCrcS3PId+Ibb0iPSiHUdaw="; }) ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix index 016f72f3074a..28092b27e13e 100644 --- a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix @@ -1,6 +1,5 @@ { qtModule, - fetchpatch, qtbase, qtdeclarative, protobuf, @@ -10,14 +9,6 @@ qtModule { pname = "qtgrpc"; - patches = [ - (fetchpatch { - name = "new-protobuf.patch"; - url = "https://github.com/qt/qtgrpc/commit/514769d1bd595d0e54bbe34c0bd167636d4825dc.diff"; - hash = "sha256-juNSijNlR6PHxiEVx72vMBSvcWYfR/T/yvpxAF+ZAKE="; - }) - ]; - propagatedBuildInputs = [ qtbase qtdeclarative diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 3e0e5d36b628..0332feb6c04c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -6,13 +6,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.9.0"; + version = "6.9.1"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; tag = "v${version}"; - hash = "sha256-kBm173AJYVjAH2ZH6xTMyqEcw0GB1XkbxKc3vYriMvU="; + hash = "sha256-nyMsl07pL6mNpg1p7W3cn2NXGmEbm+y9tgMexp6+xYI="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix index e9ba5ff9c570..e053ca90336c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix @@ -62,14 +62,10 @@ qtModule { gst-vaapi ]; - patches = - [ - ./fix-qtgui-include-incorrect-case.patch - ] - ++ lib.optionals stdenv.hostPlatform.isMinGW [ - ./windows-no-uppercase-libs.patch - ./windows-resolve-function-name.patch - ]; + patches = lib.optionals stdenv.hostPlatform.isMinGW [ + ./windows-no-uppercase-libs.patch + ./windows-resolve-function-name.patch + ]; cmakeFlags = [ "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch b/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch deleted file mode 100644 index c67fde93498b..000000000000 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp -+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp -@@ -7,7 +7,7 @@ - #include - #include - #include --#include -+#include - #include "qvideoframe.h" - - #include diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index ad5fdd6dfea9..ae34492453c5 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -9,21 +9,11 @@ wayland-scanner, pkg-config, libdrm, - fetchpatch, }: qtModule { pname = "qtwayland"; - # Backport fix for popups not rendering properly - # FIXME: remove in 6.9.1 - patches = [ - (fetchpatch { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/e4556c59f0c8250da7c16759432b2ac0a5ac9d9f.patch"; - hash = "sha256-wRNXBwecuULn5MD87HP20uSuxHiuQslKp20DIuCGheM="; - }) - ]; - # wayland-scanner needs to be propagated as both build # (for the wayland-scanner binary) and host (for the # actual wayland.xml protocol definition) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 76c6221cb664..748456adfb60 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -7,6 +7,7 @@ buildPackages, bison, coreutils, + fetchpatch2, flex, git, gperf, @@ -100,22 +101,30 @@ qtModule { # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; - patches = [ - # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT - # environment variable, since NixOS relies on it working. - # See https://github.com/NixOS/nixpkgs/issues/226484 for more context. - ./xkb-includes.patch + patches = + [ + # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT + # environment variable, since NixOS relies on it working. + # See https://github.com/NixOS/nixpkgs/issues/226484 for more context. + ./xkb-includes.patch - ./link-pulseaudio.patch + ./link-pulseaudio.patch - # Override locales install path so they go to QtWebEngine's $out - ./locales-path.patch + # Override locales install path so they go to QtWebEngine's $out + ./locales-path.patch - # Fix build with Pipewire 1.4 - ./pipewire-1.4.patch - # Reproducibility QTBUG-136068 - ./gn-object-sorted.patch - ]; + # Reproducibility QTBUG-136068 + ./gn-object-sorted.patch + ] + ++ lib.optionals stdenv.cc.isClang [ + # https://chromium-review.googlesource.com/c/chromium/src/+/6445471 + (fetchpatch2 { + url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch?full_index=1"; + stripLen = 1; + extraPrefix = "src/3rdparty/chromium/"; + hash = "sha256-wcby9uD8xb4re9+s+rdl1hcpxDcHxuI68vUNAC7Baas="; + }) + ]; postPatch = '' @@ -155,8 +164,8 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cmake/Functions.cmake \ - --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" + substituteInPlace cmake/QtToolchainHelpers.cmake \ + --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" ''; cmakeFlags = diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch b/pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch deleted file mode 100644 index d034eee06b5f..000000000000 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, - .param = OnNodeParam, - }; - -- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); -+ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); - } - - // static -@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) { - uint32_t id = info->params[i].id; - if (id == SPA_PARAM_EnumFormat && - info->params[i].flags & SPA_PARAM_INFO_READ) { -- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); -+ pw_node_enum_params(reinterpret_cast(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); - break; - } - } diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index c71e3aeb274b..4ad3606a99e0 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,315 @@ { qt3d = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qt3d-everywhere-src-6.9.0.tar.xz"; - sha256 = "1hkcf6j87fpw9ss5vvcaqh3km0vv0f0m3acwvnr3fgc781nxa7aj"; - name = "qt3d-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qt3d-everywhere-src-6.9.1.tar.xz"; + sha256 = "1127kkbrds6xsd28p47drs51py5x8gsv2rwbllkb6yqlc1x4jilw"; + name = "qt3d-everywhere-src-6.9.1.tar.xz"; }; }; qt5compat = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qt5compat-everywhere-src-6.9.0.tar.xz"; - sha256 = "0qq7f4gk09jyjwj9hr5ig0jwagywsqbsymydw3xp2851scwhbgjm"; - name = "qt5compat-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qt5compat-everywhere-src-6.9.1.tar.xz"; + sha256 = "0yli7mbsdhksx57n05axr3kkspf9nm56w6bm1rbl0p0d7yn2diwn"; + name = "qt5compat-everywhere-src-6.9.1.tar.xz"; }; }; qtactiveqt = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtactiveqt-everywhere-src-6.9.0.tar.xz"; - sha256 = "0gl50kv1dh33jiwsfmgb1fgpkynzzh5z53024l893i0gfkc4nc93"; - name = "qtactiveqt-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtactiveqt-everywhere-src-6.9.1.tar.xz"; + sha256 = "0lvd6566yycfid6nq66m5cl3aw5bfzfifbhcpnqangvq1vla2zpx"; + name = "qtactiveqt-everywhere-src-6.9.1.tar.xz"; }; }; qtbase = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtbase-everywhere-src-6.9.0.tar.xz"; - sha256 = "132ry38i7kzapdr23bp39sar76np44is7m059bq1m01mm0p0r061"; - name = "qtbase-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtbase-everywhere-src-6.9.1.tar.xz"; + sha256 = "13pjmha1jpalpy5qc5gijny7i648clsmcc08c5cik6nchfzyvjj0"; + name = "qtbase-everywhere-src-6.9.1.tar.xz"; }; }; qtcharts = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtcharts-everywhere-src-6.9.0.tar.xz"; - sha256 = "0a3z65fd54gm4w50si1makq972lj7g3yi1ys188ppr2zya3r474a"; - name = "qtcharts-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtcharts-everywhere-src-6.9.1.tar.xz"; + sha256 = "1ly3mq4hgl4b20grajqy9bw16cx50d4drjxr3ljfj5n8gbmip1xq"; + name = "qtcharts-everywhere-src-6.9.1.tar.xz"; }; }; qtconnectivity = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtconnectivity-everywhere-src-6.9.0.tar.xz"; - sha256 = "16452vxd4by1snl42bbg8vk5qr71i88ngspwi8qgkfdjmj6jyh7z"; - name = "qtconnectivity-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtconnectivity-everywhere-src-6.9.1.tar.xz"; + sha256 = "05qabslwr7dc7mfkgkr2ikqlb93c0dkfyg2vbvc5lk8h280yb229"; + name = "qtconnectivity-everywhere-src-6.9.1.tar.xz"; }; }; qtdatavis3d = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtdatavis3d-everywhere-src-6.9.0.tar.xz"; - sha256 = "05c0kmzwiw7kgpzkh470x1zggwn7rba7qg7fza6jm4wcsl9vf31i"; - name = "qtdatavis3d-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtdatavis3d-everywhere-src-6.9.1.tar.xz"; + sha256 = "1irjbdm8ypm01zx18rwq8sp161fq9yjhbx01pcgfdix7y9sqnyac"; + name = "qtdatavis3d-everywhere-src-6.9.1.tar.xz"; }; }; qtdeclarative = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtdeclarative-everywhere-src-6.9.0.tar.xz"; - sha256 = "0g8dl9dnzlj4nm08pjdcr6fvnyvzxazy52gr6iki6yl422jmy5x3"; - name = "qtdeclarative-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtdeclarative-everywhere-src-6.9.1.tar.xz"; + sha256 = "15zc9i9d3c9r2bqbcavqn77qk2vwcwlmp5kv73pdg681vxjldffc"; + name = "qtdeclarative-everywhere-src-6.9.1.tar.xz"; }; }; qtdoc = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtdoc-everywhere-src-6.9.0.tar.xz"; - sha256 = "1zdr5vi313rph1hz1c5a1wyrrspifjm5xaz475xc3yic7imn6fqz"; - name = "qtdoc-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtdoc-everywhere-src-6.9.1.tar.xz"; + sha256 = "1d8sdnwimvy8fi7cihkxzjllri5gsldy39rzqwyxv4nfwnxbw33f"; + name = "qtdoc-everywhere-src-6.9.1.tar.xz"; }; }; qtgraphs = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtgraphs-everywhere-src-6.9.0.tar.xz"; - sha256 = "1im0z8m50yy3p8v6rkxc7agyx061c644asjqnljjajwkq76hhnwy"; - name = "qtgraphs-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtgraphs-everywhere-src-6.9.1.tar.xz"; + sha256 = "0i1lb7zdvhxyv51g9h667g7wq50h6x11w88v68x5mfyda98dqbgm"; + name = "qtgraphs-everywhere-src-6.9.1.tar.xz"; }; }; qtgrpc = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtgrpc-everywhere-src-6.9.0.tar.xz"; - sha256 = "0dxichzs2371xqzyrqgf74z18phykv23xagwz6ldkh0s31vf0mrr"; - name = "qtgrpc-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtgrpc-everywhere-src-6.9.1.tar.xz"; + sha256 = "0l574fwlqszk3zny2mcbka8ipi8bhj8m67jsd7yv129j42g8ck63"; + name = "qtgrpc-everywhere-src-6.9.1.tar.xz"; }; }; qthttpserver = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qthttpserver-everywhere-src-6.9.0.tar.xz"; - sha256 = "0wxf29hyai0v9p7sx0r6a7lz00ps18x6mcls3330jk2c3gpwzlli"; - name = "qthttpserver-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qthttpserver-everywhere-src-6.9.1.tar.xz"; + sha256 = "0lrby1ii7ic0m3wnv1hvb5izzwrk5ryqvbi723qnbhxvw88vbixz"; + name = "qthttpserver-everywhere-src-6.9.1.tar.xz"; }; }; qtimageformats = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtimageformats-everywhere-src-6.9.0.tar.xz"; - sha256 = "0vv082jfird2m7x60iz8kb6kghaj2zwsk7q7837rggsp58jccir0"; - name = "qtimageformats-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtimageformats-everywhere-src-6.9.1.tar.xz"; + sha256 = "0z2py4x0shdn29l9656r63xc8gzk9bgxlgi3qx9bg6xgv8wg5sgb"; + name = "qtimageformats-everywhere-src-6.9.1.tar.xz"; }; }; qtlanguageserver = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtlanguageserver-everywhere-src-6.9.0.tar.xz"; - sha256 = "0bj9azip0sxmcj4girdscvgbn32givxi6w0jcdmy7vjjc41mxrpf"; - name = "qtlanguageserver-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtlanguageserver-everywhere-src-6.9.1.tar.xz"; + sha256 = "1v486kb11mg65bvg88mm306nvq55kg6glnqiwfv9n2vn28v3a5ya"; + name = "qtlanguageserver-everywhere-src-6.9.1.tar.xz"; }; }; qtlocation = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtlocation-everywhere-src-6.9.0.tar.xz"; - sha256 = "1537haryrrvcdj0j85wid4w4a100ngdrh4f2q2p2saxaq725m8md"; - name = "qtlocation-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtlocation-everywhere-src-6.9.1.tar.xz"; + sha256 = "0mzg4z0zra13czgygaxim8wn4a2lzndly3w0ymcxwzh4gs8fis60"; + name = "qtlocation-everywhere-src-6.9.1.tar.xz"; }; }; qtlottie = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtlottie-everywhere-src-6.9.0.tar.xz"; - sha256 = "1gps985lzrzxgarhi5ykzmc88walr25b1c9nc0k7k8l7lla1dfnl"; - name = "qtlottie-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtlottie-everywhere-src-6.9.1.tar.xz"; + sha256 = "18lbl6pxvfiwl84y92xwnm4cayxs8rdfgmvrq44n3jbk0wp8rs4f"; + name = "qtlottie-everywhere-src-6.9.1.tar.xz"; }; }; qtmultimedia = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtmultimedia-everywhere-src-6.9.0.tar.xz"; - sha256 = "1351rayivxzjpfflag2jaym987b6yx19cqw0ja9f3qrx9wcknp4r"; - name = "qtmultimedia-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtmultimedia-everywhere-src-6.9.1.tar.xz"; + sha256 = "079r0wp4nwyp4a5cannz3vf99aj4dvydwydvwbw5bvhqjm2kcplm"; + name = "qtmultimedia-everywhere-src-6.9.1.tar.xz"; }; }; qtnetworkauth = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtnetworkauth-everywhere-src-6.9.0.tar.xz"; - sha256 = "065lzvvm9i064msk90qy5919m983n4q67k17s78n8jbx4as0iizs"; - name = "qtnetworkauth-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtnetworkauth-everywhere-src-6.9.1.tar.xz"; + sha256 = "1jrrfcw3aa93xaq95xhy0iyigldmvgamy5452mpm8d926xdv3bbz"; + name = "qtnetworkauth-everywhere-src-6.9.1.tar.xz"; }; }; qtpositioning = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtpositioning-everywhere-src-6.9.0.tar.xz"; - sha256 = "1layc0j3d0r75yyvgp5irmvbjih1z1csn2lic9arry9bv40lq2y0"; - name = "qtpositioning-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtpositioning-everywhere-src-6.9.1.tar.xz"; + sha256 = "09pz0sbzcvhcaag7g7pidcnyvrx2kaxsxr73y2iqq949955p6qkh"; + name = "qtpositioning-everywhere-src-6.9.1.tar.xz"; }; }; qtquick3d = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtquick3d-everywhere-src-6.9.0.tar.xz"; - sha256 = "1274k4rsriyshm8mq55mk9kij2vjsaja1cabpfvambm5vj7jd5d2"; - name = "qtquick3d-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquick3d-everywhere-src-6.9.1.tar.xz"; + sha256 = "0xwr5kdz1yn0arby4jipbh0j8z1x8ppiqhswddyipmdzizd005pn"; + name = "qtquick3d-everywhere-src-6.9.1.tar.xz"; }; }; qtquick3dphysics = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtquick3dphysics-everywhere-src-6.9.0.tar.xz"; - sha256 = "1816b3sxs99lrq3krjsjdr9vi9q7ayhrgqz6sz819bqzb5z2y7jz"; - name = "qtquick3dphysics-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquick3dphysics-everywhere-src-6.9.1.tar.xz"; + sha256 = "0kx2vj6qwwp05iizfnsmbn2337w70crah4zcdm1ah2f4p1g3ds36"; + name = "qtquick3dphysics-everywhere-src-6.9.1.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtquickeffectmaker-everywhere-src-6.9.0.tar.xz"; - sha256 = "1akia03g1ickp27bdqqr8r7sy7yq740wyvb895csdq9qrbj16qli"; - name = "qtquickeffectmaker-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquickeffectmaker-everywhere-src-6.9.1.tar.xz"; + sha256 = "0caxs6xcm5c7g85xyln5jjvz4b4g6flww7kq9vsl9fs20v21gdir"; + name = "qtquickeffectmaker-everywhere-src-6.9.1.tar.xz"; }; }; qtquicktimeline = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtquicktimeline-everywhere-src-6.9.0.tar.xz"; - sha256 = "0j76cb4db9kpcr5ascgljz3jy8jyhvnrjisk2ni1a5kk1gfjr7rk"; - name = "qtquicktimeline-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquicktimeline-everywhere-src-6.9.1.tar.xz"; + sha256 = "153ji60xg55m85zg0px5nq1wbpkn61xf0whkjghf8y41rbkxpgvq"; + name = "qtquicktimeline-everywhere-src-6.9.1.tar.xz"; }; }; qtremoteobjects = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtremoteobjects-everywhere-src-6.9.0.tar.xz"; - sha256 = "1pbhjwiygydafqd5hlcgda39dxppcmxzhn1zn0va9zbqzps14fpl"; - name = "qtremoteobjects-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtremoteobjects-everywhere-src-6.9.1.tar.xz"; + sha256 = "040a5s6sx5y0vpxjdmvici63yxr4rn9qisigpbjc4wlggfg0fgr7"; + name = "qtremoteobjects-everywhere-src-6.9.1.tar.xz"; }; }; qtscxml = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtscxml-everywhere-src-6.9.0.tar.xz"; - sha256 = "14k8kak4670z58wg72jx75g3cwbvf2fp897ag5npfk8j3hjbafx7"; - name = "qtscxml-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtscxml-everywhere-src-6.9.1.tar.xz"; + sha256 = "10274n4gslgh59sagyijllnskp204i16zm7bdpx58fmk4chdwcqc"; + name = "qtscxml-everywhere-src-6.9.1.tar.xz"; }; }; qtsensors = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtsensors-everywhere-src-6.9.0.tar.xz"; - sha256 = "0rz4d2rq65rdls6q976k6p5b064307kkvy52jw1x0s57yk0kfqd4"; - name = "qtsensors-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtsensors-everywhere-src-6.9.1.tar.xz"; + sha256 = "0v4w815698zgxhmk681ygfsjlbp1y4gqdmbb0pz2vm6gr8d16jzh"; + name = "qtsensors-everywhere-src-6.9.1.tar.xz"; }; }; qtserialbus = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtserialbus-everywhere-src-6.9.0.tar.xz"; - sha256 = "0gsrhm2s039ym6hr5sql7xsm46xmripxb8np4wn6w9gj24s0jihd"; - name = "qtserialbus-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtserialbus-everywhere-src-6.9.1.tar.xz"; + sha256 = "1mq4mghn19m7m0mkbn6llwiprabr4ym8rpd9ks05spsnhd2ww7j9"; + name = "qtserialbus-everywhere-src-6.9.1.tar.xz"; }; }; qtserialport = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtserialport-everywhere-src-6.9.0.tar.xz"; - sha256 = "0m5rhr07mq2ifysymskhnql4dw8cnll4jq2ipzxmhgkbrbsn5rzv"; - name = "qtserialport-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtserialport-everywhere-src-6.9.1.tar.xz"; + sha256 = "047z7vchc01rki445i7qh5mqy3xh0i6ww1l34s4swx0c719fv3w0"; + name = "qtserialport-everywhere-src-6.9.1.tar.xz"; }; }; qtshadertools = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtshadertools-everywhere-src-6.9.0.tar.xz"; - sha256 = "1fzlsr19c9indwmr56lbhd2f7vmxnlzsfv1z2qxy5pn338l40v4i"; - name = "qtshadertools-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtshadertools-everywhere-src-6.9.1.tar.xz"; + sha256 = "0x2b7dpkgdngpbv1g5qc6ffa4lwq4d8g3r3vdi5zp1q8rr6d47jf"; + name = "qtshadertools-everywhere-src-6.9.1.tar.xz"; }; }; qtspeech = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtspeech-everywhere-src-6.9.0.tar.xz"; - sha256 = "0wf971cqr6zvb6l2dax10l7kjl9qil8ssds4rsipfgblf66bd0d9"; - name = "qtspeech-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtspeech-everywhere-src-6.9.1.tar.xz"; + sha256 = "0a0lgjxkdfisczkaw7njs87a9qffigygn311chgqzvz2ragza1v8"; + name = "qtspeech-everywhere-src-6.9.1.tar.xz"; }; }; qtsvg = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtsvg-everywhere-src-6.9.0.tar.xz"; - sha256 = "1z0mj8avfab6wzha337cd1cjf3ax5w6112zmiaj5x4wm1j9rsdgc"; - name = "qtsvg-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtsvg-everywhere-src-6.9.1.tar.xz"; + sha256 = "1mdvk8y7dfi8ibv36ccvfbmnsvm2y6dm27l6v6pz47w9zpjmvz1d"; + name = "qtsvg-everywhere-src-6.9.1.tar.xz"; }; }; qttools = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qttools-everywhere-src-6.9.0.tar.xz"; - sha256 = "196955jjwrpjv43qdv6qx9yjfi1ajwjni4hs80i914rzrj4mar7s"; - name = "qttools-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qttools-everywhere-src-6.9.1.tar.xz"; + sha256 = "0k2b7z7g41pkq0bccvmwpalmn2ryhl0ccd4zv4zh9zfcyiiabi4h"; + name = "qttools-everywhere-src-6.9.1.tar.xz"; }; }; qttranslations = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qttranslations-everywhere-src-6.9.0.tar.xz"; - sha256 = "0gwccq2gd07iz1z9gpzwxfxr6fb8hdwh20r4dxavriy7bzpq2m8x"; - name = "qttranslations-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qttranslations-everywhere-src-6.9.1.tar.xz"; + sha256 = "0hd707fpsij9bzl143615a4ags6y0nkwdplzlzmwsizlanjs2qcp"; + name = "qttranslations-everywhere-src-6.9.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtvirtualkeyboard-everywhere-src-6.9.0.tar.xz"; - sha256 = "09wisql4nsvz01rzrjlri9k4a83q2mi2ckx7lqpc836mppzqjm5q"; - name = "qtvirtualkeyboard-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtvirtualkeyboard-everywhere-src-6.9.1.tar.xz"; + sha256 = "07r87pg50drrv2z3b6ldlrvz8261xmq6jfcja9wg0dmqplw9l1c0"; + name = "qtvirtualkeyboard-everywhere-src-6.9.1.tar.xz"; }; }; qtwayland = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwayland-everywhere-src-6.9.0.tar.xz"; - sha256 = "018qr4q32w0c99vnyh433q4nym1ybv24jshf2fyh7dadn3y1cd2h"; - name = "qtwayland-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwayland-everywhere-src-6.9.1.tar.xz"; + sha256 = "0gifjc4l85ilr1gb0p9dy2s2aypskjp8c7wskfqyp03id07fl8bx"; + name = "qtwayland-everywhere-src-6.9.1.tar.xz"; }; }; qtwebchannel = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwebchannel-everywhere-src-6.9.0.tar.xz"; - sha256 = "1vmzzb823apg67mr9za85i5jw86ipk38091kbyapsyp1vnf9ll8h"; - name = "qtwebchannel-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebchannel-everywhere-src-6.9.1.tar.xz"; + sha256 = "1h7rzjsim2rxdw25sks4yz8r03llr6q8kcc081n43z0a47ch3d0r"; + name = "qtwebchannel-everywhere-src-6.9.1.tar.xz"; }; }; qtwebengine = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwebengine-everywhere-src-6.9.0.tar.xz"; - sha256 = "17kqi6vh1gz3qkq9i6ywzx3bfnhhja7l8a5jkmr5ivc5bv4d2crb"; - name = "qtwebengine-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebengine-everywhere-src-6.9.1.tar.xz"; + sha256 = "0v62j4zzya6yf91630ii6y4m62md69zfs1r21xi6v3rl5gigszbq"; + name = "qtwebengine-everywhere-src-6.9.1.tar.xz"; }; }; qtwebsockets = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwebsockets-everywhere-src-6.9.0.tar.xz"; - sha256 = "0h29a77599653npki41hcgpmyya2mjfrvrnm92sf197kmiydsfkb"; - name = "qtwebsockets-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebsockets-everywhere-src-6.9.1.tar.xz"; + sha256 = "1xa8yx1v5xk1zn2wc4gssali0k2l0yn6w2ywxsccq0kz7f38rglq"; + name = "qtwebsockets-everywhere-src-6.9.1.tar.xz"; }; }; qtwebview = { - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwebview-everywhere-src-6.9.0.tar.xz"; - sha256 = "0szdsx10vhj1ivhnqviq8qv1ji1mzhzpz22svz2c64pbih70f92v"; - name = "qtwebview-everywhere-src-6.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebview-everywhere-src-6.9.1.tar.xz"; + sha256 = "19ar1pmf9q39mqvnjkfrxrblgl1vn65zigj194n098ppp3xx96n2"; + name = "qtwebview-everywhere-src-6.9.1.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index f82e61da1724..2814c9bc6da6 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.16.0"; + version = "6.17.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-0VRV/f/Murx/ikX/UOrGWlenkmrV8kAqwiUD8lGyObc="; + hash = "sha256-oPC4/JXqsCCX9DsUBeqYSvQeBGXYKBScaNSBCosugnY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index a4df4553d70a..aa4baa49b866 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { ( if stdenv.hostPlatform.isDarwin then - ../openssl/3.4/use-etc-ssl-certs-darwin.patch + ../openssl/3.5/use-etc-ssl-certs-darwin.patch else - ../openssl/3.4/use-etc-ssl-certs.patch + ../openssl/3.5/use-etc-ssl-certs.patch ) ]; diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index c7938b98368a..394e249abc7e 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -27,8 +27,10 @@ # At least one back-end has to be enabled, # and we can't default to CUDA since it's unfree rocmSupport ? !cudaSupport, + runCommand, static ? stdenv.hostPlatform.isStatic, stdenv, + writeShellApplication, }: let @@ -104,7 +106,7 @@ in assert (builtins.match "[^[:space:]]*" gpuTargetString) != null; -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "magma"; inherit version; @@ -241,6 +243,143 @@ stdenv.mkDerivation { passthru = { inherit cudaSupport rocmSupport gpuTargets; cudaPackages = effectiveCudaPackages; + testers = { + all = + let + magma = finalAttrs.finalPackage; + in + writeShellApplication { + derivationArgs = { + __structuredAttrs = true; + strictDeps = true; + }; + name = "magma-testers-all"; + text = '' + logWithDate() { + printf "%s: %s\n" "$(date --utc --iso-8601=seconds)" "$*" + } + + isIgnoredTest() { + case $1 in + # Skip the python scripts + *.py) return 0 ;; + + # These test require files, so we skip them + testing_?io) ;& + testing_?madd) ;& + testing_?matrix) ;& + testing_?matrixcapcup) ;& + testing_?matrixinfo) ;& + testing_?mcompressor) ;& + testing_?mconverter) ;& + testing_?preconditioner) ;& + testing_?solver) ;& + testing_?solver_rhs) ;& + testing_?solver_rhs_scaling) ;& + testing_?sort) ;& + testing_?spmm) ;& + testing_?spmv) ;& + testing_?spmv_check) ;& + testing_?sptrsv) ;& + testing_dsspmv_mixed) ;& + testing_zcspmv_mixed) + logWithDate "skipping $1 because it requires input" + return 0 + ;; + + # These test require outputing to files, so we skip them + testing_?print) + logWithDate "skipping $1 because it requires creating output" + return 0 + ;; + + # These test succeed but exit with a non-zero code + testing_[cdz]gglse) ;& + testing_sgemm_fp16) + logWithDate "skipping $1 because has a non-zero exit code" + return 0 + ;; + + # These test have memory freeing/allocation errors: + testing_?mdotc) + logWithDate "skipping $1 because it fails to allocate or free memory" + return 0 + ;; + + # Test is not ignored otherwise. + *) return 1 ;; + esac + } + + runTests() { + local -nr outputArray="$1" + local -i programExitCode=0 + local file + + # TODO: Collect and sort filenames prior to iterating so the order isn't dependent on the filesystem. + for file in "${magma.test}"/bin/*; do + if isIgnoredTest "$(basename "$file")"; then + continue + fi + + logWithDate "Starting $file" + + # Since errexit is set, we need to reset programExitCode every iteration and use an OR + # to set it only when the test fails (which should not fail, avoiding tripping errexit). + programExitCode=0 + + # A number of test cases require an input <=128, so we set the range to include [128, 1024]. + # Batch is kept small to keep tests fast. + "$file" --range 128:1024:896 --batch 32 || programExitCode=$? + + logWithDate "Finished $file with exit code $programExitCode" + + if ((programExitCode)); then + outputArray+=("$file") + fi + done + } + + main() { + local -a failedPrograms=() + runTests failedPrograms + + if ((''${#failedPrograms[@]})); then + logWithDate "The following programs had non-zero exit codes:" + for file in "''${failedPrograms[@]}"; do + # Using echo to avoid printing the date + echo "- $file" + done + logWithDate "Exiting with code 1 because at least one test failed." + exit 1 + fi + + logWithDate "All tests passed!" + exit 0 + } + + main + ''; + runtimeInputs = [ magma.test ]; + }; + }; + tests = { + all = + runCommand "magma-tests-all" + { + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ finalAttrs.passthru.testers.all ]; + requiredSystemFeatures = lib.optionals cudaSupport [ "cuda" ]; + } + '' + if magma-testers-all; then + touch "$out" + else + exit 1 + fi + ''; + }; }; meta = with lib; { @@ -260,4 +399,4 @@ stdenv.mkDerivation { || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null) || (rocmSupport && strings.versionOlder version "2.8.0"); }; -} +}) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 57d301d9c853..d41104dbf560 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -173,7 +173,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.29"; + version = "0.3.30"; outputs = [ "out" @@ -184,7 +184,7 @@ stdenv.mkDerivation rec { owner = "OpenMathLib"; repo = "OpenBLAS"; rev = "v${version}"; - hash = "sha256-n/3FGmZxnNiOEKYHSIuqX2LJS1BzYPCwLWT9DSwEoPI="; + hash = "sha256-foP2OXUL6ttgYvCxLsxUiVdkPoTvGiHomdNudbSUmSE="; }; postPatch = '' diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 8f3a49301c02..43cf8ec3f397 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.44"; + version = "1.45"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-PfEQfs+L/W7oeK7KXTt6/YEkikgDHhTK9q4B8U7rtQ4="; + hash = "sha256-TSsqnj4JnQF9yBB78cM00nu4fZ5K/xmgyNhW0XzUHvA="; }; postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 734d2600fea8..d71c0943f09e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2950,17 +2950,17 @@ final: prev: { }: buildLuarocksPackage { pname = "luarocks"; - version = "3.11.1-1"; + version = "3.12.0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-3.11.1-1.rockspec"; - sha256 = "0xg0siza8nlnnkaarmw73q12qx3frlfbysd5ipmxxi1d7yc38bbn"; + url = "mirror://luarocks/luarocks-3.12.0-1.rockspec"; + sha256 = "sha256-FaGp4yJkddh5EicGA5uKsD2UDR/XwOsKmxBPil67zs0="; }).outPath; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; - rev = "v3.11.1"; - hash = "sha256-GglygI8HP+aDFEuucOkjQ2Pgfv4+jW+og+2vL3KoZCQ="; + rev = "v3.12.0"; + hash = "sha256-PGK4gjEhCJt2+0viNU0/qJBBOxPIy2swXplQOolmP2E="; }; meta = { diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index db8acad7a77f..baae48d64427 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -51,6 +51,7 @@ tree-sitter, unbound, unzip, + versionCheckHook, vimPlugins, yajl, zip, @@ -587,10 +588,14 @@ in installShellFiles lua unzip + versionCheckHook ]; # cmake is just to compile packages with "cmake" buildType, not luarocks itself dontUseCmakeConfigure = true; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + propagatedBuildInputs = [ zip unzip @@ -961,7 +966,8 @@ in rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs (oa: { - doCheck = true; + # E5113: Error while calling lua chunk [...] pl.path requires LuaFileSystem + doCheck = luaOlder "5.2"; nativeCheckInputs = [ final.nlua final.busted diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix index d68add0058e4..dd3999f3f960 100644 --- a/pkgs/development/ocaml-modules/smtml/default.nix +++ b/pkgs/development/ocaml-modules/smtml/default.nix @@ -25,13 +25,13 @@ buildDunePackage rec { pname = "smtml"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "formalsec"; repo = "smtml"; tag = "v${version}"; - hash = "sha256-QxVORnu28mcs54ZEPMxI5Bch/+/gkIfn0bTqrnSKUOw="; + hash = "sha256-gmYyVUkwXBqGKGhp6Pqdf2PJafUJ1hF96WxOLq1h2f8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 8a86295dc45c..d27972dff455 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -7,30 +7,63 @@ DBI, IOSocketSSL, TermReadKey, + go, + buildGoModule, + git, }: -buildPerlPackage rec { - pname = "Percona-Toolkit"; - version = "3.2.0"; +let + version = "3.7.0"; src = fetchFromGitHub { owner = "percona"; repo = "percona-toolkit"; rev = "v${version}"; - sha256 = "084ldpskvlfm32lfss5qqzm5y9b8hf029aa4i5pcnzgb53xaxkqx"; + sha256 = "sha256-fJGeL9XZHTFmpns5CE7It35HRnF3JiC6muOpOS1zboI="; + + # needed for build script + leaveDotGit = true; }; + goDeps = + (buildGoModule { + pname = "Percona-Toolkit go-bindings"; + inherit src version; + + vendorHash = "sha256-HAaoVYK6av085zSG0ZRpbmUgEA2UEt7CGWF/834e+z4="; + }).goModules; +in +buildPerlPackage { + pname = "Percona-Toolkit"; + + inherit src version; + outputs = [ "out" ]; - nativeBuildInputs = [ shortenPerlShebang ]; + nativeBuildInputs = [ + git + shortenPerlShebang + ]; buildInputs = [ DBDmysql + go DBI IOSocketSSL TermReadKey ]; + postPatch = '' + cp -r --reflink=auto ${goDeps} vendor + chmod -R u+rw vendor + substituteInPlace src/go/Makefile \ + --replace-fail "go get ./..." "echo 'Skipping go get due to offline build'" + ''; + + preBuild = '' + export HOME=$TMPDIR + ''; + postInstall = '' shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*) ''; diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index 1fae36dfcb77..399149b839f1 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -100,7 +100,9 @@ buildPerlPackage rec { # https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11 # # Disabling tests on Darwin until https://github.com/NixOS/nixpkgs/issues/236560 is resolved. - doCheck = (!stdenv.hostPlatform.isMusl) && (!stdenv.hostPlatform.isDarwin); + # + # Disabling tests on linux (gettext-0.25): https://github.com/mquinson/po4a/issues/580 + doCheck = false; checkPhase = '' export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index f240a0348246..52fa0e4b74b7 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -9,16 +9,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "castor"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; tag = "v${finalAttrs.version}"; - hash = "sha256-qHCW/VHHMk8+/RL2HEW+RyaZaq7MsxB9RePwmgYHpDI="; + hash = "sha256-Aktr7mU2KP8Io6H0qXii1sVYkgb8wArYIgJ+OFb+/ao="; }; - vendorHash = "sha256-DJ8iHhkLfe1GNf7eJHeE8ORt9cyRFLr0gLGeHENiASw="; + vendorHash = "sha256-CAsDHwv+oLoiLJ4pUdVvq4w8wD0QsIfYG/AIXASETqI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/php-packages/meminfo/default.nix b/pkgs/development/php-packages/meminfo/default.nix index d7cca10ba328..bee2be6fd614 100644 --- a/pkgs/development/php-packages/meminfo/default.nix +++ b/pkgs/development/php-packages/meminfo/default.nix @@ -2,10 +2,11 @@ buildPecl, lib, fetchFromGitHub, + nix-update-script, }: buildPecl rec { - version = "unstable-2022-03-25"; + version = "1.1.1-unstable-2022-03-25"; pname = "meminfo"; src = fetchFromGitHub { @@ -17,6 +18,8 @@ buildPecl rec { sourceRoot = "${src.name}/extension"; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "PHP extension to get insight about memory usage"; homepage = "https://github.com/BitOne/php-meminfo"; diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index 7b9e73b538de..b56996b944f7 100644 --- a/pkgs/development/php-packages/spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.4.18"; + version = "0.4.20"; in buildPecl { inherit version; @@ -16,15 +16,13 @@ buildPecl { owner = "NoiseByNorthwest"; repo = "php-spx"; rev = "v${version}"; - hash = "sha256-Dcv8ncYPIug7e24mvL1gn0x0CeLNAck8djm/r/yiPe8="; + hash = "sha256-2MOl9waWY3zK5NzQ19TJKK8kE7xC4K+e9AwV+wyAHZc="; }; - configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; - - preConfigure = '' - substituteInPlace Makefile.frag \ - --replace '$(INSTALL_ROOT)$(prefix)/share/misc/php-spx/assets/web-ui' '${placeholder "out"}/share/misc/php-spx/assets/web-ui' - ''; + configureFlags = [ + "--with-zlib-dir=${zlib.dev}" + "--with-spx-assets-dir=${placeholder "out"}/share/misc/php-spx/assets/" + ]; meta = { changelog = "https://github.com/NoiseByNorthwest/php-spx/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 1617126bd6b9..5a706ff6952b 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { preCheck = lib.optionalString config.cudaSupport '' export TRITON_PTXAS_PATH="${lib.getExe' cudatoolkit "ptxas"}" ''; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = [ # try to download data: diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 368bb2cc2f85..136939fdb57b 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -11,12 +11,13 @@ buildPythonPackage rec { pname = "acme-tiny"; - version = "5.0.1"; + version = "5.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "378549808eece574c3b5dcea82b216534949423d5c7ac241d9419212d676bc8d"; + pname = "acme_tiny"; + inherit version; + hash = "sha256-s84ZVYPcLxOnxvqQBS+Ks0myMtvCZ62cv0co6u2E3dg="; }; patchPhase = '' @@ -35,14 +36,12 @@ buildPythonPackage rec { fuse ]; - doCheck = false; # seems to hang, not sure - pythonImportsCheck = [ "acme_tiny" ]; - meta = with lib; { + meta = { description = "Tiny script to issue and renew TLS certs from Let's Encrypt"; mainProgram = "acme-tiny"; homepage = "https://github.com/diafygi/acme-tiny"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index b813310b808e..845830ca652a 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "src/actdiag/tests/" ]; + enabledTestPaths = [ "src/actdiag/tests/" ]; disabledTests = [ # AttributeError: 'TestRstDirectives' object has no attribute 'assertRegexpMatches' diff --git a/pkgs/development/python-modules/aeidon/default.nix b/pkgs/development/python-modules/aeidon/default.nix index 99b321358264..170dfeb63c7f 100644 --- a/pkgs/development/python-modules/aeidon/default.nix +++ b/pkgs/development/python-modules/aeidon/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "aeidon/test" ]; + enabledTestPaths = [ "aeidon/test" ]; disabledTests = [ # requires gspell to work with gobject introspection diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index fbc2cffabb3d..d58391180025 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "async_tests.py" ]; + enabledTestPaths = [ "async_tests.py" ]; pythonImportsCheck = [ "afsapi" ]; diff --git a/pkgs/development/python-modules/ahocorapy/default.nix b/pkgs/development/python-modules/ahocorapy/default.nix index cd4f90e8ae5c..c22228234e46 100644 --- a/pkgs/development/python-modules/ahocorapy/default.nix +++ b/pkgs/development/python-modules/ahocorapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/ahocorapy_test.py" ]; diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix index db244468ca8c..806880082f24 100644 --- a/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { "test_get_build" ]; - pytestFlagsArray = [ "--snapshot-update" ]; + pytestFlags = [ "--snapshot-update" ]; pythonImportsCheck = [ "aioazuredevops" ]; diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index acb227e901a7..a0199d94a916 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiodns"; - version = "3.4.0"; + version = "3.5.0"; pyproject = true; src = fetchFromGitHub { owner = "saghul"; repo = "aiodns"; tag = "v${version}"; - hash = "sha256-y3QuMj2y/V6orM+1+cbUCgj0UL8sXQVzLLYXLnBdlio="; + hash = "sha256-qabXwvJzZ4bq0R2Wkb0terZgjnRRt0/ymLcJkxChR6s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix index ca8b267c2f0f..af761db4b26f 100644 --- a/pkgs/development/python-modules/aioelectricitymaps/default.nix +++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioelectricitymaps" ]; # https://github.com/jpbede/aioelectricitymaps/pull/415 - pytestFlagsArray = [ "--snapshot-update" ]; + pytestFlags = [ "--snapshot-update" ]; meta = with lib; { description = "Module for interacting with Electricity maps"; diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 8d948ef3f24f..414f6b1ba250 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 57af49298227..b1994904e104 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -38,9 +38,8 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; pythonImportsCheck = [ "aiohttp_jinja2" ]; diff --git a/pkgs/development/python-modules/aiohttp-retry/default.nix b/pkgs/development/python-modules/aiohttp-retry/default.nix index a94e4d8b4646..faea017d26fd 100644 --- a/pkgs/development/python-modules/aiohttp-retry/default.nix +++ b/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiohttp_retry" ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; meta = with lib; { description = "Retry client for aiohttp"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 1bde94676217..4bff55257c2b 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -50,14 +50,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.12.10"; + version = "3.12.13"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-ciZGOOfVXYoLzYNIkota3MXMRMxlztf+mFFo0y9r+Lk="; + hash = "sha256-/lzbGnF3+ufs+GPtm+avjQ+lGVCsiE2E64NkRHS3wCM="; }; patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [ @@ -130,6 +130,8 @@ buildPythonPackage rec { "test_client_session_timeout_zero" "test_mark_formdata_as_processed" "test_requote_redirect_url_default" + "test_tcp_connector_ssl_shutdown_timeout_nonzero_passed" + "test_tcp_connector_ssl_shutdown_timeout_zero_not_passed" # don't run benchmarks "test_import_time" # racy diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix index d74e9554bf39..25385430e2bb 100644 --- a/pkgs/development/python-modules/aiokef/default.nix +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pytest-cov-stub ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; pythonImportsCheck = [ "aiokef" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix index ac27948df982..dd953a8281f9 100644 --- a/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "aiomultiprocess/tests/*.py" ]; + enabledTestPaths = [ "aiomultiprocess/tests/*.py" ]; disabledTests = [ # tests are flaky and make the whole test suite time out diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index 6c9e50a7dd6e..a5107912b36d 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # Tests are not pick-up automatically by the hook - pytestFlagsArray = [ "aiosqlite/tests/*.py" ]; + enabledTestPaths = [ "aiosqlite/tests/*.py" ]; pythonImportsCheck = [ "aiosqlite" ]; diff --git a/pkgs/development/python-modules/aiosyncthing/default.nix b/pkgs/development/python-modules/aiosyncthing/default.nix index 08e1599f4597..6385bac8e10d 100644 --- a/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/pkgs/development/python-modules/aiosyncthing/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pytest-mock ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; pythonImportsCheck = [ "aiosyncthing" ]; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index df0c84a343f3..2e1daa78e576 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { trustme ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; pythonImportsCheck = [ "aiounifi" ]; diff --git a/pkgs/development/python-modules/aiowaqi/default.nix b/pkgs/development/python-modules/aiowaqi/default.nix index 5a1c0488996a..fbdf613c443c 100644 --- a/pkgs/development/python-modules/aiowaqi/default.nix +++ b/pkgs/development/python-modules/aiowaqi/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "test_search" ]; - pytestFlagsArray = [ "--snapshot-update" ]; + pytestFlags = [ "--snapshot-update" ]; meta = with lib; { description = "Module to interact with the WAQI API"; diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index 527072eb4824..a728f0a61b20 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiowithings" ]; - pytestFlagsArray = [ "--snapshot-update" ]; + pytestFlags = [ "--snapshot-update" ]; disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 7c9d147d03ea..6977ece2f648 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "ale-py"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; tag = "v${version}"; - hash = "sha256-VrPc3i1VYuThKdQn/wimNzMHNmPIAdTxbh2tuJb4YJY="; + hash = "sha256-4IkjW8HX21uBEHFtb3qETxco6FfDMgLbG1BDHWwvn58="; }; build-system = [ diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index a04da6074231..fb4c667edb7f 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -55,7 +55,7 @@ buildPythonPackage { pytestCheckHook ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; disabledTests = lib.optionals (pythonAtLeast "3.12") [ # stuck in epoll diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix index ffb1c0ef7859..4711b2bf2030 100644 --- a/pkgs/development/python-modules/ancp-bids/default.nix +++ b/pkgs/development/python-modules/ancp-bids/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ancpbids" ]; - pytestFlagsArray = [ "tests/auto" ]; + enabledTestPaths = [ "tests/auto" ]; disabledTests = [ "test_fetch_dataset" ]; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 7349d4f5d705..26a930fbda84 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { ]; # If it won't be verbose, you'll see nothing going on for a long time. - pytestFlagsArray = [ "--verbose" ]; + pytestFlags = [ "--verbose" ]; preFixup = lib.optionalString withGui '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index 6982aa47b297..908db6726f5d 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest-cov-stub ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "anonip" ]; diff --git a/pkgs/development/python-modules/ansi2image/default.nix b/pkgs/development/python-modules/ansi2image/default.nix index a772c77cddd7..4778737719f5 100644 --- a/pkgs/development/python-modules/ansi2image/default.nix +++ b/pkgs/development/python-modules/ansi2image/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ansi2image" ]; - pytestFlagsArray = [ "tests/tests.py" ]; + enabledTestPaths = [ "tests/tests.py" ]; meta = with lib; { description = "Module to convert ANSI text to an image"; diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 64e2337a54c6..01fa791b7ec4 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -88,9 +88,8 @@ buildPythonPackage rec { "tests/lib/test_bedrock.py" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; meta = { diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index d8a5ffd3cc30..16a7e81bcc81 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { requests-mock ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/" ]; diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 234f016346ad..3d0a52f95a14 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test_apipkg.py" ]; + enabledTestPaths = [ "test_apipkg.py" ]; pythonImportsCheck = [ "apipkg" ]; diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index ed617ed04164..2a8365960e73 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ariadne" ]; - pytestFlagsArray = [ "--snapshot-update" ]; + pytestFlags = [ "--snapshot-update" ]; disabledTests = [ # TypeError: TestClient.request() got an unexpected keyword argument 'content' diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix index 33a1ef06597a..5386c2305c51 100644 --- a/pkgs/development/python-modules/asn1/default.nix +++ b/pkgs/development/python-modules/asn1/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/test_asn1.py" ]; + enabledTestPaths = [ "tests/test_asn1.py" ]; pythonImportsCheck = [ "asn1" ]; diff --git a/pkgs/development/python-modules/aspectlib/default.nix b/pkgs/development/python-modules/aspectlib/default.nix index 752484f21374..8e18c25dc560 100644 --- a/pkgs/development/python-modules/aspectlib/default.nix +++ b/pkgs/development/python-modules/aspectlib/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tornado ]; - pytestFlagsArray = [ "-W ignore::DeprecationWarning" ]; + pytestFlags = [ "-Wignore::DeprecationWarning" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/aspell-python/default.nix b/pkgs/development/python-modules/aspell-python/default.nix index 3f66a9a2bf5d..6a814931a6af 100644 --- a/pkgs/development/python-modules/aspell-python/default.nix +++ b/pkgs/development/python-modules/aspell-python/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - pytestFlagsArray = [ "test/unittests.py" ]; + enabledTestPaths = [ "test/unittests.py" ]; disabledTests = lib.optionals (pythonAtLeast "3.10") [ # https://github.com/WojciechMula/aspell-python/issues/22 diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index e398e7c34c2f..6cebb395c8c2 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ]; # avoid import mismatch errors, as conftest.py is copied to build dir - pytestFlagsArray = [ "extension_helpers" ]; + enabledTestPaths = [ "extension_helpers" ]; disabledTests = [ # https://github.com/astropy/extension-helpers/issues/43 diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index c620aacc6bc2..f7d90bbedd97 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -145,7 +145,7 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/255262 cd "$out" ''; - pytestFlagsArray = [ + pytestFlags = [ "--hypothesis-profile=ci" ]; postCheck = '' diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 94ee306cd74e..ff82ba44b9e3 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -62,10 +62,9 @@ buildPythonPackage rec { pytest-rerunfailures ]; - pytestFlagsArray = [ + pytestFlags = [ # DeprecationWarning: 'cgi' is deprecated and slated for removal in Python 3.13 - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; # Tests must be run in the build directory. The tests create files diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index c5e40061f262..a6064cada31e 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -32,9 +32,8 @@ buildPythonPackage rec { trio ]; - pytestFlagsArray = [ - "-W" - "ignore::trio.TrioDeprecationWarning" + pytestFlags = [ + "-Wignore::trio.TrioDeprecationWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 3bd4d0cd51a6..5855175d28b8 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "asyncinotify" ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; meta = with lib; { badPlatforms = [ diff --git a/pkgs/development/python-modules/attacut/default.nix b/pkgs/development/python-modules/attacut/default.nix index 51f92e0abeec..2d00cfbb046f 100644 --- a/pkgs/development/python-modules/attacut/default.nix +++ b/pkgs/development/python-modules/attacut/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/*" ]; + enabledTestPaths = [ "tests/*" ]; pythonImportsCheck = [ "attacut" ]; diff --git a/pkgs/development/python-modules/autopxd2/default.nix b/pkgs/development/python-modules/autopxd2/default.nix index 4b9717679247..c66fde78483d 100644 --- a/pkgs/development/python-modules/autopxd2/default.nix +++ b/pkgs/development/python-modules/autopxd2/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "test/" ]; diff --git a/pkgs/development/python-modules/aw-client/default.nix b/pkgs/development/python-modules/aw-client/default.nix index e0fa37d3e20a..7dd50076eb47 100644 --- a/pkgs/development/python-modules/aw-client/default.nix +++ b/pkgs/development/python-modules/aw-client/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { # Only run this test, the others are integration tests that require # an instance of aw-server running in order to function. - pytestFlagsArray = [ "tests/test_requestqueue.py" ]; + enabledTestPaths = [ "tests/test_requestqueue.py" ]; preCheck = '' # Fake home folder for tests that write to $HOME diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 25f935b01284..260bf04247f7 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "awswrangler" ]; - pytestFlagsArray = [ + enabledTestPaths = [ # Subset of tests that run in upstream CI (many others require credentials) # https://github.com/aws/aws-sdk-pandas/blob/20fec775515e9e256e8cee5aee12966516608840/.github/workflows/minimal-tests.yml#L36-L43 "tests/unit/test_metadata.py" diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix index 817a17a89da9..f62750d89b6b 100644 --- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix +++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/ayla_iot_unofficial.py" ]; + enabledTestPaths = [ "tests/ayla_iot_unofficial.py" ]; # tests interact with the actual API doCheck = false; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index ffc7a6cfe0b3..273c58f0e720 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { export PYTHONPATH=tests/testserver_tests/coretestserver:$PYTHONPATH ''; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; # disable tests which touch network disabledTests = [ diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix index 9a04da723e4a..954056ba86db 100644 --- a/pkgs/development/python-modules/bagit/default.nix +++ b/pkgs/development/python-modules/bagit/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { mock pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; pythonImportsCheck = [ "bagit" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix index 33909a6c942a..68749f608e1d 100644 --- a/pkgs/development/python-modules/base36/default.nix +++ b/pkgs/development/python-modules/base36/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test_base36.py" ]; + enabledTestPaths = [ "test_base36.py" ]; pythonImportsCheck = [ "base36" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix index bfd6fa30bf87..d1687fd5f277 100644 --- a/pkgs/development/python-modules/beautifultable/default.nix +++ b/pkgs/development/python-modules/beautifultable/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; pythonImportsCheck = [ "beautifultable" ]; diff --git a/pkgs/development/python-modules/binary2strings/default.nix b/pkgs/development/python-modules/binary2strings/default.nix index 72e20079cb1e..44aca3c3871b 100644 --- a/pkgs/development/python-modules/binary2strings/default.nix +++ b/pkgs/development/python-modules/binary2strings/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "binary2strings" ]; - pytestFlagsArray = [ "tests/test.py" ]; + enabledTestPaths = [ "tests/test.py" ]; meta = with lib; { description = "Module to extract Ascii, Utf8, and Unicode strings from binary data"; diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix index 54355d076662..e4944cceaeae 100644 --- a/pkgs/development/python-modules/bindep/default.nix +++ b/pkgs/development/python-modules/bindep/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { export PATH=$PATH:$out/bin ''; - pytestFlagsArray = [ "-s" ]; + pytestFlags = [ "-s" ]; pythonImportsCheck = [ "bindep" ]; diff --git a/pkgs/development/python-modules/biom-format/default.nix b/pkgs/development/python-modules/biom-format/default.nix index e03df35b926b..ddb2f169e264 100644 --- a/pkgs/development/python-modules/biom-format/default.nix +++ b/pkgs/development/python-modules/biom-format/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "biom_tests/tests" ]; + enabledTestPaths = [ "biom_tests/tests" ]; pythonImportsCheck = [ "biom" ]; diff --git a/pkgs/development/python-modules/biothings-client/default.nix b/pkgs/development/python-modules/biothings-client/default.nix index 261114ed46a7..884a9e458d73 100644 --- a/pkgs/development/python-modules/biothings-client/default.nix +++ b/pkgs/development/python-modules/biothings-client/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pytest-asyncio ]; - pytestFlagsArray = [ + enabledTestPaths = [ # All other tests make network requests to exercise the API "tests/test_async.py::test_generate_async_settings" "tests/test_async.py::test_url_protocol" diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index 75a0713efcaf..d510271cbae9 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + pytestFlags = [ "--benchmark-disable" ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 37c8e876fa62..3bc806517864 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -73,9 +73,8 @@ buildPythonPackage rec { parameterized ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; preCheck = diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 7228669a13f9..e982cfcd9c23 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -49,10 +49,9 @@ buildPythonPackage rec { pytest-xdist ]; - pytestFlagsArray = [ + pytestFlags = [ # DeprecationWarning: JAXopt is no longer maintained - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 5458d033969f..23d94d26b388 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "src/blockdiag/tests/" ]; + enabledTestPaths = [ "src/blockdiag/tests/" ]; disabledTests = [ # Test require network access diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index a91b3c70c6d8..a59e9bd08520 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; pythonImportsCheck = [ "bluetooth_data_tools" ]; diff --git a/pkgs/development/python-modules/bqplot/default.nix b/pkgs/development/python-modules/bqplot/default.nix index cd8495a818e6..09e8ba7da7a0 100644 --- a/pkgs/development/python-modules/bqplot/default.nix +++ b/pkgs/development/python-modules/bqplot/default.nix @@ -15,14 +15,12 @@ buildPythonPackage rec { pname = "bqplot"; - version = "0.12.43"; - - format = "pyproject"; - disabled = pythonOlder "3.6"; + version = "0.12.45"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8rRp0fA99PUYc8sEBqJLVs30qDX8WqlWB3b8Y2uLNEk="; + hash = "sha256-7eAOn999kuQ8wtG5aRx9oXa2IW/dGHyOkvGde+rKXio="; }; # upstream seems in flux for 0.13 release. they seem to want to migrate from @@ -33,12 +31,12 @@ buildPythonPackage rec { --replace "jupyterlab~=" "jupyterlab>=" ''; - nativeBuildInputs = [ + build-system = [ jupyter-packaging jupyterlab ]; - propagatedBuildInputs = [ + dependencies = [ bqscales ipywidgets numpy diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 854f1451c0b1..8d77e6a9953c 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "braintree" ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/" "tests/fixtures" "tests/unit" diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 36c2818a185b..ea4b5c43a455 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "python/tests" ]; + enabledTestPaths = [ "python/tests" ]; meta = with lib; { homepage = "https://github.com/google/brotli"; diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix index 7b010502d39b..a581f738be4b 100644 --- a/pkgs/development/python-modules/brotlicffi/default.nix +++ b/pkgs/development/python-modules/brotlicffi/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { # Test data is only available from libbrotli git checkout, not brotli.src doCheck = false; - pytestFlagsArray = [ "test/" ]; + enabledTestPaths = [ "test/" ]; pythonImportsCheck = [ "brotlicffi" ]; diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index 30eb1ec3eefe..e068e0655bf9 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { "test_readdata3" ]; - pytestFlagsArray = [ + pytestFlags = [ "--snapshot-warn-unused" ]; diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index ec12662ecc45..15b3a5965482 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -70,9 +70,8 @@ buildPythonPackage rec { wheel ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 30b61ffbd815..7d9063449cd0 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -55,7 +55,7 @@ buildPythonPackage { versionCheckProgram = "${placeholder "out"}/bin/bw"; versionCheckProgramArg = "--version"; - pytestFlags = [ + enabledTestPaths = [ # only unit tests as integration tests need a OpenSSH client/server setup "tests/unit" ]; diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index e3971469736f..509f6b18256f 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "cairosvg/test_api.py" ]; + enabledTestPaths = [ "cairosvg/test_api.py" ]; pythonImportsCheck = [ "cairosvg" ]; diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix index e76027a49b43..4a5aa5bff041 100644 --- a/pkgs/development/python-modules/cart/default.nix +++ b/pkgs/development/python-modules/cart/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "unittests" ]; + enabledTestPaths = [ "unittests" ]; pythonImportsCheck = [ "cart" ]; diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 20923a4ea908..05e62f21254f 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { unset NIX_REDIRECTS LD_PRELOAD ''; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTestPaths = [ # requires puresasl diff --git a/pkgs/development/python-modules/celery-singleton/default.nix b/pkgs/development/python-modules/celery-singleton/default.nix index 3d75770e932a..b4ad4d7301cb 100644 --- a/pkgs/development/python-modules/celery-singleton/default.nix +++ b/pkgs/development/python-modules/celery-singleton/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pytest-cov-stub ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; # Tests require a running Redis backend disabledTests = [ diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index 257ed1daa9a6..f1872a0abbe6 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -27,12 +27,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "-p no:cacheprovider" + pytestFlags = [ + "-pno:cacheprovider" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/certbot-dns-google/default.nix b/pkgs/development/python-modules/certbot-dns-google/default.nix index ed1d24e44ba4..d3a19d066350 100644 --- a/pkgs/development/python-modules/certbot-dns-google/default.nix +++ b/pkgs/development/python-modules/certbot-dns-google/default.nix @@ -26,8 +26,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "-p no:cacheprovider" + pytestFlags = [ + "-pno:cacheprovider" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/certbot-dns-ovh/default.nix b/pkgs/development/python-modules/certbot-dns-ovh/default.nix index 5c71ebee3d78..82132011ddb9 100644 --- a/pkgs/development/python-modules/certbot-dns-ovh/default.nix +++ b/pkgs/development/python-modules/certbot-dns-ovh/default.nix @@ -27,12 +27,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "-p no:cacheprovider" + pytestFlags = [ + "-pno:cacheprovider" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index c870636194d2..a3f483eff601 100644 --- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -24,12 +24,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "-p no:cacheprovider" + pytestFlags = [ + "-pno:cacheprovider" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix index a8e3f476350c..bf05e23a8dc6 100644 --- a/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -27,12 +27,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "-p no:cacheprovider" + pytestFlags = [ + "-pno:cacheprovider" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 70ad22558a2f..08cb1c05d5e5 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -61,10 +61,9 @@ buildPythonPackage rec { pytest-xdist ]; - pytestFlagsArray = [ - "-p no:cacheprovider" - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-pno:cacheprovider" + "-Wignore::DeprecationWarning" ]; makeWrapperArgs = [ "--prefix PATH : ${dialog}/bin" ]; diff --git a/pkgs/development/python-modules/changefinder/default.nix b/pkgs/development/python-modules/changefinder/default.nix index a02cf6979f8b..70c446cba3b0 100644 --- a/pkgs/development/python-modules/changefinder/default.nix +++ b/pkgs/development/python-modules/changefinder/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + enabledTestPaths = [ "test/test.py" ]; pythonImportsCheck = [ "changefinder" ]; diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 123e472ea7b1..c822d07d3318 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -41,7 +41,7 @@ buildPythonPackage { ''; # most tests talk to a network service, so only run ones that don't do that. - pytestFlagsArray = [ + enabledTestPaths = [ "chart_studio/tests/test_core" ]; diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index 23cd39a4464a..2f7c6473fc94 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "checkdmarc" ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index fbef13be43ad..240cbc60a50f 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -66,9 +66,8 @@ buildPythonPackage rec { export CI=true ''; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; disabledTests = diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix index c5e4440f991a..5d57f4f1918e 100644 --- a/pkgs/development/python-modules/chess/default.nix +++ b/pkgs/development/python-modules/chess/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; meta = with lib; { description = "Chess library with move generation, move validation, and support for common formats"; diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index af829cbb5c1a..04a3ea2cf783 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -181,13 +181,11 @@ buildPythonPackage rec { SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}"; }; - pytestFlagsArray = [ + pytestFlags = [ "-x" # these are slow tests, so stop on the first failure "-v" - "-W" - "ignore:DeprecationWarning" - "-W" - "ignore:PytestCollectionWarning" + "-Wignore:DeprecationWarning" + "-Wignore:PytestCollectionWarning" ]; preCheck = '' diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix index c2ed43d02196..2ee7f02383e6 100644 --- a/pkgs/development/python-modules/ciso8601/default.nix +++ b/pkgs/development/python-modules/ciso8601/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytz ]; - pytestFlagsArray = [ "tests/tests.py" ]; + enabledTestPaths = [ "tests/tests.py" ]; pythonImportsCheck = [ "ciso8601" ]; diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index f6ce335fa83e..cc475db3a165 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { ''; # their ci only runs unit tests, there are also integration and fuzzing tests - pytestFlagsArray = [ "./tests/test_unit" ]; + enabledTestPaths = [ "./tests/test_unit" ]; disabledTestPaths = [ # ModuleNotFoundError: No module named 'wilderness' diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix index 4935b3733db5..582b46afa4e2 100644 --- a/pkgs/development/python-modules/click-command-tree/default.nix +++ b/pkgs/development/python-modules/click-command-tree/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "click_command_tree" ]; diff --git a/pkgs/development/python-modules/cmigemo/default.nix b/pkgs/development/python-modules/cmigemo/default.nix index 9237631c0532..86d0bc64231e 100644 --- a/pkgs/development/python-modules/cmigemo/default.nix +++ b/pkgs/development/python-modules/cmigemo/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test/" ]; + enabledTestPaths = [ "test/" ]; pythonImportsCheck = [ "cmigemo" ]; diff --git a/pkgs/development/python-modules/cobble/default.nix b/pkgs/development/python-modules/cobble/default.nix index efdbee174342..8423a9f5e525 100644 --- a/pkgs/development/python-modules/cobble/default.nix +++ b/pkgs/development/python-modules/cobble/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; disabledTests = [ # Broken tests diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 543d796a7fc1..b263839ee848 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; # Currently most tests have performance issues - pytestFlagsArray = [ "coconut/tests/constants_test.py" ]; + enabledTestPaths = [ "coconut/tests/constants_test.py" ]; pythonImportsCheck = [ "coconut" ]; diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix index de2006bacb2d..7635affe7b8b 100644 --- a/pkgs/development/python-modules/colour/default.nix +++ b/pkgs/development/python-modules/colour/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "--doctest-glob=\"*.rst\"" + pytestFlags = [ + "--doctest-glob=*.rst" "--doctest-modules" ]; diff --git a/pkgs/development/python-modules/compressed-rtf/default.nix b/pkgs/development/python-modules/compressed-rtf/default.nix index acfdd2dae763..d02f62372d37 100644 --- a/pkgs/development/python-modules/compressed-rtf/default.nix +++ b/pkgs/development/python-modules/compressed-rtf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { pythonImportsCheck = [ "compressed_rtf" ]; - pytestFlagsArray = [ "tests/tests.py" ]; + enabledTestPaths = [ "tests/tests.py" ]; meta = with lib; { description = "Compressed Rich Text Format (RTF) compression and decompression"; diff --git a/pkgs/development/python-modules/conda-package-streaming/default.nix b/pkgs/development/python-modules/conda-package-streaming/default.nix index 6649fe770a07..d0fed91251b7 100644 --- a/pkgs/development/python-modules/conda-package-streaming/default.nix +++ b/pkgs/development/python-modules/conda-package-streaming/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "conda-package-streaming"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "conda"; repo = "conda-package-streaming"; tag = "v${version}"; - hash = "sha256-Y0moewJROhybbyo263akbO20Q6As245ULKJikkWU4XE="; + hash = "sha256-BfvD+64c9uxBvEJnAuI4MaF0CqS9Gwnqx1Xi+l36Dwo="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/connect-box/default.nix b/pkgs/development/python-modules/connect-box/default.nix index be300f03c182..f0a52e39b249 100644 --- a/pkgs/development/python-modules/connect-box/default.nix +++ b/pkgs/development/python-modules/connect-box/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "connect_box" ]; - pytestFlagsArray = [ "--vcr-record=none" ]; + pytestFlags = [ "--vcr-record=none" ]; meta = with lib; { description = "Interact with a Compal CH7465LG cable modem/router"; diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix index b7ecf05e72d0..2bf66255fd27 100644 --- a/pkgs/development/python-modules/cons/default.nix +++ b/pkgs/development/python-modules/cons/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pytest-html ]; - pytestFlagsArray = [ + pytestFlags = [ "--html=testing-report.html" "--self-contained-html" ]; diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix index adf447600e10..a8b77d88c2d2 100644 --- a/pkgs/development/python-modules/consonance/default.nix +++ b/pkgs/development/python-modules/consonance/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/test_handshakes_offline.py" ]; + enabledTestPaths = [ "tests/test_handshakes_offline.py" ]; pythonImportsCheck = [ "consonance" ]; diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix index 8b06307031f8..8a955a192973 100644 --- a/pkgs/development/python-modules/coredis/default.nix +++ b/pkgs/development/python-modules/coredis/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "coredis" ]; - pytestFlagsArray = [ + enabledTestPaths = [ # All other tests require Docker "tests/test_lru_cache.py" "tests/test_parsers.py" diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index a07d626512b5..d845d0d6dd91 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "craft_application" ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index d99d7efe4e98..4c4242cca658 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix index 99c6d6bfa0de..d7c8423d0905 100644 --- a/pkgs/development/python-modules/craft-cli/default.nix +++ b/pkgs/development/python-modules/craft-cli/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index a531db631783..a9b5a352eacc 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyyaml ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; # Temp fix for test incompatibility with Python 3.13 disabledTests = [ diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 845d4e92252d..02ee801fded9 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTests = [ # Relies upon paths not present in Nix (like /bin/bash) diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix index fd70c823ce64..ea4add87b5b9 100644 --- a/pkgs/development/python-modules/craft-platforms/default.nix +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "craft_platforms" ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTests = [ # Attempts to get distro information, and expects "ubuntu-ish" diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 8cabe09de715..785f5a0dcdcc 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTestPaths = [ # Relies upon "logassert" python package which isn't in nixpkgs diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix index 37f3fb2c5d1d..24e6fa81100d 100644 --- a/pkgs/development/python-modules/craft-store/default.nix +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { pyyaml ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 055ac3a4eac5..d6e5eeb96195 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cryptography"; - version = "45.0.2"; # Also update the hash in vectors.nix + version = "45.0.4"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "pyca"; repo = "cryptography"; tag = version; - hash = "sha256-SjlzEyX30b3LbEH5NOhCJvds9KuguTTdF2A0kbIysA4="; + hash = "sha256-rKgMUVj5IdeWIdLWQ4E6zhC6dwJMi+BRHCh2JG73Zgc="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -69,7 +69,7 @@ buildPythonPackage rec { pytest-xdist ] ++ optional-dependencies.ssh; - pytestFlagsArray = [ "--disable-pytest-warnings" ]; + pytestFlags = [ "--disable-pytest-warnings" ]; disabledTestPaths = [ # save compute time by not running benchmarks diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index d10d417d3f5b..73e4f2c75f70 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-U+PmRHxCmYVM+Rlb3Bn3sEZg3II/0upEaDBcIsrsGac="; + hash = "sha256-+7BAjfj/LSs9vSkovFt/7r/dNvsJL6h5DVd4qbmh+e8="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index 5290c347ce89..f9ae2daca9a8 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -56,11 +56,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "cryptolyzer" ]; - meta = with lib; { + meta = { description = "Cryptographic protocol analyzer"; homepage = "https://gitlab.com/coroner/cryptolyzer"; changelog = "https://gitlab.com/coroner/cryptolyzer/-/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ kranzes ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ kranzes ]; + teams = with lib.teams; [ ngi ]; }; } diff --git a/pkgs/development/python-modules/curated-tokenizers/default.nix b/pkgs/development/python-modules/curated-tokenizers/default.nix index 2b206e00d600..598b0fa5b5d7 100644 --- a/pkgs/development/python-modules/curated-tokenizers/default.nix +++ b/pkgs/development/python-modules/curated-tokenizers/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { # Explicitly set the path to avoid running vendored # sentencepiece tests. - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; preCheck = '' # avoid local paths, relative imports wont resolve correctly diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index a4324d13d1bb..aea8d568d7b7 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { export LDFLAGS="-lgomp" ''; - pytestFlagsArray = [ "cvxpy" ]; + enabledTestPaths = [ "cvxpy" ]; disabledTests = [ # Disable the slowest benchmarking tests, cuts test time in half diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index a4664cb718aa..d66f6c981571 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH} ''; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; disabledTests = [ # These tests require network access diff --git a/pkgs/development/python-modules/cypherpunkpay/default.nix b/pkgs/development/python-modules/cypherpunkpay/default.nix index 1a19caa734c4..f9eee1ec1e5b 100644 --- a/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -77,9 +77,8 @@ buildPythonPackage rec { webtest ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/daltonlens/default.nix b/pkgs/development/python-modules/daltonlens/default.nix index 5410f4d2ab2e..c27c69f3f8da 100644 --- a/pkgs/development/python-modules/daltonlens/default.nix +++ b/pkgs/development/python-modules/daltonlens/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/" ]; diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 17f5c0f6472b..9d4689b5f147 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; pythonImportsCheck = [ "databricks" ]; diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index 07961a2e2075..56c44a1e5e27 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "datafusion" ]; - pytestFlagsArray = [ + pytestFlags = [ "--pyargs" pname ]; diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index 9b4e21b0d205..a5ff31b2ea62 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -230,10 +230,9 @@ buildPythonPackage rec { httpretty ]; - pytestFlagsArray = [ + pytestFlags = [ # Deprecated in 3.13. Use exc_type_str instead. - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; pythonImportsCheck = [ "datalad" ]; diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 5c5938de82b2..374caec8582a 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"; # test suite is very cpu intensive, only run small subset to ensure package is working as expected - pytestFlagsArray = [ "tests/test-sets.py" ]; + enabledTestPaths = [ "tests/test-sets.py" ]; disabledTests = [ # skip tests which are irrelevant to our installation or use way too much memory diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 87f08f29a55f..35e82d613d7d 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { ''; # Upstream only runs the tests in tests/ in CI, others use git clone - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = [ # access network diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index 311c22b7e478..e74bf9d319aa 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; pythonImportsCheck = [ "dbt.adapters.bigquery" ]; diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index ef9cf7aed30c..91b9d9b30b1c 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; pythonImportsCheck = [ "dbt.adapters.redshift" ]; diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index dca1e20eb930..170f85e94f2c 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; pythonImportsCheck = [ "dbt.adapters.snowflake" ]; diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index 6f7246ae9397..914b3828e7a4 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/test.py " ]; + enabledTestPaths = [ "tests/test.py " ]; meta = with lib; { changelog = "https://github.com/micheles/decorator/blob/${src.tag}/CHANGES.md"; diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix index 0b2b6bde553d..1d45fe591624 100644 --- a/pkgs/development/python-modules/deploykit/default.nix +++ b/pkgs/development/python-modules/deploykit/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_ssh" ]; # don't swallow stdout/stderr - pytestFlagsArray = [ "-s" ]; + pytestFlags = [ "-s" ]; pythonImportsCheck = [ "deploykit" ]; diff --git a/pkgs/development/python-modules/detectron2/default.nix b/pkgs/development/python-modules/detectron2/default.nix index 67b5414ca40f..e49545abbc4f 100644 --- a/pkgs/development/python-modules/detectron2/default.nix +++ b/pkgs/development/python-modules/detectron2/default.nix @@ -129,7 +129,7 @@ buildPythonPackage { rm -r detectron2 ''; - pytestFlagsArray = [ + enabledTestPaths = [ # prevent include $sourceRoot/projects/*/tests "tests" ]; diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index db078ceace15..d430a0311301 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -133,7 +133,7 @@ buildPythonPackage rec { cat ${conftestSkipNetworkErrors} >> tests/conftest.py ''; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/discovery30303/default.nix b/pkgs/development/python-modules/discovery30303/default.nix index bf498e5dcc20..958db4e7573d 100644 --- a/pkgs/development/python-modules/discovery30303/default.nix +++ b/pkgs/development/python-modules/discovery30303/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; pythonImportsCheck = [ "discovery30303" ]; diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 7cabff4b15e1..dffa779db8b7 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -11,6 +11,8 @@ responses, setuptools, unittest-xml-reporting, + pytestCheckHook, + pytest-django, }: buildPythonPackage rec { @@ -32,6 +34,13 @@ buildPythonPackage rec { url = "https://github.com/iMerica/dj-rest-auth/commit/cc5587e4e3f327697709f3f0d491650bff5464e7.diff"; hash = "sha256-2LahibxuNECAfjqsbNs2ezaWt1VH0ZBNwSNWCZwIe8I="; }) + # Add compatibility with django-allauth v65.4 + # See https://github.com/iMerica/dj-rest-auth/pull/681 + (fetchpatch { + name = "django-allauth_65.4_compatibility.patch"; + url = "https://github.com/iMerica/dj-rest-auth/commit/59b8cab7e2f4e3f2fdc11ab3b027a32cad45deef.patch"; + hash = "sha256-CH85vB3EOQvFxx+ZP2LYI4LEvaZ+ccLdXZGuAvEfStc="; + }) ]; postPatch = '' @@ -55,25 +64,36 @@ buildPythonPackage rec { unittest-xml-reporting ] ++ optional-dependencies.with_social; + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + env.DJANGO_SETTINGS_MODULE = "dj_rest_auth.tests.settings"; + preCheck = '' - # Test connects to graph.facebook.com - substituteInPlace dj_rest_auth/tests/test_serializers.py \ - --replace-fail "def test_http_error" "def dont_test_http_error" + # Make tests module available for the checkPhase + export PYTHONPATH=$out/${python.sitePackages}/dj_rest_auth:$PYTHONPATH ''; - checkPhase = '' - runHook preCheck - ${python.interpreter} runtests.py - runHook postCheck - ''; + disabledTests = [ + # Test connects to graph.facebook.com + "TestSocialLoginSerializer" + ]; + + disabledTestPaths = [ + # Test fails with > django-allauth 65.4 + # See: https://github.com/iMerica/dj-rest-auth/pull/681#issuecomment-3034953311 + "dj_rest_auth/tests/test_social.py" + ]; pythonImportsCheck = [ "dj_rest_auth" ]; - meta = with lib; { + meta = { description = "Authentication for Django Rest Framework"; homepage = "https://github.com/iMerica/dj-rest-auth"; changelog = "https://github.com/iMerica/dj-rest-auth/releases/tag/${version}"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onny ]; }; } diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 0938fa8a70a2..7de34b9ca763 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchFromGitea, pythonOlder, python, @@ -40,16 +40,17 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "65.7.0"; + version = "65.9.0"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "pennersr"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "allauth"; repo = "django-allauth"; tag = version; - hash = "sha256-1HmEJ5E4Vp/CoyzUegqQXpzKUuz3dLx2EEv7dk8fq8w="; + hash = "sha256-gusA9TnsgSSnWBPwHsNYeESD9nX5DWh4HqMgcsoJRw0="; }; nativeBuildInputs = [ gettext ]; @@ -101,10 +102,10 @@ buildPythonPackage rec { passthru.tests = { inherit dj-rest-auth; }; meta = { - changelog = "https://github.com/pennersr/django-allauth/blob/${version}/ChangeLog.rst"; description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication"; - downloadPage = "https://github.com/pennersr/django-allauth"; - homepage = "https://www.intenct.nl/projects/django-allauth"; + changelog = "https://codeberg.org/allauth/django-allauth/src/tag/${version}/ChangeLog.rst"; + downloadPage = "https://codeberg.org/allauth/django-allauth"; + homepage = "https://allauth.org"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ derdennisop ]; }; diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index df171f75d234..39e57deac515 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -14,7 +14,7 @@ jinja2, before-after, pythonOlder, - nettools, + net-tools, pkgs, setuptools, }: @@ -52,7 +52,7 @@ buildPythonPackage rec { dill jinja2 before-after - nettools + net-tools pkgs.valkey redisTestHook ]; diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index 24289add7fce..19c27bc950ec 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "django-filingcabinet"; - version = "0.17-unstable-2025-04-10"; + version = "0.17-unstable-2025-07-01"; pyproject = true; src = fetchFromGitHub { @@ -45,8 +45,8 @@ buildPythonPackage rec { repo = "django-filingcabinet"; # No release tagged yet on GitHub # https://github.com/okfde/django-filingcabinet/issues/69 - rev = "64b7b4ad804067e2f16e8a0f165c139e3ffe5fb5"; - hash = "sha256-48Peui/5N/GfzWS1EJ5uKeKEoPjX+fPEXzG2owxsDaE="; + rev = "ff39722209acf70bc73fa7074c16ed8a787fceea"; + hash = "sha256-9SrMWBTk7RQCbVPHOU5rB/pi286hb6UONaLmBOtx6X0="; }; postPatch = '' @@ -94,7 +94,8 @@ buildPythonPackage rec { pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-uMO2iEOi9ACYdIM8Thf7+y1KpHQEqVxO3yxZ8RaGFXA="; + hash = "sha256-kvLV/pCX/wQHG0ttrjSro7/CoQ5K1T0aFChafQOwvNw="; + fetcherVersion = 1; }; postBuild = '' diff --git a/pkgs/development/python-modules/django-hierarkey/default.nix b/pkgs/development/python-modules/django-hierarkey/default.nix index c802318fe3cf..9eff82130b88 100644 --- a/pkgs/development/python-modules/django-hierarkey/default.nix +++ b/pkgs/development/python-modules/django-hierarkey/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; meta = with lib; { description = "Flexible and powerful hierarchical key-value store for your Django models"; diff --git a/pkgs/development/python-modules/django-lasuite/default.nix b/pkgs/development/python-modules/django-lasuite/default.nix index ec0f593ef088..67fbefc9fda6 100644 --- a/pkgs/development/python-modules/django-lasuite/default.nix +++ b/pkgs/development/python-modules/django-lasuite/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-lasuite"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "django-lasuite"; tag = "v${version}"; - hash = "sha256-vUtWBR9uRc99jTe0Gg7k4EZZAkqHct5+GCOHp1mTIkA="; + hash = "sha256-2rSPGioyG/2VeyBPfsNU4TL2jvlLjRQpxQSl1AHLL10="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix index fe1c247ca603..5651335e8c2f 100644 --- a/pkgs/development/python-modules/django-mfa3/default.nix +++ b/pkgs/development/python-modules/django-mfa3/default.nix @@ -5,21 +5,21 @@ django, setuptools, pyotp, - fido2, + fido2_2, qrcode, python, }: buildPythonPackage rec { pname = "django-mfa3"; - version = "0.15.1"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "xi"; repo = "django-mfa3"; tag = version; - hash = "sha256-HcurgGSzPnKVRpL9NVq0vkCmYDvj/HoWYVbnIrK5pSI="; + hash = "sha256-bgIzrSM8KP6uQHvn393NWYw9DODdHLMqKn6pgw3EG/w="; }; build-system = [ setuptools ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { dependencies = [ django pyotp - fido2 + fido2_2 qrcode ]; diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix index bac8bab32a75..dbcdff2dd04d 100644 --- a/pkgs/development/python-modules/django-otp/default.nix +++ b/pkgs/development/python-modules/django-otp/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { runHook postCheck ''; - pytestFlagsArray = [ "src/django_otp/test.py" ]; + enabledTestPaths = [ "src/django_otp/test.py" ]; pythonImportsCheck = [ "django_otp" ]; diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index e85f28807750..5ef1907e22f1 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -67,6 +67,11 @@ buildPythonPackage rec { # https://github.com/jazzband/django-redis/issues/777 dontUsePytestXdist = true; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + disabledTests = [ # AttributeError: object has no attribute 'default' "test_delete_pattern_with_settings_default_scan_count" diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix index b8883b92b9d9..506e88f4e5aa 100644 --- a/pkgs/development/python-modules/dns-lexicon/default.nix +++ b/pkgs/development/python-modules/dns-lexicon/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { pytest-vcr ] ++ optional-dependencies.full; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; disabledTestPaths = [ # Needs network access diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 063b4a295a27..7cde853819bd 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix index 3e4569f3035a..eb19da5fb5ee 100644 --- a/pkgs/development/python-modules/dodgy/default.nix +++ b/pkgs/development/python-modules/dodgy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/test_checks.py" ]; + enabledTestPaths = [ "tests/test_checks.py" ]; meta = { description = "Looks at Python code to search for things which look \"dodgy\" such as passwords or diffs"; diff --git a/pkgs/development/python-modules/dohq-artifactory/default.nix b/pkgs/development/python-modules/dohq-artifactory/default.nix index 4b09ed199fb8..835ac7409f86 100644 --- a/pkgs/development/python-modules/dohq-artifactory/default.nix +++ b/pkgs/development/python-modules/dohq-artifactory/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { responses ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix index dcac1f08ae5a..a6480528db34 100644 --- a/pkgs/development/python-modules/dotmap/default.nix +++ b/pkgs/development/python-modules/dotmap/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "dotmap/test.py" ]; + enabledTestPaths = [ "dotmap/test.py" ]; pythonImportsCheck = [ "dotmap" ]; diff --git a/pkgs/development/python-modules/dsinternals/default.nix b/pkgs/development/python-modules/dsinternals/default.nix index ef827f13ba15..d63321136055 100644 --- a/pkgs/development/python-modules/dsinternals/default.nix +++ b/pkgs/development/python-modules/dsinternals/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dsinternals" ]; - pytestFlagsArray = [ "tests/*.py" ]; + enabledTestPaths = [ "tests/*.py" ]; meta = with lib; { description = "Module to interact with Windows Active Directory"; diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index 6c74c41c6f56..2f432a5b456e 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { scipy pytest-xdist ]; - pytestFlagsArray = [ "python/test" ]; + enabledTestPaths = [ "python/test" ]; pythonImportsCheck = [ "ducc0" ]; postInstall = '' diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index b01f6d56daf4..9611ee1efd26 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = [ # AssertionError: 'C:\\\\foo.bar\\\\baz' != 'C:\\foo.bar\\baz' diff --git a/pkgs/development/python-modules/durationpy/default.nix b/pkgs/development/python-modules/durationpy/default.nix index 79f9bf439a79..81437e51bced 100644 --- a/pkgs/development/python-modules/durationpy/default.nix +++ b/pkgs/development/python-modules/durationpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; pythonImportsCheck = [ "durationpy" ]; diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index 351e1ac1bb25..c826f181d41e 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; pythonImportsCheck = [ "dynalite_devices_lib" ]; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 796daf64dc20..de76fbc3825a 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.23.3"; + version = "0.23.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; tag = "v${version}"; - hash = "sha256-fWt9epsc77YCQiB5BeuCHUZ2Or8ddgMDSZPHC4f3yZ8="; + hash = "sha256-7wjNOwrTXhieUI7Etn6AdiNedoPKSIADtC7dc4Bdlxc="; }; build-system = [ diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix index 394d3cd16331..fe29e2841651 100644 --- a/pkgs/development/python-modules/elastic-transport/default.nix +++ b/pkgs/development/python-modules/elastic-transport/default.nix @@ -58,9 +58,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "elastic_transport" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 10fc95fbb13b..54b595349a35 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "envs/tests.py" ]; + enabledTestPaths = [ "envs/tests.py" ]; disabledTests = [ "test_list_envs" ]; diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index 355a4e27aee4..987cfbd7d0ce 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "eradicate" ]; - pytestFlagsArray = [ "test_eradicate.py" ]; + enabledTestPaths = [ "test_eradicate.py" ]; meta = with lib; { description = "Library to remove commented-out code from Python files"; diff --git a/pkgs/development/python-modules/esprima/default.nix b/pkgs/development/python-modules/esprima/default.nix index 8969ec792282..fde0d9260063 100644 --- a/pkgs/development/python-modules/esprima/default.nix +++ b/pkgs/development/python-modules/esprima/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test/__main__.py::TestEsprima" ]; + enabledTestPaths = [ "test/__main__.py::TestEsprima" ]; pythonImportsCheck = [ "esprima" ]; diff --git a/pkgs/development/python-modules/ethtool/default.nix b/pkgs/development/python-modules/ethtool/default.nix index e7f87548ea05..d4b522b12b7c 100644 --- a/pkgs/development/python-modules/ethtool/default.nix +++ b/pkgs/development/python-modules/ethtool/default.nix @@ -6,7 +6,7 @@ setuptools, pkg-config, libnl, - nettools, + net-tools, pytestCheckHook, }: @@ -32,7 +32,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tests/parse_ifconfig.py \ - --replace-fail "Popen('ifconfig'," "Popen('${lib.getExe' nettools "ifconfig"}'," + --replace-fail "Popen('ifconfig'," "Popen('${lib.getExe' net-tools "ifconfig"}'," ''; build-system = [ setuptools ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ethtool" ]; nativeCheckInputs = [ - nettools + net-tools pytestCheckHook ]; diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix index e9dba494ac73..855e42fa6e86 100644 --- a/pkgs/development/python-modules/etuples/default.nix +++ b/pkgs/development/python-modules/etuples/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pytest-html ]; - pytestFlagsArray = [ + pytestFlags = [ "--html=testing-report.html" "--self-contained-html" ]; diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix index 2c8f52541f2c..e2eafe01a308 100644 --- a/pkgs/development/python-modules/events/default.nix +++ b/pkgs/development/python-modules/events/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "events" ]; - pytestFlagsArray = [ "events/tests/tests.py" ]; + enabledTestPaths = [ "events/tests/tests.py" ]; meta = with lib; { description = "Bringing the elegance of C# EventHanlder to Python"; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 5c67eb044464..550bf4399df4 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "test_stdouterrin_setnull" ]; - pytestFlagsArray = [ "-vvv" ]; + pytestFlags = [ "-vvv" ]; pythonImportsCheck = [ "execnet" ]; diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix index 47db2c6620e0..1202333dd8a4 100644 --- a/pkgs/development/python-modules/extension-helpers/default.nix +++ b/pkgs/development/python-modules/extension-helpers/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "extension_helpers" ]; - pytestFlagsArray = [ "extension_helpers/tests" ]; + enabledTestPaths = [ "extension_helpers/tests" ]; disabledTests = [ # Test require network access diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix index 6d935b617774..a1df518bdd9f 100644 --- a/pkgs/development/python-modules/extract-msg/default.nix +++ b/pkgs/development/python-modules/extract-msg/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "extract_msg" ]; - pytestFlagsArray = [ "extract_msg_tests/*.py" ]; + enabledTestPaths = [ "extract_msg_tests/*.py" ]; meta = with lib; { description = "Extracts emails and attachments saved in Microsoft Outlook's .msg files"; diff --git a/pkgs/development/python-modules/fabric/default.nix b/pkgs/development/python-modules/fabric/default.nix index 173a596f0c89..fbf4528d5d39 100644 --- a/pkgs/development/python-modules/fabric/default.nix +++ b/pkgs/development/python-modules/fabric/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/*.py" ]; + enabledTestPaths = [ "tests/*.py" ]; pythonImportsCheck = [ "fabric" ]; diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix index c5e6bcd22f20..5db576e5e9f0 100644 --- a/pkgs/development/python-modules/fairseq/default.nix +++ b/pkgs/development/python-modules/fairseq/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { cd tests ''; - pytestFlagsArray = [ "--import-mode append" ]; + pytestFlags = [ "--import-mode=append" ]; disabledTests = [ # this test requires xformers diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 46c72637192c..8064c11cc8f5 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { ujson ] ++ lib.optionals (pythonOlder "3.10") [ testtools ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix index e35246f15b13..c894dd3222d0 100644 --- a/pkgs/development/python-modules/fast-histogram/default.nix +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; + enabledTestPaths = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; pythonImportsCheck = [ "fast_histogram" ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index e99f4d0d5f48..93f3d9823fc3 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -116,11 +116,11 @@ buildPythonPackage rec { ++ passlib.optional-dependencies.bcrypt ++ optional-dependencies.all; - pytestFlagsArray = [ + pytestFlags = [ # ignoring deprecation warnings to avoid test failure from # tests/test_tutorial/test_testing/test_tutorial001.py - "-W ignore::DeprecationWarning" - "-W ignore::pytest.PytestUnraisableExceptionWarning" + "-Wignore::DeprecationWarning" + "-Wignore::pytest.PytestUnraisableExceptionWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index 4b906c6d6c1d..6d4bca13fc24 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest-benchmark ]; - pytestFlagsArray = [ "--benchmark-skip" ]; + pytestFlags = [ "--benchmark-skip" ]; pythonImportsCheck = [ "fastdiff" ]; diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 3a3cc351da94..730fa02b7204 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "fasteners" ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; meta = with lib; { description = "Module that provides useful locks"; diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix index 142d3a76355c..05fa830c1421 100644 --- a/pkgs/development/python-modules/fastnumbers/default.nix +++ b/pkgs/development/python-modules/fastnumbers/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--hypothesis-profile=standard" ]; + pytestFlags = [ "--hypothesis-profile=standard" ]; pythonImportsCheck = [ "fastnumbers" ]; diff --git a/pkgs/development/python-modules/fedora-messaging/default.nix b/pkgs/development/python-modules/fedora-messaging/default.nix index 5801d8ab38d3..6e2af5d98c43 100644 --- a/pkgs/development/python-modules/fedora-messaging/default.nix +++ b/pkgs/development/python-modules/fedora-messaging/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; meta = { description = "Library for sending AMQP messages with JSON schema in Fedora infrastructure"; diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index f68572125198..626a3ff82d99 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { "test_quit_gracefully" ]; - pytestFlagsArray = [ "test/test.py" ]; + enabledTestPaths = [ "test/test.py" ]; pythonImportsCheck = [ "ffmpeg_progress_yield" ]; diff --git a/pkgs/development/python-modules/fido2/2.nix b/pkgs/development/python-modules/fido2/2.nix new file mode 100644 index 000000000000..a9f8a826e43e --- /dev/null +++ b/pkgs/development/python-modules/fido2/2.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + cryptography, + fetchPypi, + poetry-core, + pyscard, + pythonOlder, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "fido2"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-MGHNBec7Og72r8O4A9V8gmqi1qlzLRar1ydzYfWOeWQ="; + }; + + build-system = [ poetry-core ]; + + pythonRelaxDeps = [ "cryptography" ]; + + dependencies = [ cryptography ]; + + optional-dependencies = { + pcsc = [ pyscard ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + unittestFlagsArray = [ "-v" ]; + + # Disable tests which require physical device + pytestFlagsArray = [ "--no-device" ]; + + pythonImportsCheck = [ "fido2" ]; + + meta = { + description = "Provides library functionality for FIDO 2.0, including communication with a device over USB"; + homepage = "https://github.com/Yubico/python-fido2"; + changelog = "https://github.com/Yubico/python-fido2/releases/tag/${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/filedate/default.nix b/pkgs/development/python-modules/filedate/default.nix index 5317169caa68..450b056fba0b 100644 --- a/pkgs/development/python-modules/filedate/default.nix +++ b/pkgs/development/python-modules/filedate/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit.py" ]; + enabledTestPaths = [ "tests/unit.py" ]; disabledTests = [ "test_created" ]; diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index 97fdf1ffce11..344e3c735659 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { env.PACKAGE_NAME = "pytorch"; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = lib.optionals (pythonOlder "3.12") [ # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: diff --git a/pkgs/development/python-modules/flake8-deprecated/default.nix b/pkgs/development/python-modules/flake8-deprecated/default.nix index df28a68cc467..e7601e6190bf 100644 --- a/pkgs/development/python-modules/flake8-deprecated/default.nix +++ b/pkgs/development/python-modules/flake8-deprecated/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "run_tests.py" ]; + enabledTestPaths = [ "run_tests.py" ]; pythonImportsCheck = [ "flake8_deprecated" ]; diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix index 1e88a0280cc8..0f3e20073876 100644 --- a/pkgs/development/python-modules/flake8-length/default.nix +++ b/pkgs/development/python-modules/flake8-length/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "flake8_length" ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; meta = with lib; { description = "Flake8 plugin for a smart line length validation"; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index a8e7dc005d79..40160357f658 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "flake8"; - version = "7.2.0"; + version = "7.3.0"; pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; repo = "flake8"; tag = version; - hash = "sha256-TrzGGbMY4+jvy1RvNi02HziCnknfOef+eUekppgK5ck="; + hash = "sha256-dZFIGyjqkd+MRz9NoOEcMuR9ZshFb/h+zO2OJZsQajc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 13aa66bb0111..f4207bf700c8 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -43,9 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "flask_marshmallow" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; meta = { diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index c57767df0f59..78d383baa84c 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "flask_paginate" ]; - pytestFlagsArray = [ "tests/tests.py" ]; + enabledTestPaths = [ "tests/tests.py" ]; meta = with lib; { description = "Pagination support for Flask"; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix index e812fa5b23d4..f85610d84f9e 100644 --- a/pkgs/development/python-modules/flask-principal/default.nix +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test_principal.py" ]; + enabledTestPaths = [ "test_principal.py" ]; meta = with lib; { homepage = "http://packages.python.org/Flask-Principal/"; diff --git a/pkgs/development/python-modules/flask-sock/default.nix b/pkgs/development/python-modules/flask-sock/default.nix index bb5f82925cfb..6270e17762c8 100644 --- a/pkgs/development/python-modules/flask-sock/default.nix +++ b/pkgs/development/python-modules/flask-sock/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { simple-websocket ]; - pytestFlagsArray = [ "tests/test_flask_sock.py" ]; + enabledTestPaths = [ "tests/test_flask_sock.py" ]; pythonImportsCheck = [ "flask_sock" ]; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index d9ee85ea9d5b..e1f2d3f66017 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { redis ]; - pytestFlagsArray = [ "test_socketio.py" ]; + enabledTestPaths = [ "test_socketio.py" ]; pythonImportsCheck = [ "flask_socketio" ]; diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 8fe842c2b6a0..bfbe41f1860c 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -45,10 +45,9 @@ buildPythonPackage rec { "test_explicit_table" ]; - pytestFlagsArray = lib.optionals (pythonAtLeast "3.12") [ + pytestFlags = lib.optionals (pythonAtLeast "3.12") [ # datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; pythonImportsCheck = [ "flask_sqlalchemy" ]; diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 36ef3c86a329..7fd0cf4ccaec 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { # disable code coverage checks for all OS. Upstream does not enforce these # checks on Darwin, and code coverage cannot be improved downstream nor is it # relevant to the user. - pytestFlagsArray = [ "--no-cov" ]; + pytestFlags = [ "--no-cov" ]; pythonImportsCheck = [ "flufl.lock" ]; diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix index 0d4f9cac7f12..af8a0db8a00a 100644 --- a/pkgs/development/python-modules/fpyutils/default.nix +++ b/pkgs/development/python-modules/fpyutils/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "fpyutils/tests/*.py" ]; + enabledTestPaths = [ "fpyutils/tests/*.py" ]; disabledTests = [ # Don't run test which requires bash diff --git a/pkgs/development/python-modules/freesasa/default.nix b/pkgs/development/python-modules/freesasa/default.nix index e2d6355abb13..2eec87c97372 100644 --- a/pkgs/development/python-modules/freesasa/default.nix +++ b/pkgs/development/python-modules/freesasa/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; meta = { description = "FreeSASA Python Module"; diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index b61b51976e1a..9d136aa97c10 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -1,38 +1,40 @@ { lib, buildPythonPackage, - fetchPypi, - pythonAtLeast, - flake8, + fetchFromGitHub, orderedmultidict, pytestCheckHook, + setuptools, six, }: buildPythonPackage rec { pname = "furl"; version = "2.1.4"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-h3ZXUBJmySkmlzn7X1mAU0pBq9a7q8s2fBNtHTsqYBU="; + src = fetchFromGitHub { + owner = "gruns"; + repo = "furl"; + tag = "v${version}"; + hash = "sha256-NRkOJlluZjscM4ZhxHoXIzV2A0+mrkaw7rcxfklGCHs="; }; # With python 3.11.4, invalid IPv6 address does throw ValueError # https://github.com/gruns/furl/issues/164#issuecomment-1595637359 postPatch = '' substituteInPlace tests/test_furl.py \ - --replace '[0:0:0:0:0:0:0:1:1:1:1:1:1:1:1:9999999999999]' '[2001:db8::9999]' + --replace-fail '[0:0:0:0:0:0:0:1:1:1:1:1:1:1:1:9999999999999]' '[2001:db8::9999]' ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ orderedmultidict six ]; nativeCheckInputs = [ - flake8 pytestCheckHook ]; @@ -44,10 +46,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "furl" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/gruns/furl/releases/tag/${src.tag}"; description = "Python library that makes parsing and manipulating URLs easy"; homepage = "https://github.com/gruns/furl"; - license = licenses.unlicense; - maintainers = with maintainers; [ vanzef ]; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ vanzef ]; }; } diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix index 75c6d6e7c1f1..c81ec0c160a6 100644 --- a/pkgs/development/python-modules/fyta-cli/default.nix +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "fyta_cli" ]; - pytestFlagsArray = [ "--snapshot-update" ]; + pytestFlags = [ "--snapshot-update" ]; meta = with lib; { description = "Module to access the FYTA API"; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index c13babd7e4d9..d2dd45791885 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { # Test setup takes several minutes doCheck = false; - pytestFlagsArray = [ "gensim/test" ]; + enabledTestPaths = [ "gensim/test" ]; meta = with lib; { description = "Topic-modelling library"; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 605b7f67b1dc..01c3a58f6fb4 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -5,7 +5,6 @@ fetchPypi, h11, maxminddb, - mocket, pytestCheckHook, pythonAtLeast, pythonOlder, @@ -43,7 +42,6 @@ buildPythonPackage rec { nativeCheckInputs = [ h11 - mocket requests-mock pytestCheckHook pytest-httpserver diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 9db72576f3d2..8733bb2c8df6 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -94,7 +94,7 @@ buildPythonPackage rec { "test_read_file_url" ]; - pytestFlagsArray = [ "geopandas" ]; + enabledTestPaths = [ "geopandas" ]; pythonImportsCheck = [ "geopandas" ]; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 775044f95eef..b9cf371ab744 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ "test/test_init.py" ]; - pytestFlagsArray = [ "--skip-tests-requiring-internet" ]; + pytestFlags = [ "--skip-tests-requiring-internet" ]; pythonImportsCheck = [ "geopy" ]; diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index d3a615957f55..cdcfe2a80f1f 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "2.3.3"; + version = "2.3.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { tag = version; # TODO: unvendor llhttp fetchSubmodules = true; - hash = "sha256-0ltTmF09EKs+55Mitfe5vxPjmCtnhla6q6SAvhyIQPk="; + hash = "sha256-X85co03fMG7OSpkL02n3ektRNzu7oHChtwZzkspsSTk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ghome-foyer-api/default.nix b/pkgs/development/python-modules/ghome-foyer-api/default.nix index 34dbac9c9b0b..8f33c29ef461 100644 --- a/pkgs/development/python-modules/ghome-foyer-api/default.nix +++ b/pkgs/development/python-modules/ghome-foyer-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ghome-foyer-api"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; src = fetchFromGitHub { owner = "KapJI"; repo = "ghome-foyer-api"; tag = "v${version}"; - hash = "sha256-Y8TfQ0cvmKyLw0UOoLbkXk2vSj+Qb11fCVfNrC1iYao="; + hash = "sha256-hIprnkfAUbKoAp++sxu+T7MuGqLKOM1N1hqGBDOSo3k="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index b6fac6b3c0f9..1ef0ab2a8064 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "glean-core/python/tests" ]; + enabledTestPaths = [ "glean-core/python/tests" ]; disabledTests = [ # RuntimeError: No ping received. diff --git a/pkgs/development/python-modules/glocaltokens/default.nix b/pkgs/development/python-modules/glocaltokens/default.nix index 03d919fe5d1d..42f0d66968a1 100644 --- a/pkgs/development/python-modules/glocaltokens/default.nix +++ b/pkgs/development/python-modules/glocaltokens/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "glocaltokens"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; src = fetchFromGitHub { owner = "leikoilja"; repo = "glocaltokens"; tag = "v${version}"; - hash = "sha256-lUPx4HtR9n9hFwKljtCg3CYP7hl88TOLWmQ2XZL+ejY="; + hash = "sha256-anIiYNUVHHzv21yV7Y3S+lIst3iWEwgQZD9Ymx86tbk="; }; build-system = [ diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 3cc2be55271e..42068d644a01 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -86,6 +86,7 @@ buildPythonPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-h3ulPik0Uf8X687Se3J7h3+8jYzwXtbO6obsO27zyfA="; + fetcherVersion = 1; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index d60db2dc4269..572c8e0791b5 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; pythonImportsCheck = [ "granian" ]; diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index 68e03c415e06..76689c5c555f 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pytest-mock ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; pythonImportsCheck = [ "graphene" ]; diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix index a3326c4ee798..606bf11bb936 100644 --- a/pkgs/development/python-modules/graphrag/default.nix +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTests = [ # touch the network diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index 47adf6c231dc..c0aaca146664 100644 --- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -36,9 +36,8 @@ buildPythonPackage rec { "google.iam.v1" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 76b272270b61..1b23f39166b4 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.72.0"; + version = "1.73.1"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-Pcst8cuckF99qvCLzsIU/QgoCaWa3xQFtm1E9W7w+tE="; + hash = "sha256-5IxURNtQXZ5CzspDmcy5kmvOtBGJqJVhQKlNL5VTi+k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index 7d9abbff5db8..0f21392ca7ad 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -11,13 +11,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.72.0"; + version = "1.73.1"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-ciD1a8uq8IBELr7tSO5eHx0z/IT3rJuRJGiSJKtmzdw="; + hash = "sha256-NSdTcT7euj8j6oozIMV1K+4YYALZR1plT1+BX/TgY0U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 211acdcc9a2a..4f2551757836 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.72.0"; + version = "1.73.1"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-dcS8msz4RYxjXr/UCDF7+2E2hCThIZZCogMyrfVXDf8="; + hash = "sha256-LWpCAmTjHoPoERTdJYa1zQWmxomwHdXiEh2R8rThZ/I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 3ad8cf3ed953..2952084a783c 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; - version = "1.72.0"; + version = "1.73.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-a2fJfb4rBmhVfX5EODTR40b1J5mdVaSRu33bJBysIcs="; + hash = "sha256-ko9JzPlojbXyDNnkXEV4odAczKKa6qvwZvKsdqqIZmg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index cb9167c3ee60..cd5854c7b166 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.72.0"; + version = "1.73.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-eWNd0WOrIrJfov70vHzLOm2oDox6hOOyzDynLp2xf0Y="; + hash = "sha256-H7olzlrspjILsQShvdFoMvv2igiL9QUQm9AmHTCBeI4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 4a1ff2831a6f..38bdc67c187c 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.72.0"; + version = "1.73.1"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-IxRK3wY/rVZlFgvNw5ciDy3CnhG33eiK5pvZZy/42ds="; + hash = "sha256-bgat7DsIcPWUeVOw74298s683/Yfsf4IEgzHSDx5eKo="; }; outputs = [ diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 0b84dccda641..4fab1bb0b8cc 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -18,14 +18,14 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - version = "1.72.0"; + version = "1.73.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Ba7pvpWKWA4WnhqomHOHvNi+btf8XCo6BItqK5EUc80="; + hash = "sha256-f84s0cDBEWzzhQVk6/wyZPunXTx0p0FDc/EjjqNl74c="; }; outputs = [ diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index c86ecb59ef33..6efbb7693c81 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pyyaml ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; pythonImportsCheck = [ "guessit" ]; diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix index c08c56a68533..833edd12343a 100644 --- a/pkgs/development/python-modules/guidance/default.nix +++ b/pkgs/development/python-modules/guidance/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ] ++ optional-dependencies.schemas; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTests = [ # require network access diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix index 2958233dd986..e734c0db51d7 100644 --- a/pkgs/development/python-modules/guidata/default.nix +++ b/pkgs/development/python-modules/guidata/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "guidata"; - version = "3.10.0"; + version = "3.12.0"; pyproject = true; src = fetchFromGitHub { owner = "PlotPyStack"; repo = "guidata"; tag = "v${version}"; - hash = "sha256-jVRUnP+0mPA79K23VI8/BXaCGvR2DUfyd+cXA8On34Y="; + hash = "sha256-dh1WyUgJ+rkBFtcyXEFgU8UNPQEkJfiJBwmkT1eqKoI="; }; build-system = [ diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix index d9088c43d27c..f81312e97e58 100644 --- a/pkgs/development/python-modules/gymnasium/default.nix +++ b/pkgs/development/python-modules/gymnasium/default.nix @@ -15,6 +15,10 @@ pythonOlder, importlib-metadata, + # optional-dependencies + # atari + ale-py, + # tests array-api-compat, dill, @@ -54,6 +58,12 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + optional-dependencies = { + atari = [ + ale-py + ]; + }; + pythonImportsCheck = [ "gymnasium" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index b8d52cd944c4..533f37eb0b45 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -3,19 +3,20 @@ stdenv, buildPythonPackage, fetchFromGitiles, + setuptools, six, python, }: buildPythonPackage { pname = "gyp"; - version = "unstable-2022-04-01"; - format = "setuptools"; + version = "unstable-2024-02-07"; + pyproject = true; src = fetchFromGitiles { url = "https://chromium.googlesource.com/external/gyp"; - rev = "9ecf45e37677743503342ee4c6a76eaee80e4a7f"; - hash = "sha256-LUlF2VhRnuDwJLdITgmXIQV/IuKdx1KXQkiPVHKrl4Q="; + rev = "1615ec326858f8c2bd8f30b3a86ea71830409ce4"; + hash = "sha256-E+JF4uJBRka6vtjxyoMGE4IT5kSrl7Vs6WNkMQ+vNgs="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -23,7 +24,9 @@ buildPythonPackage { ./no-xcode.patch ]; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; pythonImportsCheck = [ "gyp" @@ -41,6 +44,6 @@ buildPythonPackage { mainProgram = "gyp"; homepage = "https://gyp.gsrc.io"; license = licenses.bsd3; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index b00bbc3aa18f..5c922a00ce63 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "habanero" ]; # almost the entirety of the test suite makes network calls - pytestFlagsArray = [ "test/test-filters.py" ]; + enabledTestPaths = [ "test/test-filters.py" ]; meta = { description = "Python interface to Library Genesis"; diff --git a/pkgs/development/python-modules/habiticalib/default.nix b/pkgs/development/python-modules/habiticalib/default.nix index 38a63ef68c4f..3bfca8a69883 100644 --- a/pkgs/development/python-modules/habiticalib/default.nix +++ b/pkgs/development/python-modules/habiticalib/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { syrupy ]; - pytestFlagsArray = [ "--snapshot-update" ]; + pytestFlags = [ "--snapshot-update" ]; pythonImportsCheck = [ "habiticalib" ]; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index 078bcada5de4..47d047f501ce 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { syrupy ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; pythonImportsCheck = [ "hdate" ]; diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index e9183014eaa7..deaaa0362269 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "hmmlearn" ]; - pytestFlagsArray = [ + pytestFlags = [ "--pyargs" "hmmlearn" ]; diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 237d8e9d1d93..44a5c1b0dc37 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; disabledTests = [ # Assert issues with datetime diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 6178b563e6d1..3fb455f29db2 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "html_sanitizer/tests.py" ]; + enabledTestPaths = [ "html_sanitizer/tests.py" ]; disabledTests = [ # Tests are sensitive to output diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 6ac5440bf1c2..64c7796b5bc3 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "html5_parser" ]; - pytestFlagsArray = [ "test/*.py" ]; + enabledTestPaths = [ "test/*.py" ]; meta = with lib; { description = "Fast C based HTML 5 parsing for python"; diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index 6428b99868f2..2fb2e64825c5 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "httmock" ]; diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix index 83869dbe6380..d3fcc3296dad 100644 --- a/pkgs/development/python-modules/http-message-signatures/default.nix +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - pytestFlagsArray = [ "test/test.py" ]; + enabledTestPaths = [ "test/test.py" ]; pythonImportsCheck = [ "http_message_signatures" ]; diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index d06260549d98..90c142c1aaeb 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { installManPage docs/http.1 ''; - pytestFlagsArray = [ + enabledTestPaths = [ "httpie" "tests" ]; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 17b2012c8b37..6602f1be45e7 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -85,11 +85,9 @@ buildPythonPackage rec { export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" - "-W" - "ignore::trio.TrioDeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" + "-Wignore::trio.TrioDeprecationWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index 1484503de7aa..5a7b10b2b841 100644 --- a/pkgs/development/python-modules/hydra-core/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -72,9 +72,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "-W" - "ignore::UserWarning" + pytestFlags = [ + "-Wignore::UserWarning" ]; # Test environment setup broken under Nix for a few tests: diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix index 61722b8722d2..8850d1a53283 100644 --- a/pkgs/development/python-modules/hyperscan/default.nix +++ b/pkgs/development/python-modules/hyperscan/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "hyperscan" ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index efaa9f616537..7f1cfa076720 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { export HYPOTHESIS_PROFILE=ci ''; - pytestFlagsArray = [ "tests/cover" ]; + enabledTestPaths = [ "tests/cover" ]; # Hypothesis by default activates several "Health Checks", including one that fires if the builder is "too slow". # This check is disabled [1] if Hypothesis detects a CI environment, i.e. either `CI` or `TF_BUILD` is defined [2]. diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index fef99ca10b24..8666a42fb852 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { matplotlib seaborn ]; - pytestFlagsArray = [ + enabledTestPaths = [ "hyppo" ]; diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 0624297c2e15..e9e54f58a347 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pytest-mock ] ++ lib.optional (pythonAtLeast "3.12") distutils; - pytestFlagsArray = [ "ipi_tests/unit_tests" ]; + enabledTestPaths = [ "ipi_tests/unit_tests" ]; disabledTests = [ "test_driver_base" "test_driver_forcebuild" diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index a68bfb2bbf0b..340b308d500c 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -112,10 +112,6 @@ buildPythonPackage rec { hatchling ]; - pythonRelaxDeps = [ - # "toolz" - ]; - dependencies = [ atpublic parsy @@ -171,6 +167,12 @@ buildPythonPackage rec { # AssertionError: value does not match the expected value in snapshot ibis/backends/tests/snapshots/test_sql/test_rewrite_context/sqlite/out.sql "test_rewrite_context" + + # Assertion error comparing a calculated version string with the actual (during nixpkgs-review) + "test_builtin_scalar_noargs" + + # duckdb ParserError: syntax error at or near "AT" + "test_90" ]; # patch out tests that check formatting with black @@ -352,6 +354,9 @@ buildPythonPackage rec { homepage = "https://github.com/ibis-project/ibis"; changelog = "https://github.com/ibis-project/ibis/blob/${version}/docs/release_notes.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cpcloud ]; + maintainers = with lib.maintainers; [ + cpcloud + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index b26bb9595abd..a7ed92051f65 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { "test_docstring_of_python_file" ]; - pytestFlagsArray = [ "src/icalendar" ]; + enabledTestPaths = [ "src/icalendar" ]; meta = with lib; { changelog = "https://github.com/collective/icalendar/blob/${src.tag}/CHANGES.rst"; diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index d5584869bc69..c3005903d75a 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -67,10 +67,9 @@ buildPythonPackage rec { "tests/test_typeguard.py" ]; - pytestFlagsArray = [ + pytestFlags = [ # RuntimeWarning: coroutine '*' was never awaited - "-W" - "ignore::RuntimeWarning" + "-Wignore::RuntimeWarning" ]; pythonImportsCheck = [ "icontract" ]; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index b225756302d6..c7129931b7cc 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -183,8 +183,8 @@ buildPythonPackage rec { popd ''; - pytestFlagsArray = [ - "-p no:pytest-blender" + pytestFlags = [ + "-pno:pytest-blender" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 23617b9fba5c..f6ff9245d69b 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "2.6"; + version = "2.7"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; tag = version; - hash = "sha256-g8ELTPPWnSXpzH7IiPTe4MS+jIFQPXx48D/X9dL2nPk="; + hash = "sha256-ZMHVYuNcUjhMKJUr5bCIELO6F0CNi0ESfbsBm5vOiA4="; }; nativeBuildInputs = [ swig ]; diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index b7f9e0447007..b21a74f845d8 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "import_expression" ]; diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 632a3aefb8d9..cedd3a7ee1e6 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ + pytestFlags = [ # verbose build outputs needed to debug hard-to-reproduce hydra failures "-v" "--pyargs" diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index 7cb117943ed7..e919ebb84749 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "intelhex/test.py" ]; + enabledTestPaths = [ "intelhex/test.py" ]; pythonImportsCheck = [ "intelhex" ]; diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index f6c38f32cad6..e0beea29d83f 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; pythonImportsCheck = [ "intensity_normalization" diff --git a/pkgs/development/python-modules/iocextract/default.nix b/pkgs/development/python-modules/iocextract/default.nix index 2627076a9ca9..c83b73c641b9 100644 --- a/pkgs/development/python-modules/iocextract/default.nix +++ b/pkgs/development/python-modules/iocextract/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "iocextract" ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; disabledTests = [ # AssertionError: 'http://exampledotcom/test' != 'http://example.com/test' diff --git a/pkgs/development/python-modules/iometer/default.nix b/pkgs/development/python-modules/iometer/default.nix index 270e11b35060..96c7247b92fe 100644 --- a/pkgs/development/python-modules/iometer/default.nix +++ b/pkgs/development/python-modules/iometer/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/test.py" ]; diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix index 3ccf42e6f5dc..96dc39af38b2 100644 --- a/pkgs/development/python-modules/iptools/default.nix +++ b/pkgs/development/python-modules/iptools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/iptools/iptools_test.py" ]; + enabledTestPaths = [ "tests/iptools/iptools_test.py" ]; meta = with lib; { description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index a07ce0269f45..40196daa8aab 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -36,12 +36,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "9.2.0"; + version = "9.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Yqk3PbwS8o+f6vRwDQUhlb+JgGJ5/IyhHz9UAX0EdRs="; + hash = "sha256-eeuJb58j9QrRbDvCBfaG9uAwrSRswwnGJ5okKxSv6dg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index e21b5ac8bbf0..ba8080138a5c 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.1.5"; + version = "8.1.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hw5DsaNWVqgMGMlQO78tFoAtsctIfuxvqyfWgzgd3hc="; + hash = "sha256-FfGsBQucy+/UXcz7su9r7QAp2CeGgtVp1xuN2WvuA3Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix index bc4cca3eb2cd..bd3f11ac014b 100644 --- a/pkgs/development/python-modules/isal/default.nix +++ b/pkgs/development/python-modules/isal/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = [ # calls `python -m isal` and fails on import diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 0cf69fbd7660..ec020ed85399 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest-cov-stub ]; - pytestFlagsArray = [ "isbnlib/test/" ]; + enabledTestPaths = [ "isbnlib/test/" ]; # All disabled tests require a network connection disabledTests = [ diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index b9d6e59ac103..50aadffb98f6 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { cp -r ${table} $out/${python.sitePackages}/iso4217/table.xml ''; - pytestFlagsArray = [ "iso4217/test.py" ]; + enabledTestPaths = [ "iso4217/test.py" ]; pythonImportsCheck = [ "iso4217" ]; diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index ab2eb3045dc3..7fb179d4c850 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pytz ]; - pytestFlagsArray = [ "iso8601" ]; + enabledTestPaths = [ "iso8601" ]; pythonImportsCheck = [ "iso8601" ]; diff --git a/pkgs/development/python-modules/itanium-demangler/default.nix b/pkgs/development/python-modules/itanium-demangler/default.nix index 7d00cfbaebf9..59b4430fe2f1 100644 --- a/pkgs/development/python-modules/itanium-demangler/default.nix +++ b/pkgs/development/python-modules/itanium-demangler/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/test.py" ]; + enabledTestPaths = [ "tests/test.py" ]; pythonImportsCheck = [ "itanium_demangler" ]; diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index 62366b1ddd78..b4cfb2d61264 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; meta = with lib; { description = "Mixed sync-async queue"; diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index fe6497b618b9..2e2983c8f6e6 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -28,7 +28,7 @@ importlib-resources, pyparsing, pytest-responses, - nettools, + net-tools, }: buildPythonPackage rec { @@ -76,7 +76,7 @@ buildPythonPackage rec { importlib-resources pyparsing pytest-responses - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ nettools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ net-tools ]; disabledTestPaths = [ # require networking diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 92b08f1fdb4e..f8fb980cef64 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { threadpoolctl ]; - pytestFlagsArray = [ "joblib/test" ]; + enabledTestPaths = [ "joblib/test" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix index 99dc70caf5a3..9823612e5371 100644 --- a/pkgs/development/python-modules/joserfc/default.nix +++ b/pkgs/development/python-modules/joserfc/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "joserfc"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "authlib"; repo = "joserfc"; tag = version; - hash = "sha256-e7c1reeAo+3dyNuDRXPlzxOwWQbAcHe+bSRVlvSW2rw="; + hash = "sha256-95xtUzzIxxvDtpHX/5uCHnTQTB8Fc08DZGUOR/SdKLs="; }; build-system = [ setuptools ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "joserfc" ]; meta = with lib; { + changelog = "https://github.com/authlib/joserfc/blob/${src.tag}/docs/changelog.rst"; description = "Implementations of JOSE RFCs in Python"; homepage = "https://github.com/authlib/joserfc"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index f1fe30b28d1c..e3860c74215b 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jsbeautifier" ]; - pytestFlagsArray = [ "jsbeautifier/tests/testindentation.py" ]; + enabledTestPaths = [ "jsbeautifier/tests/testindentation.py" ]; meta = with lib; { description = "JavaScript unobfuscator and beautifier"; diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix index 3a15b321e5cd..42be27661c03 100644 --- a/pkgs/development/python-modules/jsmin/default.nix +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "jsmin/test.py" ]; + enabledTestPaths = [ "jsmin/test.py" ]; pythonImportsCheck = [ "jsmin" ]; diff --git a/pkgs/development/python-modules/jsonnet/default.nix b/pkgs/development/python-modules/jsonnet/default.nix new file mode 100644 index 000000000000..66ffe5975aab --- /dev/null +++ b/pkgs/development/python-modules/jsonnet/default.nix @@ -0,0 +1,23 @@ +{ + pkgs, + buildPythonPackage, + setuptools, +}: + +buildPythonPackage { + inherit (pkgs.jsonnet) pname version src; + pyproject = true; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "_jsonnet" ]; + + meta = { + inherit (pkgs.jsonnet.meta) + description + maintainers + license + homepage + ; + }; +} diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 9609f9b44be5..4e428924c130 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jsonpatch" ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; meta = with lib; { description = "Library to apply JSON Patches according to RFC 6902"; diff --git a/pkgs/development/python-modules/jsonpath-python/default.nix b/pkgs/development/python-modules/jsonpath-python/default.nix index ac8dc699f845..62c99e84af88 100644 --- a/pkgs/development/python-modules/jsonpath-python/default.nix +++ b/pkgs/development/python-modules/jsonpath-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jsonpath" ]; - pytestFlagsArray = [ "test/test*.py" ]; + enabledTestPaths = [ "test/test*.py" ]; meta = with lib; { homepage = "https://github.com/sean2077/jsonpath-python"; diff --git a/pkgs/development/python-modules/jsonpath/default.nix b/pkgs/development/python-modules/jsonpath/default.nix index be1054c04df7..24228a27cd1b 100644 --- a/pkgs/development/python-modules/jsonpath/default.nix +++ b/pkgs/development/python-modules/jsonpath/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jsonpath" ]; - pytestFlagsArray = [ "test/test*.py" ]; + enabledTestPaths = [ "test/test*.py" ]; meta = with lib; { description = "XPath for JSON"; diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index 8774e9e271bb..1c76d37d598b 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "jsonref" ]; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index bed256951ca9..47d2215b9bfe 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "jsonrpc_async" ]; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index 239a3e9246ef..c0607f33a8fa 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "jsonrpc_base" ]; diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index c31d92037709..76f464366c2d 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; disabledTests = [ # jnpr.junos.exception.FactLoopError: A loop was detected while gathering the... diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index dace73df26e3..b990300eac78 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "4.0.2"; + version = "4.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "jupyter-collaboration"; tag = "v${version}"; - hash = "sha256-BCvTtrlP45YC9G/m/e8Nvbls7AugIaQzO2Gect1EmGE="; + hash = "sha256-PnfUWtOXdXYG5qfzAW5kATSQr2sWKDBNiINA8/G4ZX4="; }; sourceRoot = "${src.name}/projects/jupyter-collaboration"; @@ -67,7 +67,7 @@ buildPythonPackage rec { meta = { description = "JupyterLab Extension enabling Real-Time Collaboration"; homepage = "https://github.com/jupyterlab/jupyter_collaboration"; - changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; teams = [ lib.teams.jupyter ]; }; diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index 9684013f350f..776befd777ef 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.7.2"; + version = "5.8.1"; disabled = pythonOlder "3.7"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; tag = "v${version}"; - hash = "sha256-qu25ryZreRPHoubFJTFusGdkTPHbl/yl94g+XU5A5Mc="; + hash = "sha256-opTFYVDqzkjeFC+9IZXPRCoV2QCTm1ze6ldrOZN0aUc="; }; patches = [ ./tests_respect_pythonpath.patch ]; @@ -45,9 +45,9 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - pytestFlagsArray = [ + pytestFlags = [ # suppress pytest.PytestUnraisableExceptionWarning: Exception ignored in: - "-W ignore::pytest.PytestUnraisableExceptionWarning" + "-Wignore::pytest.PytestUnraisableExceptionWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 2af4cdc6b23c..35cf04742b57 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -2,14 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, - pythonOlder, # build hatchling, # runtime jsonschema, + packaging, python-json-logger, pyyaml, referencing, @@ -29,29 +28,21 @@ buildPythonPackage rec { pname = "jupyter-events"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_events"; tag = "v${version}"; - hash = "sha256-e+BxJc/i5lpljvv6Uwqwrog+nLJ4NOBSqd47Q7DELOE="; + hash = "sha256-l/u0XRP6mjqXywVzRXTWSm4E5a6o2oCdOBGGzLb85Ek="; }; - patches = [ - # https://github.com/jupyter/jupyter_events/pull/110 - (fetchpatch2 { - name = "python-json-logger-compatibility.patch"; - url = "https://github.com/jupyter/jupyter_events/commit/6704ea630522f44542d83608f750da0068e41443.patch"; - hash = "sha256-PfmOlbXRFdQxhM3SngjjUNsiueuUfCO7xlyLDGSnzj4="; - }) - ]; - build-system = [ hatchling ]; dependencies = [ jsonschema + packaging python-json-logger pyyaml referencing diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index 517ccefadf5d..d1c9851f7655 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pytest-timeout ]; - pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; + pytestFlags = [ "-Wignore::DeprecationWarning" ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 449f13a74689..67554ad45f3c 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.15.0"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-nURrhpe09zN6G3zcrEB3i6vdk7phS21oqxwMkY8cQIQ="; + hash = "sha256-ZdS0T98ty73+CqGs5KhC1Kr3RqK3sWgTTVqu01Yht/Y="; }; build-system = [ @@ -86,14 +86,12 @@ buildPythonPackage rec { flaky ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" # 19 failures on python 3.13: # ResourceWarning: unclosed database in # TODO: Can probably be removed at the next update - "-W" - "ignore::pytest.PytestUnraisableExceptionWarning" + "-Wignore::pytest.PytestUnraisableExceptionWarning" ]; preCheck = '' diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 5c31e1bf2133..d2804be4420e 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.51.1"; + version = "0.51.2"; pyproject = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "jupyterlab-git"; tag = "v${version}"; - hash = "sha256-gAE8Qx+R97D5DCsgXgb1XtnRcdIkKWxe+J+Sk4OnYJM="; + hash = "sha256-YQWS+/GfQzkQ/n0xBq+K8lJ9tjvIRJxa3w3AzNARpDo="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit src; - hash = "sha256-r52Hj1Z2CpgH2AjeyGNuRO/WPWfdaY/e1d37jGJacBc="; + hash = "sha256-9GmQv4UYH+uRPgAZed6IJC+7uMKhlXvokVwd248yi/4="; }; build-system = [ diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 4f39d7fdc536..06ebc31199c7 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "jupyterlab-lsp"; - version = "5.1.0"; + version = "5.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-rqyECTrabSDvV64Ol4EcxXlqDKtyN7Mvjt35k8C7A1Y="; + pname = "jupyterlab_lsp"; + inherit version; + hash = "sha256-cjPKc+oPLahZjqM9hMJDY1Rm0a9w3c6M2DNu+V3KCL8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index 968afeb9cce8..0bd3fb162a24 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -67,9 +67,8 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index bf8b0a0141ae..34b5ecf2ef4c 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -2,18 +2,19 @@ lib, buildPythonPackage, fetchPypi, - jupyter-packaging, + hatchling, + hatch-jupyter-builder, }: buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "3.0.13"; + version = "3.0.15"; pyproject = true; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - hash = "sha256-opZtOFMowZQraDqM2WuJuN2CyLj4HdqQK7K8BtRvW+0="; + hash = "sha256-KSCIigwpIjUakgKBeVemjAfZlnNQTWzTc0UpnpcbsIs="; }; # jupyterlab is required to build from source but we use the pre-build package @@ -22,17 +23,20 @@ buildPythonPackage rec { --replace '"jupyterlab~=4.0"' "" ''; - nativeBuildInputs = [ jupyter-packaging ]; + build-system = [ + hatchling + hatch-jupyter-builder + ]; # has no tests doCheck = false; pythonImportsCheck = [ "jupyterlab_widgets" ]; - meta = with lib; { + meta = { description = "Jupyter Widgets JupyterLab Extension"; homepage = "https://github.com/jupyter-widgets/ipywidgets"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 30eb5286a7c6..d643e1b58d04 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.4.1"; + version = "4.4.3"; pyproject = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "jupyterlab"; tag = "v${version}"; - hash = "sha256-j1K5aBLLGSWER3S0Vojrwdd+9T9vYbp1+XgxYD2NORY="; + hash = "sha256-ZenPoUnUlNLiOVI6tkF/Lq6l3tMA8WXKg9ENwOgS720="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit src; sourceRoot = "${src.name}/jupyterlab/staging"; - hash = "sha256-rko09rqT7UQUq/Ddi8lo3V02eJQEEnpjH5RaLSgqj/o="; + hash = "sha256-qW0SiISQhwVPk0wwnEtxB4fJMyVS3wzp/4pS8bPleM4="; }; preBuild = '' @@ -91,7 +91,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyterlab" ]; meta = with lib; { - changelog = "https://github.com/jupyterlab/jupyterlab/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jupyterlab/jupyterlab/blob/${src.tag}/CHANGELOG.md"; description = "Jupyter lab environment notebook server extension"; license = licenses.bsd3; homepage = "https://jupyter.org/"; diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index e6af33502323..f8d019357689 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; pythonImportsCheck = [ "langchain_aws" ]; diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index a10c57314756..a278a133bba1 100644 --- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { toml ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; pythonImportsCheck = [ "langchain_azure_dynamic_sessions" ]; diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 313102d333a3..fdc3b7b8bd3f 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -104,7 +104,7 @@ buildPythonPackage rec { toml ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/unit_tests" ]; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 1ed827340d1d..0a1269377418 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { syrupy ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; passthru = { tests.pytest = langchain-core.overridePythonAttrs (_: { diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix index df1849e407f6..49b59121eec1 100644 --- a/pkgs/development/python-modules/langchain-groq/default.nix +++ b/pkgs/development/python-modules/langchain-groq/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; pythonImportsCheck = [ "langchain_groq" ]; diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index 45a5d84d79a4..0611097e3997 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { toml ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; pythonImportsCheck = [ "langchain_huggingface" ]; diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix index 6cc5a0baeec6..b76fb3893586 100644 --- a/pkgs/development/python-modules/langchain-mistralai/default.nix +++ b/pkgs/development/python-modules/langchain-mistralai/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-mistralai"; - version = "0.2.10"; + version = "0.2.11"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-mistralai==${version}"; - hash = "sha256-1oH9GRvjYv/YzedKXeWgw5nwNgMQ9mSNkmZ2xwPekXc="; + hash = "sha256-14mYvW7j2hxAFZanRhuuo1seX6E4+tAuEPExDbdwHKg="; }; sourceRoot = "${src.name}/libs/partners/mistralai"; diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index e65e8721665f..978bfffbc6ed 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { syrupy ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; pythonImportsCheck = [ "langchain_mongodb" ]; diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix index 705a53178a35..1de471cdb87c 100644 --- a/pkgs/development/python-modules/langchain-ollama/default.nix +++ b/pkgs/development/python-modules/langchain-ollama/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "langchain-ollama"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-ollama==${version}"; - hash = "sha256-YxcxVyiPEZPvO4NyeDp8nTVfbxlOCLClWCmAlL5PPi0="; + hash = "sha256-biPQAYF9VfF6z0244v1+iXaqX0IAiKCuJ+XyXzxD/Jg="; }; sourceRoot = "${src.name}/libs/partners/ollama"; @@ -56,7 +56,7 @@ buildPythonPackage rec { syrupy ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; pythonImportsCheck = [ "langchain_ollama" ]; diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index f8b180ee0384..80316dec8eb3 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { toml ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; disabledTests = [ # These tests require network access diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 427e5564d9a5..a0d3a84473fa 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; passthru.updateScript = gitUpdater { rev-prefix = "langchain-text-splitters=="; diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index 10b1f19c9454..e9f342771f9b 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { docker-compose ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; pythonImportsCheck = [ "langgraph_cli" ]; diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix index 96694f77fbff..21e7fdf0dd5c 100644 --- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix +++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix @@ -73,11 +73,9 @@ buildPythonPackage rec { export PYTHONPATH=${src}/libs/langgraph:$PYTHONPATH ''; - pytestFlagsArray = [ - "-W" - "ignore::pytest.PytestDeprecationWarning" - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::pytest.PytestDeprecationWarning" + "-Wignore::DeprecationWarning" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index 8446d0905aa5..b5baa5d10922 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { werkzeug ]; - pytestFlagsArray = [ "sasstests.py" ]; + enabledTestPaths = [ "sasstests.py" ]; pythonImportsCheck = [ "sass" ]; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index b1f99424c52b..1bdf0d907883 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index af09af0f0c71..552a2d4081a7 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "usb1/testUSB1.py" ]; + enabledTestPaths = [ "usb1/testUSB1.py" ]; meta = with lib; { homepage = "https://github.com/vpelletier/python-libusb1"; diff --git a/pkgs/development/python-modules/litestar/default.nix b/pkgs/development/python-modules/litestar/default.nix index aa8d338d081c..abf46e6fce89 100644 --- a/pkgs/development/python-modules/litestar/default.nix +++ b/pkgs/development/python-modules/litestar/default.nix @@ -96,7 +96,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pytestFlagsArray = [ + enabledTestPaths = [ # Follow github CI "docs/examples/" ]; diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix index 21cbdcbfd244..88379600c3d2 100644 --- a/pkgs/development/python-modules/livekit-api/default.nix +++ b/pkgs/development/python-modules/livekit-api/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "livekit-api/tests" ]; + enabledTestPaths = [ "livekit-api/tests" ]; pythonImportsCheck = [ "livekit" ]; diff --git a/pkgs/development/python-modules/llm-grok/default.nix b/pkgs/development/python-modules/llm-grok/default.nix index a2c5ac03adc3..1e834b795deb 100644 --- a/pkgs/development/python-modules/llm-grok/default.nix +++ b/pkgs/development/python-modules/llm-grok/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "llm-grok"; - version = "1.0.1"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "Hiepler"; repo = "llm-grok"; tag = "v${version}"; - hash = "sha256-OeeU/53XKucLCtGvnl5RWc/QqF0TprB/SO8pnnK5fdw="; + hash = "sha256-Zwvf33XSoULJxJMBHftysY3RzGEQ+L46UJ0V8b/+UXQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 83ff265b6922..7a2045a7cce3 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch, asteval, dill, fetchPypi, @@ -27,6 +28,13 @@ buildPythonPackage rec { inherit pname version; hash = "sha256-czIea4gfL2hiNXIaffwCr2uw8DCiXv62Zjj2KxxgU6E="; }; + patches = [ + # https://github.com/lmfit/lmfit-py/issues/999 + (fetchpatch { + url = "https://github.com/lmfit/lmfit-py/commit/d4f4e3755d50cb9720c616fcff2cd7b58fbabba5.patch"; + hash = "sha256-h1WK3ajnoX3pOZOduFBKpPz3exfoKzkbO/QNgROLT7c="; + }) + ]; build-system = [ setuptools diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix index ef0bf25cc8ff..f3b5d6e990be 100644 --- a/pkgs/development/python-modules/logical-unification/default.nix +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { "test_reify_recursion_limit" ]; - pytestFlagsArray = [ + pytestFlags = [ "--benchmark-skip" "--html=testing-report.html" "--self-contained-html" diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index 3bf1553a40d8..2e87b083fe1a 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "looseversion" ]; diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 3c8cde54f5da..189a94b72c50 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests-mock ]; - pytestFlagsArray = [ "tests/platformrest_tests.py" ]; + enabledTestPaths = [ "tests/platformrest_tests.py" ]; pythonImportsCheck = [ "platformrest" ]; diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix index d702e2be6369..d3b7f3af9e7e 100644 --- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix +++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix @@ -45,5 +45,7 @@ buildPythonPackage rec { homepage = "https://github.com/neomutt/lsp-tree-sitter"; license = licenses.gpl3Only; maintainers = with maintainers; [ doronbehar ]; + # https://github.com/neomutt/lsp-tree-sitter/issues/4 + broken = true; }; } diff --git a/pkgs/development/python-modules/luhn/default.nix b/pkgs/development/python-modules/luhn/default.nix index 888d0913ba06..39c0a42a0278 100644 --- a/pkgs/development/python-modules/luhn/default.nix +++ b/pkgs/development/python-modules/luhn/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; pythonImportsCheck = [ "luhn" ]; diff --git a/pkgs/development/python-modules/luna-usb/default.nix b/pkgs/development/python-modules/luna-usb/default.nix index a6b8393e1d7f..313f626cd491 100644 --- a/pkgs/development/python-modules/luna-usb/default.nix +++ b/pkgs/development/python-modules/luna-usb/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { apollo-fpga ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/" ]; diff --git a/pkgs/development/python-modules/macaddress/default.nix b/pkgs/development/python-modules/macaddress/default.nix index 137561253049..b37e7313ec1f 100644 --- a/pkgs/development/python-modules/macaddress/default.nix +++ b/pkgs/development/python-modules/macaddress/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { reprshed ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; meta = with lib; { homepage = "https://github.com/mentalisttraceur/python-macaddress"; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 0d32ac8bcbbf..bc7d2684cf2d 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -29,7 +29,7 @@ noiseprotocol, # tests - nettools, + net-tools, unixtools, magic-wormhole-transit-relay, magic-wormhole-mailbox-server, @@ -60,7 +60,7 @@ buildPythonPackage rec { '' # fix the location of the ifconfig binary + lib.optionalString stdenv.hostPlatform.isLinux '' - sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py + sed -i -e "s|'ifconfig'|'${net-tools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; build-system = [ diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 7a2ebe81d97b..dd4d851bc5ff 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -38,10 +38,9 @@ buildPythonPackage rec { typeguard ]; - pytestFlagsArray = [ + pytestFlags = [ # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; disabledTests = lib.optionals (pythonAtLeast "3.10") [ diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index a219fa49c817..3bbf04b5d3f6 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; disabledTestPaths = lib.optionals (!withOlm) [ "tests/encryption_test.py" diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix index 5d11262d6c07..b3564681af90 100644 --- a/pkgs/development/python-modules/mcp/default.nix +++ b/pkgs/development/python-modules/mcp/default.nix @@ -96,9 +96,8 @@ buildPythonPackage rec { requests ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ - "-W" - "ignore::pydantic.warnings.PydanticDeprecatedSince211" + pytestFlags = [ + "-Wignore::pydantic.warnings.PydanticDeprecatedSince211" ]; disabledTests = diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 5287a97e2d39..a10cd61c3cfb 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "md_toc/tests/*.py" ]; + enabledTestPaths = [ "md_toc/tests/*.py" ]; pythonImportsCheck = [ "md_toc" ]; diff --git a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix index f181e9eaf1ad..bf22ebeae71f 100644 --- a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix +++ b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "mdx_truly_sane_lists/tests.py" ]; + enabledTestPaths = [ "mdx_truly_sane_lists/tests.py" ]; meta = { description = "Extension for Python-Markdown that makes lists truly sane"; diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix index 69971befefa4..b60da7236ce9 100644 --- a/pkgs/development/python-modules/metaflow/default.nix +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "metaflow"; - version = "2.15.18"; + version = "2.15.20"; pyproject = true; src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; tag = version; - hash = "sha256-Yg5DoFPn5uInLf8roHhIKXvK+/K6TWATdG8uK8XOUyg="; + hash = "sha256-D4Pf2/xhEJ22kDmmxYS0PiT5k2BJ3CBfTJZ4GrvkI58="; }; build-system = [ diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix index 7ac0d401096a..9e28d4c6bb8d 100644 --- a/pkgs/development/python-modules/minikanren/default.nix +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -38,7 +38,7 @@ buildPythonPackage { pytest-html ]; - pytestFlagsArray = [ + pytestFlags = [ "--html=testing-report.html" "--self-contained-html" ]; diff --git a/pkgs/development/python-modules/mixbox/default.nix b/pkgs/development/python-modules/mixbox/default.nix index c1a2c05caf16..b31a18bc675d 100644 --- a/pkgs/development/python-modules/mixbox/default.nix +++ b/pkgs/development/python-modules/mixbox/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mixbox" ]; - pytestFlagsArray = [ "test/*.py" ]; + enabledTestPaths = [ "test/*.py" ]; disabledTests = [ # Tests are out-dated diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix index bdc996bbe79f..ac686c4f7018 100644 --- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocs-mermaid2-plugin"; - version = "1.1.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fralau"; repo = "mkdocs-mermaid2-plugin"; tag = "v${version}"; - hash = "sha256-9vYLkGUnL+rnmZntcgFzOvXQdf6angb9DRsmrBjnPUY="; + hash = "sha256-LKPjhCPozz/+UV2658qWOIjpMt6w+UDBXsg1fqyg48M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 284222299cd3..8e303b4de62f 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mlrose" ]; # Fix random seed during tests - pytestFlagsArray = [ "--randomly-seed 0" ]; + pytestFlags = [ "--randomly-seed=0" ]; meta = with lib; { description = "Machine Learning, Randomized Optimization and SEarch"; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index db5689580279..8771435d892f 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "-sv" ]; + pytestFlags = [ "-sv" ]; disabledTests = [ # Type changed in numpy2 test should be updated diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix index 5054fcae7b79..9ce81605053d 100644 --- a/pkgs/development/python-modules/mohawk/default.nix +++ b/pkgs/development/python-modules/mohawk/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "mohawk/tests.py" ]; + enabledTestPaths = [ "mohawk/tests.py" ]; meta = { description = "Python library for Hawk HTTP authorization"; diff --git a/pkgs/development/python-modules/monotonic-alignment-search/default.nix b/pkgs/development/python-modules/monotonic-alignment-search/default.nix index c4ce71b7b250..fd4f932dfa09 100644 --- a/pkgs/development/python-modules/monotonic-alignment-search/default.nix +++ b/pkgs/development/python-modules/monotonic-alignment-search/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { torch ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; pythonImportsCheck = [ "monotonic_alignment_search" ]; diff --git a/pkgs/development/python-modules/moreorless/default.nix b/pkgs/development/python-modules/moreorless/default.nix index d2ab01a2c18f..6cd26bb28bf1 100644 --- a/pkgs/development/python-modules/moreorless/default.nix +++ b/pkgs/development/python-modules/moreorless/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "moreorless" ]; - pytestFlagsArray = [ + enabledTestPaths = [ "moreorless/tests/click.py" "moreorless/tests/combined.py" "moreorless/tests/general.py" diff --git a/pkgs/development/python-modules/motmetrics/default.nix b/pkgs/development/python-modules/motmetrics/default.nix index 166e80b73924..b29ed9b00602 100644 --- a/pkgs/development/python-modules/motmetrics/default.nix +++ b/pkgs/development/python-modules/motmetrics/default.nix @@ -44,7 +44,7 @@ buildPythonPackage { pytest-benchmark ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; pythonImportsCheck = [ "motmetrics" ]; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 139a4227fad9..4ac2cb5b0d8c 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { ] ++ lib.flatten (lib.attrValues optional-dependencies); # See https://github.com/NixOS/nixpkgs/issues/381908 and https://github.com/NixOS/nixpkgs/issues/385450. - pytestFlagsArray = [ "--timeout=600" ]; + pytestFlags = [ "--timeout=600" ]; pythonImportsCheck = [ "moviepy" ]; diff --git a/pkgs/development/python-modules/mpire/default.nix b/pkgs/development/python-modules/mpire/default.nix index d54eda65ea78..07ae829d4719 100644 --- a/pkgs/development/python-modules/mpire/default.nix +++ b/pkgs/development/python-modules/mpire/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.testing; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; meta = { description = "A Python package for easy multiprocessing, but faster than multiprocessing"; diff --git a/pkgs/development/python-modules/mqtt2influxdb/default.nix b/pkgs/development/python-modules/mqtt2influxdb/default.nix index 26b4ebb1197d..32040eb5b975 100644 --- a/pkgs/development/python-modules/mqtt2influxdb/default.nix +++ b/pkgs/development/python-modules/mqtt2influxdb/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mqtt2influxdb" ]; - pytestFlagsArray = [ "tests/test.py" ]; + enabledTestPaths = [ "tests/test.py" ]; meta = with lib; { description = "Flexible MQTT to InfluxDB Bridge"; diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index 33b4b044dd3b..e6828479a5dd 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/mrsqm" ]; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 34fc2fc7b10d..ca6c5e111f11 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -12,21 +12,18 @@ microsoft-kiota-serialization-multipart, microsoft-kiota-serialization-text, msgraph-core, - pythonOlder, }: buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.35.0"; + version = "1.37.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-fgblM9KdKbP8mXsOF5FX4pXiJrE6FRxjlh2Kz6Q/rB0="; + hash = "sha256-1oz+2UQhBjRj2F243GNxmUfknVJFL/V2+jpqKZTDmDw="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/music-tag/default.nix b/pkgs/development/python-modules/music-tag/default.nix index 1c396703cd0c..0343aacb795d 100644 --- a/pkgs/development/python-modules/music-tag/default.nix +++ b/pkgs/development/python-modules/music-tag/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test" ]; + enabledTestPaths = [ "test" ]; # Tests fail: ModuleNotFoundError: No module named '_test_common' doCheck = false; diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index c40ed6441717..bca284a792b3 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # make the testsuite run with pytest, so we can disable individual tests nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/testextensions.py" ]; + enabledTestPaths = [ "tests/testextensions.py" ]; disabledTests = lib.optionals (pythonAtLeast "3.14") [ # https://github.com/python/mypy_extensions/issues/65 diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index c1082a14be28..0dfe7efcfd7f 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -69,9 +69,8 @@ buildPythonPackage rec { "test_unary_two_elements" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; meta = { diff --git a/pkgs/development/python-modules/natasha/default.nix b/pkgs/development/python-modules/natasha/default.nix index 50283389107b..237ac3b78b76 100644 --- a/pkgs/development/python-modules/natasha/default.nix +++ b/pkgs/development/python-modules/natasha/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; pythonImportsCheck = [ "natasha" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 90c543962bf8..a4945c93868e 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -87,9 +87,8 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/neurokit2/default.nix b/pkgs/development/python-modules/neurokit2/default.nix index ebc3ceae150a..923eaa7b7e42 100644 --- a/pkgs/development/python-modules/neurokit2/default.nix +++ b/pkgs/development/python-modules/neurokit2/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { "tests/tests_microstates.py" ]; - pytestFlagsArray = [ + pytestFlags = [ # Otherwise, test collection fails with: # AttributeError: module 'scipy.ndimage._delegators' has no attribute '@py_builtins_signature'. Did you mean: 'grey_dilation_signature'? # https://github.com/scipy/scipy/issues/22236 diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 535321edb909..d9da5fcf52d6 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { ]; # do subset of tests which don't fetch resources - pytestFlagsArray = [ "nilearn/connectome/tests" ]; + enabledTestPaths = [ "nilearn/connectome/tests" ]; meta = { description = "Module for statistical learning on neuroimaging data"; diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix index d21635145b01..8258a73e57bd 100644 --- a/pkgs/development/python-modules/nitrokey/default.nix +++ b/pkgs/development/python-modules/nitrokey/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "nitrokey"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Lf20du+DDwMrHrC+wCXxFNG8ThBnbonx4wq7DatH4X4="; + hash = "sha256-JAgorA2V+WHgqtwk8fEPjdwoog7Q3xk93aKSJ0mxHkQ="; }; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index 5811062df376..a91d07cf99a3 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - pytestFlagsArray = [ "niworkflows" ]; + enabledTestPaths = [ "niworkflows" ]; disabledTests = [ # try to download data: diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix index 3bc59c632991..54bf8ad6ffab 100644 --- a/pkgs/development/python-modules/nmapthon2/default.nix +++ b/pkgs/development/python-modules/nmapthon2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/scanner_tests.py" ]; + enabledTestPaths = [ "tests/scanner_tests.py" ]; pythonImportsCheck = [ "nmapthon2" ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 114fb07b7b51..c6cdaf1e7b58 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.4.1"; + version = "7.4.3"; pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook"; tag = "v${version}"; - hash = "sha256-Xz9EZgYNJjWsN7tcTmwXLwH9VW7GnI0P/oNT0IFpkoE="; + hash = "sha256-DpGWBV5MeCvoGSBadObVEaYwA5kRmHj8NdVWpJ+pHjA="; }; postPatch = '' @@ -55,7 +55,7 @@ buildPythonPackage rec { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit src missingHashes; - hash = "sha256-IFLAwEFsI/GL26XAfiLDyW1mG72gcN2TH651x8Nbrtw="; + hash = "sha256-S0lnRJ+9F1RhymlAOxo3sEJJrHYo5IWeWn80obcgVlM="; }; build-system = [ @@ -77,9 +77,8 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; env = { diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 5f62372502f6..b4b463ddc5d8 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "tests/tests.py" ]; diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index e0856c05ca5c..e3f8a01cdb3d 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -59,7 +59,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.3.0"; + version = "2.3.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -67,7 +67,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-WB+H+enp2yy6IUFADhYOndZE7iSHiNb5BjbuuP2SYKY="; + hash = "sha256-HsmuIKQibaN0NizKPGLNdT+vL5UUQLDjuY6TwjVEHSs="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index e301301af113..c80c6062ae7f 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "numpyro" ]; - pytestFlagsArray = [ + pytestFlags = [ # Tests memory consumption grows significantly with the number of parallel processes (reaches ~200GB with 80 jobs) "--maxprocesses=8" @@ -72,8 +72,7 @@ buildPythonPackage rec { # UserWarning: There are not enough devices to run parallel chains: expected 2 but got 1. # Chains will be drawn sequentially. If you are running MCMC in CPU, consider using `numpyro.set_host_device_count(2)` at the beginning of your program. # You can double-check how many devices are available in your system using `jax.local_device_count()`. - "-W" - "ignore::UserWarning" + "-Wignore::UserWarning" ]; disabledTests = diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 8c5c8a4c3076..ee7b23f027b9 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "9.0"; + version = "9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; tag = "v${version}"; - hash = "sha256-Ef830yTY+g6ZPZ9h0lSktkewIerHbWVfXwrdQ6rzz6I="; + hash = "sha256-NmWoRDYOfSweqUhw0KTdXubWgXmVr+odrs1dMLXdHEI="; }; build-system = [ flit-core ]; @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Numerical Utilities for Finite Element Analysis"; - changelog = "https://github.com/evalf/nutils/releases/tag/v${version}"; + changelog = "https://github.com/evalf/nutils/releases/tag/${src.tag}"; homepage = "https://www.nutils.org/"; license = licenses.mit; maintainers = with maintainers; [ Scriptkiddi ]; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index bd8363cf32ad..ee0311a70708 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "src/nwdiag/tests/" ]; + enabledTestPaths = [ "src/nwdiag/tests/" ]; disabledTests = [ # AttributeError: 'TestRstDirectives' object has no attribute 'assertRegexpMatches' diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index fa75906b2a06..1909658fe20a 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { tensorflow ]; - pytestFlagsArray = [ "tests/*.py" ]; + enabledTestPaths = [ "tests/*.py" ]; disabledTests = [ # Test requires internet access for prefetching some weights diff --git a/pkgs/development/python-modules/objsize/default.nix b/pkgs/development/python-modules/objsize/default.nix index 495f4eaef066..ede53ebf4a12 100644 --- a/pkgs/development/python-modules/objsize/default.nix +++ b/pkgs/development/python-modules/objsize/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "objsize" ]; - pytestFlagsArray = [ "test_objsize.py" ]; + enabledTestPaths = [ "test_objsize.py" ]; meta = with lib; { description = "Traversal over objects subtree and calculate the total size"; diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index 0285d6988da6..4bbf77f2c4a0 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; disabledTests = [ "test_client_raise_exception" diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index dfdd52372c14..9fa84ce792c5 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -104,7 +104,7 @@ buildPythonPackage rec { rm onnx/__init__.py ''; - pytestFlagsArray = [ + enabledTestPaths = [ "onnx/test" "examples" ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index fc6efa7838c9..c25a3d402217 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -118,9 +118,8 @@ buildPythonPackage rec { respx ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; disabledTests = diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 2cc663198996..44c9de211e4e 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "test_array_prefixitems_invalid" ]; - pytestFlagsArray = [ "-vvv" ]; + pytestFlags = [ "-vvv" ]; pythonImportsCheck = [ "openapi_schema_validator" ]; diff --git a/pkgs/development/python-modules/openfga-sdk/default.nix b/pkgs/development/python-modules/openfga-sdk/default.nix index 5cd8bbe94fd2..37368c4deb21 100644 --- a/pkgs/development/python-modules/openfga-sdk/default.nix +++ b/pkgs/development/python-modules/openfga-sdk/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "openfga-sdk"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; src = fetchFromGitHub { owner = "openfga"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-ukx3XzNl2vIhPtHPJ46mUYbuxXkMKmlUNXV/3UF4DKo="; + hash = "sha256-e/Pgyj7A1HtcDPeRy0QK+Nok2ruWBiU9A1Yh7RZvtVI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix index da453a6f6f64..e486b8236000 100644 --- a/pkgs/development/python-modules/openhomedevice/default.nix +++ b/pkgs/development/python-modules/openhomedevice/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "openhomedevice" ]; - pytestFlagsArray = [ "tests/*.py" ]; + enabledTestPaths = [ "tests/*.py" ]; meta = with lib; { description = "Python module to access Linn Ds and Openhome devices"; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 602cdd29e825..b1754a3620c9 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -38,9 +38,8 @@ buildPythonPackage rec { pytest7CheckHook ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; disabledTests = diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix index d49618bb0140..488f44902587 100644 --- a/pkgs/development/python-modules/opensimplex/default.nix +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/test_opensimplex.py" ]; + enabledTestPaths = [ "tests/test_opensimplex.py" ]; pythonImportsCheck = [ "opensimplex" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index 3ddd107770b0..f03c5577d3a5 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { pytestCheckHook ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ]; diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix index 8b98dbe711c6..c859fab8aac0 100644 --- a/pkgs/development/python-modules/optimistix/default.nix +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -53,11 +53,10 @@ buildPythonPackage rec { pytest-xdist ]; - pytestFlagsArray = [ + pytestFlags = [ # Since jax 0.5.3: # DeprecationWarning: shape requires ndarray or scalar arguments, got at position 0. In a future JAX release this will be an error. - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; meta = { diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index 1d625b114f23..361ecc236318 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -3,29 +3,33 @@ buildPythonPackage, fetchPypi, flake8, + pytestCheckHook, + setuptools, six, - pythonOlder, - importlib-metadata, }: buildPythonPackage rec { pname = "orderedmultidict"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1bc2v0yflsxjyyjx4q9wqx0j3bvzcw9z87d5pz4iqac7bsxhn1q4"; + hash = "sha256-BAcLu16HKRzJv6Ud9BNnf68hQcc8YdKl97Jr6jzYgq0="; }; - nativeCheckInputs = [ flake8 ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = [ six ]; - meta = with lib; { + pythonImportsCheck = [ "orderedmultidict" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { description = "Ordered Multivalue Dictionary"; homepage = "https://github.com/gruns/orderedmultidict"; - license = licenses.publicDomain; - maintainers = with maintainers; [ vanzef ]; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ vanzef ]; }; } diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix index c65c5bc585b3..fff6eb0c864b 100644 --- a/pkgs/development/python-modules/osc-sdk-python/default.nix +++ b/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; # Only keep test not requiring access and secret keys - pytestFlagsArray = [ "tests/test_net.py" ]; + enabledTestPaths = [ "tests/test_net.py" ]; pythonImportsCheck = [ "osc_sdk_python" ]; diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix index 8f8e21974597..cdf2598369e9 100644 --- a/pkgs/development/python-modules/osmpythontools/default.nix +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -8,23 +8,26 @@ matplotlib, numpy, pandas, + setuptools, ujson, xarray, }: buildPythonPackage rec { pname = "osmpythontools"; - version = "0.3.5"; - format = "setuptools"; + version = "0.3.6"; + pyproject = true; src = fetchFromGitHub { owner = "mocnik-science"; repo = "osm-python-tools"; - rev = "v${version}"; - hash = "sha256-lTDA1Rad9aYI/ymU/0xzdJHmebUGcpVJ0GW7D0Ujdko="; + tag = "v${version}"; + hash = "sha256-ajZJSuMbku08vHvn4fqsLqCS/E2XR3uVqiH7R1GHH5o="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ beautifulsoup4 geojson lxml @@ -47,7 +50,7 @@ buildPythonPackage rec { "OSMPythonTools.overpass" ]; - meta = with lib; { + meta = { description = "Library to access OpenStreetMap-related services"; longDescription = '' The python package OSMPythonTools provides easy access to @@ -55,9 +58,9 @@ buildPythonPackage rec { Nominatim, and the OpenStreetMap editing API. ''; homepage = "https://github.com/mocnik-science/osm-python-tools"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; changelog = "https://raw.githubusercontent.com/mocnik-science/osm-python-tools/v${version}/version-history.md"; - maintainers = with maintainers; [ das-g ]; - teams = [ teams.geospatial ]; + maintainers = with lib.maintainers; [ das-g ]; + teams = [ lib.teams.geospatial ]; }; } diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix index ea4bb32e213c..f0e3657e3353 100644 --- a/pkgs/development/python-modules/paddlex/default.nix +++ b/pkgs/development/python-modules/paddlex/default.nix @@ -50,14 +50,14 @@ let in buildPythonPackage rec { pname = "paddlex"; - version = "3.0.3"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleX"; tag = "v${version}"; - hash = "sha256-uIpt2I6Lx/nJDh4sZYBI6dL8IveQf6aOxA/9vKFU2nU="; + hash = "sha256-vmb1A7AifQmWv31b847hP1lHeBe+ZDEGR3raIGykRoo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index e791700751fe..275ddd452056 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -86,7 +86,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d); ''; - pytestFlagsArray = [ + enabledTestPaths = [ "papis" "tests" ]; diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index f7a93cad160e..b1df69476699 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -38,9 +38,8 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; pythonImportsCheck = [ "param" ]; diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 62663c9cd9da..643bab1e58dc 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "parameterized/test.py" ]; + enabledTestPaths = [ "parameterized/test.py" ]; pythonImportsCheck = [ "parameterized" ]; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 7ca9f927008a..7f2bd1a38fad 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { --replace-fail "assertRaisesRegexp" "assertRaisesRegex" ''; - pytestFlagsArray = [ + enabledTestPaths = [ "paramz/tests/array_core_tests.py" "paramz/tests/cacher_tests.py" "paramz/tests/examples_tests.py" diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 393a486067d1..6241b021bba4 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/Test*.py" ]; + enabledTestPaths = [ "tests/Test*.py" ]; disabledTests = [ # https://github.com/bear/parsedatetime/issues/263 diff --git a/pkgs/development/python-modules/parselmouth/default.nix b/pkgs/development/python-modules/parselmouth/default.nix index 7256b9178a4e..6edb4b1e2c5c 100644 --- a/pkgs/development/python-modules/parselmouth/default.nix +++ b/pkgs/development/python-modules/parselmouth/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + pytestFlags = [ "--run-praat-tests" "-v" ]; diff --git a/pkgs/development/python-modules/pcapy-ng/default.nix b/pkgs/development/python-modules/pcapy-ng/default.nix index d101f3d5fffb..c5a44b26db87 100644 --- a/pkgs/development/python-modules/pcapy-ng/default.nix +++ b/pkgs/development/python-modules/pcapy-ng/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { doCheck = pythonOlder "3.10"; - pytestFlagsArray = [ "pcapytests.py" ]; + enabledTestPaths = [ "pcapytests.py" ]; meta = with lib; { description = "Module to interface with the libpcap packet capture library"; diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 669c60249e35..8e536996aca7 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.4.4"; + version = "2.4.5"; pyproject = true; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; tag = version; - hash = "sha256-OeS1PqcWXJdvSEZwkBEHGJSYM6bX7QSPdfs9u06g760="; + hash = "sha256-tXgojVE/Bh2OVeMG/P5aCK5HEeUhiypUjTrS4yOwvZU="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 8d4dd2318286..7d13cac4281f 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -45,7 +45,10 @@ buildPythonPackage rec { webtest ]; - pytestFlagsArray = [ "--pyargs pecan" ]; + pytestFlags = [ + "--pyargs" + "pecan" + ]; pythonImportsCheck = [ "pecan" ]; diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 290d5d64e2a5..e77696cae0df 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { scipy ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; # These tests fail when MPS devices are detected disabledTests = lib.optional stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 39462140a732..68bb52d21e26 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -98,9 +98,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + pytestFlags = [ # DeprecationWarning: 'jinja2.Markup' is deprecated and... - "-W ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/periodiq/default.nix b/pkgs/development/python-modules/periodiq/default.nix index e9410ecba7a5..39ce3b00fca8 100644 --- a/pkgs/development/python-modules/periodiq/default.nix +++ b/pkgs/development/python-modules/periodiq/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; versionCheckProgramArg = "--version"; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; pythonImportsCheck = [ "periodiq" ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index af4ea3723bed..e8b59a144158 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/*.py" ]; + enabledTestPaths = [ "tests/*.py" ]; pythonImportsCheck = [ "phonenumbers" ]; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index d5022fca36fb..dff804cbb782 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "9.7.1"; + version = "9.8.1"; pyproject = true; src = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-QXuXHFc48KTlIwO0aJsQRmrupZIJYElfbwM9itzTYhc="; + hash = "sha256-gFaGHml1F5i+w68xapmPHYUK760rT4GJzTWTkDsIwC8="; }; patches = [ @@ -85,6 +85,6 @@ buildPythonPackage rec { description = "Read and write PDFs with Python, powered by qpdf"; license = licenses.mpl20; maintainers = with maintainers; [ dotlambda ]; - changelog = "https://github.com/pikepdf/pikepdf/blob/${src.tag}/docs/releasenotes/version${lib.versions.major version}.rst"; + changelog = "https://github.com/pikepdf/pikepdf/blob/${src.tag}/docs/releasenotes/version${lib.versions.major version}.md"; }; } diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index bb3b0b7ad4c7..3f6ebf4e72fd 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "pillow"; - version = "11.2.1"; + version = "11.3.0"; pyproject = true; src = fetchFromGitHub { owner = "python-pillow"; repo = "pillow"; tag = version; - hash = "sha256-eInPpCxHvo9J45t52KXZDG4KH4yf7iNMb+FpH5SEWmE="; + hash = "sha256-VOOIxzTyERI85CvA2oIutybiivU14kIko8ysXpmwUN8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 85139ea17f67..7a3736de7a3a 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -37,9 +37,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pims" ]; - pytestFlagsArray = [ - "-W" - "ignore::Warning" + pytestFlags = [ + "-Wignore::Warning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix index 06bcf0f4ff16..81ddafdd32dd 100644 --- a/pkgs/development/python-modules/pins/default.nix +++ b/pkgs/development/python-modules/pins/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pins" ]; - pytestFlagsArray = [ "pins/tests/" ]; + enabledTestPaths = [ "pins/tests/" ]; disabledTestPaths = [ # Tests require network access diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 7127ebe3f798..250ef8a8200b 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { matplotlib ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/plum-py/default.nix b/pkgs/development/python-modules/plum-py/default.nix index c2bca8e10fb6..9c2fb7d77247 100644 --- a/pkgs/development/python-modules/plum-py/default.nix +++ b/pkgs/development/python-modules/plum-py/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "plum" ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTestPaths = [ # tests enum.IntFlag behaviour which has been disallowed in python 3.11.6 diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index 2e2100209323..49dbe9b49187 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "plyer/tests" ]; + enabledTestPaths = [ "plyer/tests" ]; disabledTests = [ # assumes dbus is not installed, it fails and is not very robust. "test_notification_notifysend" diff --git a/pkgs/development/python-modules/polars/avx512.patch b/pkgs/development/python-modules/polars/avx512.patch new file mode 100644 index 000000000000..5a4d5ecc9530 --- /dev/null +++ b/pkgs/development/python-modules/polars/avx512.patch @@ -0,0 +1,15 @@ +diff --git a/crates/polars-compute/src/lib.rs b/crates/polars-compute/src/lib.rs +index ebe1ef753..6e1eee897 100644 +--- a/crates/polars-compute/src/lib.rs ++++ b/crates/polars-compute/src/lib.rs +@@ -5,6 +5,10 @@ + all(feature = "simd", target_arch = "x86_64"), + feature(stdarch_x86_avx512) + )] ++#![cfg_attr( ++ all(feature = "simd", target_arch = "x86_64"), ++ feature(avx512_target_feature) ++)] + + use arrow::types::NativeType; + diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index 1b55b61a9cc4..6b2bf5d213ba 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -40,7 +40,7 @@ }: let - version = "1.27.1"; + version = "1.31.0"; # Hide symbols to prevent accidental use rust-jemalloc-sys = throw "polars: use polarsMemoryAllocator over rust-jemalloc-sys"; @@ -56,9 +56,13 @@ buildPythonPackage rec { owner = "pola-rs"; repo = "polars"; tag = "py-${version}"; - hash = "sha256-/VigBBjZglPleXB9jhWHtA+y7WixjboVbzslprZ/A98="; + hash = "sha256-OZ7guV/uxa3jGesAh+ubrFjQSNVp5ImfXfPAQxagTj0="; }; + patches = [ + ./avx512.patch + ]; + # Do not type-check assertions because some of them use unstable features (`is_none_or`) postPatch = '' while IFS= read -r -d "" path ; do @@ -68,7 +72,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-dbPhEMhfe8DZO1D8U+3W1goNK1TAVyLzXHwXzzRvASw="; + hash = "sha256-yGTXUW6IVa+nRpmnkEl20/RJ/mxTSAaokETT8QLE+Ns="; }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index 2aa6ce30ebe4..bd594d8b2f8a 100644 --- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; meta = with lib; { description = "Prometheus exporter for Flask applications"; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 382bfc448a72..13120930f0b1 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -31,10 +31,9 @@ buildPythonPackage rec { googleapis-common-protos ]; - pytestFlagsArray = [ + pytestFlags = [ # pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" ]; pythonImportsCheck = [ "proto" ]; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 28e1a646b2a6..76f178a3d65f 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # our sandboxing which we can work around by disabling some tests: # - cpu_times was flaky on darwin # - the other disabled tests are likely due to sandboxing (missing specific errors) - pytestFlagsArray = [ + enabledTestPaths = [ # Note: $out must be referenced as test import paths are relative "${placeholder "out"}/${python.sitePackages}/psutil/tests/test_system.py" ]; diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 4f6fcbd62cfd..f5fe9fff8ded 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -48,9 +48,8 @@ buildPythonPackage rec { attrs ]; - pytestFlagsArray = [ - "-W" - "ignore::pydantic.warnings.PydanticDeprecatedSince211" + pytestFlags = [ + "-Wignore::pydantic.warnings.PydanticDeprecatedSince211" ]; pythonImportsCheck = [ "psygnal" ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 06cd9c78696e..6c3ee5f4dcaf 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "publicsuffixlist" ]; - pytestFlagsArray = [ "publicsuffixlist/test.py" ]; + enabledTestPaths = [ "publicsuffixlist/test.py" ]; meta = with lib; { changelog = "https://github.com/ko-zu/psl/blob/v${version}-gha/CHANGES.md"; diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix index 0ea2944d77d1..426be0ecab46 100644 --- a/pkgs/development/python-modules/pure-protobuf/default.nix +++ b/pkgs/development/python-modules/pure-protobuf/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pytest-cov-stub ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; pythonImportsCheck = [ "pure_protobuf" ]; diff --git a/pkgs/development/python-modules/py-bip39-bindings/default.nix b/pkgs/development/python-modules/py-bip39-bindings/default.nix index f5907afda7f3..2fb88b112b84 100644 --- a/pkgs/development/python-modules/py-bip39-bindings/default.nix +++ b/pkgs/development/python-modules/py-bip39-bindings/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "bip39" ]; diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix index 76f2a00cd600..326906f3ab5e 100644 --- a/pkgs/development/python-modules/py-ocsf-models/default.nix +++ b/pkgs/development/python-modules/py-ocsf-models/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-ocsf-models"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "prowler-cloud"; repo = "py-ocsf-models"; tag = version; - hash = "sha256-aHde/dYgY4x5b/iwIddqvfQ3/pRhEp0zDsrK3+jMV44="; + hash = "sha256-9aKZtSolUARl70QdavQ6mkW7jk3OlOAIoy/8I6o1+0M="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index d3e29379fe8b..929f744f2754 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { py-bip39-bindings ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "sr25519" ]; diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix index 881bc356c1a3..b4f2838d41a6 100644 --- a/pkgs/development/python-modules/py-ubjson/default.nix +++ b/pkgs/development/python-modules/py-ubjson/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { "test_recursion" ]; - pytestFlagsArray = [ "test/test.py" ]; + enabledTestPaths = [ "test/test.py" ]; pythonImportsCheck = [ "ubjson" ]; diff --git a/pkgs/development/python-modules/py2bit/default.nix b/pkgs/development/python-modules/py2bit/default.nix index d1bfd6f34d66..c529e47f1fc9 100644 --- a/pkgs/development/python-modules/py2bit/default.nix +++ b/pkgs/development/python-modules/py2bit/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "py2bitTest/test.py" ]; + enabledTestPaths = [ "py2bitTest/test.py" ]; meta = { homepage = "https://github.com/deeptools/py2bit"; diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index ce8be1fffd07..d109d1cc08c9 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.11.1"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; tag = "v${version}"; - hash = "sha256-/etiTXKNcf5sMHxdl2dq1gH3OwKTwrz7zyH3CXmx/vQ="; + hash = "sha256-83JZ8OWbk6vwcbB6JFwHNNuvbq1n/4YHi1FhG+FIts8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 8bb069700b9a..767b8c5eb067 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.16.0"; + version = "0.16.1"; pyproject = true; src = fetchFromGitHub { owner = "postlund"; repo = "pyatv"; tag = "v${version}"; - hash = "sha256-yjPbSTmHoKnVwNArZw5mGf3Eh4Ei1+DkY9y2XRRy4YA="; + hash = "sha256-b5u9u5CD/1W422rCxHvoyBqT5CuBAh68/EUBzNDcXoE="; }; postPatch = '' @@ -109,7 +109,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for the Apple TV"; homepage = "https://github.com/postlund/pyatv"; - changelog = "https://github.com/postlund/pyatv/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/postlund/pyatv/blob/${src.tag}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index 0d475d688674..02db5e236319 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyBigWig" ]; - pytestFlagsArray = [ "pyBigWigTest/test*.py" ]; + enabledTestPaths = [ "pyBigWigTest/test*.py" ]; disabledTests = [ # Test file is downloaded from GitHub diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index 94df8e4f62bb..f2eb9539e1d9 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -2,33 +2,47 @@ lib, buildPythonPackage, fetchPypi, + + # build-system + setuptools, + + # dependencies latexcodec, pyyaml, - setuptools, + + # tests + pytestCheckHook, }: buildPythonPackage rec { - version = "0.24.0"; - format = "setuptools"; pname = "pybtex"; - - doCheck = false; - pythonImportsCheck = [ "pybtex" ]; - - propagatedBuildInputs = [ - latexcodec - pyyaml - setuptools - ]; + version = "0.25.1"; + pyproject = true; src = fetchPypi { inherit version pname; - sha256 = "818eae35b61733e5c007c3fcd2cfb75ed1bc8b4173c1f70b56cc4c0802d34755"; + sha256 = "sha256-nq+QJnx+g+Ilr4n+plw3Cvv2X0WCINOUap4wSeHspJE="; }; - meta = with lib; { + build-system = [ + setuptools + ]; + + dependencies = [ + latexcodec + pyyaml + ]; + + pythonImportsCheck = [ "pybtex" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { homepage = "https://pybtex.org/"; + changelog = "https://bitbucket.org/pybtex-devs/pybtex/src/master/CHANGES"; description = "BibTeX-compatible bibliography processor written in Python"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index a99339a444cd..c496e5c5e607 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -7,24 +7,27 @@ fetchPypi, idna, pythonOlder, + setuptools, tornado, }: buildPythonPackage rec { pname = "pycares"; - version = "4.8.0"; - format = "setuptools"; + version = "4.9.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-L8Lr+rlg9lSz488IpzJIaVDamTk6ZX+LRGGK0+0tOcE="; + hash = "sha256-juSE3bI9vsTYjRTtW21ZLBlg0uk8OF1eUrb61WTYI5U="; }; + build-system = [ setuptools ]; + buildInputs = [ c-ares ]; - propagatedBuildInputs = [ + dependencies = [ cffi idna ]; @@ -43,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for c-ares"; homepage = "https://github.com/saghul/pycares"; - changelog = "https://github.com/saghul/pycares/releases/tag/pycares-${version}"; + changelog = "https://github.com/saghul/pycares/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index 2b2e63596196..2299cd3b9090 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test/test-*.py" ]; + enabledTestPaths = [ "test/test-*.py" ]; meta = { homepage = "https://www.gnu.org/software/libcdio/"; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 79d519fec6d2..90eed94b49e2 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -5,18 +5,19 @@ python, pytestCheckHook, setuptools, + isPyPy, }: buildPythonPackage rec { pname = "pycodestyle"; - version = "2.13.0"; + version = "2.14.0"; pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; repo = "pycodestyle"; - rev = version; - hash = "sha256-jpF0/sVzRjot8KRdXqvhWpdafzC/Fska6jmG3s2U6Wk="; + tag = version; + hash = "sha256-1EEQp/QEulrdU9tTe28NerQ33IWlAiSlicpmNYciW88="; }; build-system = [ setuptools ]; @@ -25,17 +26,22 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - # https://github.com/PyCQA/pycodestyle/blob/2.13.0/tox.ini#L16 + # https://github.com/PyCQA/pycodestyle/blob/2.14.0/tox.ini#L16 postCheck = '' ${python.interpreter} -m pycodestyle --statistics pycodestyle.py ''; - meta = with lib; { - changelog = "https://github.com/PyCQA/pycodestyle/blob/${version}/CHANGES.txt"; + disabledTests = lib.optionals isPyPy [ + # PyPy reports a SyntaxError instead of ValueError + "test_check_nullbytes" + ]; + + meta = { + changelog = "https://github.com/PyCQA/pycodestyle/blob/${src.tag}/CHANGES.txt"; description = "Python style guide checker"; mainProgram = "pycodestyle"; homepage = "https://pycodestyle.pycqa.org/"; - license = licenses.mit; - maintainers = with maintainers; [ kamadorueda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index e49b0e3cc066..fc7db24a708b 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { requests-mock ] ++ moto.optional-dependencies.cognitoidp; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; disabledTests = [ # Test requires network access diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index d3ae6abe0189..7e9addf18e73 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.12.23" +version = "0.12.26" dependencies = [ "pyo3", "serde_json", @@ -569,9 +569,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "yrs" -version = "0.23.5" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197c2b4b298f35c3ba4d549884ac872a961112095b29f173ab45e3d5cf609018" +checksum = "f904a99678a852d7cbc6958c94087f739c10cfb19642635951219c525a5fdb89" dependencies = [ "arc-swap", "async-lock", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 521f1d65a461..098d3bc6d5f6 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.12.23"; + version = "0.12.26"; pyproject = true; src = fetchFromGitHub { owner = "y-crdt"; repo = "pycrdt"; tag = version; - hash = "sha256-xMGu7L6aisTLzLx8pw/k4rXvjTiZsPANXsU1T1FOXKM="; + hash = "sha256-dhIMh8sRFS9LSX17vnGn/eqQF/WpGDJkzjwHYCuzbkM="; }; postPatch = '' @@ -53,9 +53,8 @@ buildPythonPackage rec { y-py ]; - pytestFlagsArray = [ - "-W" - "ignore::pytest.PytestUnknownMarkWarning" # requires unpackaged pytest-mypy-testing + pytestFlags = [ + "-Wignore::pytest.PytestUnknownMarkWarning" # requires unpackaged pytest-mypy-testing ]; passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 7b37d9261877..ada7bf9428bf 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pytestFlagsArray = [ + enabledTestPaths = [ # don't pick up the tests directory below examples/ "tests" ]; diff --git a/pkgs/development/python-modules/pydantic-compat/default.nix b/pkgs/development/python-modules/pydantic-compat/default.nix index e47211217593..db5ef91c20bb 100644 --- a/pkgs/development/python-modules/pydantic-compat/default.nix +++ b/pkgs/development/python-modules/pydantic-compat/default.nix @@ -41,12 +41,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "-W" + pytestFlags = [ # pydantic.warnings.PydanticDeprecatedSince211: Accessing this attribute on the instance is # deprecated, and will be removed in Pydantic V3. Instead, you should access this attribute from # the model class. Deprecated in Pydantic V2.11 to be removed in V3.0. - "ignore::pydantic.warnings.PydanticDeprecatedSince211" + "-Wignore::pydantic.warnings.PydanticDeprecatedSince211" ]; meta = { diff --git a/pkgs/development/python-modules/pydemumble/default.nix b/pkgs/development/python-modules/pydemumble/default.nix index 7ba9ac39d3e8..dcae56a72b80 100644 --- a/pkgs/development/python-modules/pydemumble/default.nix +++ b/pkgs/development/python-modules/pydemumble/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; pythonImportsCheck = [ "pydemumble" ]; diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index aa9c01b76da0..eb16cd4481dd 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { }) ]; - pytestFlagsArray = [ "test/test_pydot.py" ]; + enabledTestPaths = [ "test/test_pydot.py" ]; pythonImportsCheck = [ "pydot" ]; diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index c781c6153f5a..f8efe8e16b69 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2025.6.0"; + version = "2025.7.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; tag = version; - hash = "sha256-9WwVhA5dJTApjbSVLDGzfyzFXWFx/YJaUSRmaLkh2L0="; + hash = "sha256-bHdGHg+TxGf+evJdGUou7UXMVcGSgDXHx1GCAzTl7U0="; }; build-system = [ diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix index f9e09eb5cebc..6e12ee548ea1 100644 --- a/pkgs/development/python-modules/pydsdl/default.nix +++ b/pkgs/development/python-modules/pydsdl/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "pydsdl/_test.py" ]; + enabledTestPaths = [ "pydsdl/_test.py" ]; meta = with lib; { description = "Library to process Cyphal DSDL"; diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 38d659e8149d..c69f32832492 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { "pydub.playback" ]; - pytestFlagsArray = [ "test/test.py" ]; + enabledTestPaths = [ "test/test.py" ]; meta = with lib; { description = "Manipulate audio with a simple and easy high level interface"; diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index a87de6b3900f..41c594d6f995 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/unit" ]; + enabledTestPaths = [ "test/unit" ]; pythonImportsCheck = [ "pyeapi" ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 92222c73676e..d26992820e9c 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.88"; + version = "0.2.89"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-KHFzK9MIT3tHwFmdGx/i9OSzQTKIhGXgWEI+qtH1Dkk="; + hash = "sha256-DCQmJ4YNQKMIK0IJwAYwIYp+ulGcRdjwDIsNI6W6RsU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index a1427188b22d..0dbf36540165 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "pyfakefs/tests" ]; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index a7a1b1907c61..3620594cfb76 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "3.3.2"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; repo = "pyflakes"; - rev = version; - hash = "sha256-nNug9EZ0coI095/QJu/eK1Ozlt01INT+mLlYdqrJuzE="; + tag = version; + hash = "sha256-4UEJjn9Eey1vHeaG468x/nMlbfGu3ohZX1R7RR2R5ik="; }; build-system = [ setuptools ]; @@ -32,12 +32,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyflakes" ]; - meta = with lib; { + meta = { homepage = "https://github.com/PyCQA/pyflakes"; - changelog = "https://github.com/PyCQA/pyflakes/blob/${src.rev}/NEWS.rst"; + changelog = "https://github.com/PyCQA/pyflakes/blob/${src.tag}/NEWS.rst"; description = "Simple program which checks Python source files for errors"; mainProgram = "pyflakes"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix index b4a404dc209f..fc022bcfcedd 100644 --- a/pkgs/development/python-modules/pygtfs/default.nix +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "pygtfs/test/test.py" ]; + enabledTestPaths = [ "pygtfs/test/test.py" ]; pythonImportsCheck = [ "pygtfs" ]; diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 55af4374ad8a..665d435575d6 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { "test_aozora" ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; pythonImportsCheck = [ "pykakasi" ]; diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index 3871ba0145ef..e895eb3180ac 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylamarzocco"; - version = "2.0.10"; + version = "2.0.11"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${version}"; - hash = "sha256-8nmbnucTJa1RAmsOsqQLusjTnnrDZtHaADycnn3NyUU="; + hash = "sha256-g0qhNBhcU7Dogcw9WiEk+APk2McU7woXBqgeUS9D8iQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix index d4de581a112f..be80739413d5 100644 --- a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "lib/openjpeg" ]; - pytestFlagsArray = [ "openjpeg/tests" ]; + enabledTestPaths = [ "openjpeg/tests" ]; pythonImportsCheck = [ "openjpeg" ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index ae6d50b36d9c..cd406ad69d85 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -60,13 +60,12 @@ buildPythonPackage rec { typing-extensions ]; - pytestFlagsArray = [ + pytestFlags = [ # DeprecationWarning: pyreverse will drop support for resolving and # displaying implemented interfaces in pylint 3.0. The # implementation relies on the '__implements__' attribute proposed # in PEP 245, which was rejected in 2006. - "-W" - "ignore::DeprecationWarning" + "-Wignore::DeprecationWarning" "-v" ]; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 7f9d01ae3964..26f7b8934954 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2024.2.1"; + version = "2024.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = "pylitterbot"; tag = "v${version}"; - hash = "sha256-33LiWgI9E7/I6fyrdv+YXcw+gxUOsPZ0mYvEIF8/fOI="; + hash = "sha256-FKBgvP3qXT3nKHn5R9pp4nYNX+mO4vfDi5fzQ5+y1Nc="; }; pythonRelaxDeps = [ "deepdiff" ]; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 6d9191b2dbfd..a49fd9922a61 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; pythonImportsCheck = [ "pylutron_caseta" ]; diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index f852e528f209..1f10fedbf734 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyyaml ]; - pytestFlagsArray = [ "test" ]; + enabledTestPaths = [ "test" ]; meta = { description = "Python data serialization library"; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 3d737f1e0af8..a228353d9a1a 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -171,6 +171,7 @@ buildPythonPackage rec { # attempt to insert nil object from objects[1] "test_timer_10_2_7" + "test_timer" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/pymdstat/default.nix b/pkgs/development/python-modules/pymdstat/default.nix index f447d15e45af..a45c44d7b581 100644 --- a/pkgs/development/python-modules/pymdstat/default.nix +++ b/pkgs/development/python-modules/pymdstat/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "unitest.py" ]; + enabledTestPaths = [ "unitest.py" ]; meta = with lib; { description = "Pythonic library to parse Linux /proc/mdstat file"; diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index 1d8f3e6457c5..d69adbdf3c63 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "pymunk/tests" ]; + enabledTestPaths = [ "pymunk/tests" ]; pythonImportsCheck = [ "pymunk" ]; diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 5a6f3d32b490..d20b3a5a8335 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.2.11"; + version = "7.2.12"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-n4iQOJvZWrwA7KE4Rsj0haDbZmfcBZh+uY/eNDrfslo="; + hash = "sha256-HM5NeFYZuAZLyn5vbIo0VNaaql/P8PNb0FqoElTOEv8="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 7b119babb750..b103f3e6dcd8 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # Run only tests which don't require network access - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; pythonImportsCheck = [ "pyowm" ]; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index f2886f1269ef..240e3afc5287 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_connection_lost" ]; diff --git a/pkgs/development/python-modules/pyqldb/default.nix b/pkgs/development/python-modules/pyqldb/default.nix index 484e2d564c4f..3a6689228c4c 100644 --- a/pkgs/development/python-modules/pyqldb/default.nix +++ b/pkgs/development/python-modules/pyqldb/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { export AWS_DEFAULT_REGION=us-east-1 ''; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; pythonImportsCheck = [ "pyqldb" ]; diff --git a/pkgs/development/python-modules/pyqtdarktheme/default.nix b/pkgs/development/python-modules/pyqtdarktheme/default.nix index 2d4841227071..872e22d6ef1a 100644 --- a/pkgs/development/python-modules/pyqtdarktheme/default.nix +++ b/pkgs/development/python-modules/pyqtdarktheme/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Flat dark theme for PySide and PyQt"; homepage = "https://pyqtdarktheme.readthedocs.io/en/stable"; license = licenses.mit; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 7de9344125b7..7e4ba8303c7e 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { export FONTCONFIG_FILE=${fontsConf} ''; - pytestFlagsArray = [ + enabledTestPaths = [ # we only want to run unittests "tests" ]; diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix index f3e1212d9847..1aba824aeecc 100644 --- a/pkgs/development/python-modules/pyquaternion/default.nix +++ b/pkgs/development/python-modules/pyquaternion/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "pyquaternion/test/" ]; + enabledTestPaths = [ "pyquaternion/test/" ]; pythonImportsCheck = [ "pyquaternion" ]; diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix index ff3731bc8686..952f33739f24 100644 --- a/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; pythonImportsCheck = [ "pyspcwebgw" ]; diff --git a/pkgs/development/python-modules/pytap2/default.nix b/pkgs/development/python-modules/pytap2/default.nix index 1e080f0bbad3..83f82fef49ea 100644 --- a/pkgs/development/python-modules/pytap2/default.nix +++ b/pkgs/development/python-modules/pytap2/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - nettools, + net-tools, fetchFromGitHub, pytestCheckHook, pythonOlder, @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-GN8yFnS7HVgIP73/nVtYnwwhCBI9doGHLGSOaFiWIdw="; }; - propagatedBuildInputs = [ nettools ]; + propagatedBuildInputs = [ net-tools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 9a341c0eb418..52db6d331f85 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix index a1f56e07cf6e..9534608e0710 100644 --- a/pkgs/development/python-modules/pytest-base-url/default.nix +++ b/pkgs/development/python-modules/pytest-base-url/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pytest-metadata ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = [ # should be xfail? or mocking doesn't work diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index 034bb795f1b0..ecd1d81e4517 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-datadir"; - version = "1.6.1"; + version = "1.7.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "gabrielcnr"; repo = "pytest-datadir"; tag = "v${version}"; - hash = "sha256-qyJlg9Ck128NpJhLw2x7LuNtdSx3AaTQEUQ7fb2Aglg="; + hash = "sha256-0y+1Al8nocCJXZyu8gLbYnXJzUu/oD31Zhn901XxWds="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mpi/default.nix b/pkgs/development/python-modules/pytest-mpi/default.nix index 7a474fd084b0..474b288615ef 100644 --- a/pkgs/development/python-modules/pytest-mpi/default.nix +++ b/pkgs/development/python-modules/pytest-mpi/default.nix @@ -41,10 +41,9 @@ buildPythonPackage rec { # Tests cause the Python interpreter to crash from some reason, a hard issue # to debug. (TODO: discuss this with upstream) doCheck = false; - pytestFlagsArray = [ + pytestFlags = [ # https://github.com/aragilar/pytest-mpi/issues/4#issuecomment-634614337 - "-p" - "pytester" + "-ppytester" ]; pythonImportsCheck = [ "pytest_mpi" ]; diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix index c5abbb07447b..5e3cbe9954eb 100644 --- a/pkgs/development/python-modules/pytest-postgresql/default.nix +++ b/pkgs/development/python-modules/pytest-postgresql/default.nix @@ -45,9 +45,8 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub ]; - pytestFlagsArray = [ - "-p" - "no:postgresql" + pytestFlags = [ + "-pno:postgresql" ]; disabledTestPaths = [ "tests/docker/test_noproc_docker.py" ]; # requires Docker disabledTests = [ diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index 7c12c073f153..b9300603b9d4 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -39,9 +39,8 @@ buildPythonPackage rec { ]; # needs special invocation, copied from tox.ini - pytestFlagsArray = [ - "-p" - "no:randomly" + pytestFlags = [ + "-pno:randomly" ]; pythonImportsCheck = [ "pytest_randomly" ]; diff --git a/pkgs/development/python-modules/pytest-recording/default.nix b/pkgs/development/python-modules/pytest-recording/default.nix index 76cfba653e2e..bd02b8ebe59e 100644 --- a/pkgs/development/python-modules/pytest-recording/default.nix +++ b/pkgs/development/python-modules/pytest-recording/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { "test_other_socket" ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; pythonImportsCheck = [ "pytest_recording" ]; diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 3d39e5160ea2..61608506664b 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -58,9 +58,8 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 522202a51011..a706d0fc87dc 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; pythonImportsCheck = [ "pytest_relaxed" ]; diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index fe139444564e..9b61a0526f83 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - pytestFlagsArray = [ "-W ignore::DeprecationWarning" ]; + pytestFlags = [ "-Wignore::DeprecationWarning" ]; meta = with lib; { description = "Plugin to fake subprocess for pytest"; diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index 5499c41d5f87..6bcd648b015d 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, trio, hypothesis, outcome, @@ -12,19 +12,20 @@ buildPythonPackage rec { pname = "pytest-trio"; version = "0.8.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "python-trio"; repo = "pytest-trio"; - rev = "v${version}"; - sha256 = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk="; + tag = "v${version}"; + hash = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk="; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ trio outcome ]; @@ -43,10 +44,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_trio" ]; - meta = with lib; { + meta = { description = "Pytest plugin for trio"; homepage = "https://github.com/python-trio/pytest-trio"; - license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/development/python-modules/pytest-voluptuous/default.nix b/pkgs/development/python-modules/pytest-voluptuous/default.nix index 0d04598eb782..1e9465c91c0f 100644 --- a/pkgs/development/python-modules/pytest-voluptuous/default.nix +++ b/pkgs/development/python-modules/pytest-voluptuous/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_voluptuous" ]; - pytestFlagsArray = [ "tests/test_plugin.py" ]; + enabledTestPaths = [ "tests/test_plugin.py" ]; meta = with lib; { description = "Pytest plugin for asserting data against voluptuous schema"; diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 7e4d50915daa..d7acf848e061 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.2.0"; + version = "8.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "arangodb"; repo = "python-arango"; tag = version; - hash = "sha256-DPyCHa9tAnxKYeieiHe10UV7EPnF7octbDm23dSlIb0="; + hash = "sha256-ZLjCcH6cSG+LcoeSifBm6HGjnRFJwYNTXbcw9b/BeQY="; }; nativeBuildInputs = [ @@ -98,15 +98,11 @@ buildPythonPackage rec { --foxx.api=false & ''; - pytestFlagsArray = [ - "--host" - testDBOpts.host - "--port" - testDBOpts.port - "--passwd" - testDBOpts.password - "--secret" - testDBOpts.secret + pytestFlags = [ + "--host=${testDBOpts.host}" + "--port=${testDBOpts.port}" + "--passwd=${testDBOpts.password}" + "--secret=${testDBOpts.secret}" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/python-datemath/default.nix b/pkgs/development/python-modules/python-datemath/default.nix index ebad9cb12481..4bf2ef5bfad5 100644 --- a/pkgs/development/python-modules/python-datemath/default.nix +++ b/pkgs/development/python-modules/python-datemath/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytz ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "datemath" ]; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index ef8677a99085..d8e250c675d2 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -51,9 +51,8 @@ buildPythonPackage rec { "it_accepts_unicode_providing_there_is_no_encoding_declaration" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix index 319fe49f8d1f..7ee2794a6dec 100644 --- a/pkgs/development/python-modules/python-i18n/default.nix +++ b/pkgs/development/python-modules/python-i18n/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pytestCheckHook pyyaml ]; - pytestFlagsArray = [ "i18n/tests/run_tests.py" ]; + enabledTestPaths = [ "i18n/tests/run_tests.py" ]; pythonImportsCheck = [ "i18n" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 8ce0a76f0709..fb674db40302 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { ]; }; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; disabledTestPaths = [ # Skip the examples tests diff --git a/pkgs/development/python-modules/python-nvd3/default.nix b/pkgs/development/python-modules/python-nvd3/default.nix index 1ab84159b437..d44f7159ede3 100644 --- a/pkgs/development/python-modules/python-nvd3/default.nix +++ b/pkgs/development/python-modules/python-nvd3/default.nix @@ -29,7 +29,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; meta = { homepage = "https://github.com/areski/python-nvd3"; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 1e87a6fb6477..41fb3ec779b4 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; pythonImportsCheck = [ "slugify" ]; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 791dc068084a..1938aab59b97 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "python_utils" ]; - pytestFlagsArray = [ "_python_utils_tests" ]; + enabledTestPaths = [ "_python_utils_tests" ]; disabledTests = [ # Flaky tests diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index f8bbd9eb6466..ed5d2e93ebaa 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -53,9 +53,9 @@ buildPythonPackage { clr-loader ]; - pytestFlagsArray = [ + pytestFlags = [ # Run tests using .NET Core, Mono is unsupported for now due to find_library problem in clr-loader - "--runtime coreclr" + "--runtime=coreclr" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index bd88addc6148..a20b4ecf5373 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -24,14 +24,14 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; tag = version; - hash = "sha256-JG1FH2UAekFF9Vv7wCn/L7gJlVKv5AxqgGrj8pejqeY="; + hash = "sha256-GZSVcB4JIx02eiUb9d7o5cUAyICIoH6m0mz4TL7a9PY="; }; patches = [ diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index f7d3934384ce..adfb6fb288ce 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "pytimeparse/tests/testtimeparse.py" ]; + enabledTestPaths = [ "pytimeparse/tests/testtimeparse.py" ]; pythonImportsCheck = [ "pytimeparse" ]; diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index effdc94a8ec7..6344f1e6d9bd 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pytest-asyncio ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; postPatch = '' # Upstream doesn't set version in the repo diff --git a/pkgs/development/python-modules/pyunpack/default.nix b/pkgs/development/python-modules/pyunpack/default.nix index 3c0a2f30afad..96471c87d132 100644 --- a/pkgs/development/python-modules/pyunpack/default.nix +++ b/pkgs/development/python-modules/pyunpack/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { cabextract ]; - pytestFlagsArray = [ "-x" ]; + pytestFlags = [ "-x" ]; pythonImportsCheck = [ "pyunpack" ]; diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix index f817a04222de..be62eb48bcf8 100644 --- a/pkgs/development/python-modules/pyuseragents/default.nix +++ b/pkgs/development/python-modules/pyuseragents/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; pythonImportsCheck = [ "pyuseragents" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyvers/default.nix b/pkgs/development/python-modules/pyvers/default.nix new file mode 100644 index 000000000000..972abed60503 --- /dev/null +++ b/pkgs/development/python-modules/pyvers/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + packaging, + + # tests + jax, + numpy, + pytest-cov-stub, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyvers"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "vmoens"; + repo = "pyvers"; + tag = "v${version}"; + hash = "sha256-BUUfb0vI1r/VV5aF9gmqnXGOIWQfBJ98MrcF/IH5CEs="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + packaging + ]; + + pythonImportsCheck = [ "pyvers" ]; + + nativeCheckInputs = [ + jax + numpy + pytest-cov-stub + pytestCheckHook + ]; + + meta = { + description = "Python library for dynamic dispatch based on module versions and backends"; + homepage = "https://github.com/vmoens/pyvers"; + changelog = "https://github.com/vmoens/pyvers/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix index 206c2211d5fc..07e8cc988e54 100644 --- a/pkgs/development/python-modules/pyversasense/default.nix +++ b/pkgs/development/python-modules/pyversasense/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/test.py" ]; + enabledTestPaths = [ "tests/test.py" ]; disabledTests = [ # Tests are not properly mocking network requests diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix index dca19a30340c..6c057c7ea7e6 100644 --- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix +++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { xorg.xvfb ]; - pytestFlagsArray = [ "-v" ]; + pytestFlags = [ "-v" ]; meta = with lib; { description = "Python wrapper for Xvfb, Xephyr and Xvnc"; diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 6350402a7739..d1fbc9618d33 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "winrm" ]; - pytestFlagsArray = [ "winrm/tests/" ]; + enabledTestPaths = [ "winrm/tests/" ]; meta = with lib; { description = "Python library for Windows Remote Management"; diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 9b8e0bbb80cf..b3ad0ed92bf5 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; disabledTests = [ # Tests requires network features (e. g., discovery testing) diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index 2d5ae3787dbc..26da221cfbb5 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { preCheck = '' export PYXNAT_SKIP_NETWORK_TESTS=1 ''; - pytestFlagsArray = [ "pyxnat" ]; + enabledTestPaths = [ "pyxnat" ]; disabledTestPaths = [ # require a running local XNAT instance e.g. in a docker container: "pyxnat/tests/attributes_test.py" diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 3163166ced01..ef15dc42303c 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -127,7 +127,7 @@ buildPythonPackage rec { testtools ]; - pytestFlagsArray = [ + pytestFlags = [ "--timeout=30" "--durations=10" ]; diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 0fb5525fee2c..56551914b2e4 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { "test_yahoo" "test_wikipedia" ]; - pytestFlagsArray = [ "--durations=10" ]; + pytestFlags = [ "--durations=10" ]; meta = with lib; { description = "Software for developing quantum computing programs"; diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 61710ba4c8e3..6fa4918ea47e 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qiskit_nature" ]; - pytestFlagsArray = [ "--durations=10" ]; + pytestFlags = [ "--durations=10" ]; disabledTests = [ "test_two_qubit_reduction" # failure cause unclear diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index 539f7bcbe28b..c2408686d6ff 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "qiskit_optimization" ]; - pytestFlagsArray = [ "--durations=10" ]; + pytestFlags = [ "--durations=10" ]; meta = with lib; { description = "Software for developing quantum computing programs"; diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 8f6b3ba43965..05bd0d65f488 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -131,7 +131,7 @@ buildPythonPackage rec { # Too many floating point arithmetic errors "test/visual/mpl/circuit/test_circuit_matplotlib_drawer.py" ]; - pytestFlagsArray = [ "--durations=10" ]; + pytestFlags = [ "--durations=10" ]; disabledTests = [ "TestUnitarySynthesisPlugin" # use unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix index c383e89b0de0..12ab639fd775 100644 --- a/pkgs/development/python-modules/qpageview/default.nix +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "qpageview"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "frescobaldi"; repo = "qpageview"; tag = "v${version}"; - hash = "sha256-UADC+DH3eG1pqlC9BRsqGQQjJcpfwWWVq4O7aFGLxLA="; + hash = "sha256-5D+fumQVCfl9ZEHIQmbdXkAuAkiKy6P5+StMWSE+a0A="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index 6e4f2c5d9137..e0af42135d96 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -21,13 +21,13 @@ requests, }: let - version = "1.4.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "RapidAI"; repo = "RapidOCR"; tag = "v${version}"; - hash = "sha256-x0VELDKOffxbV3v0aDFJFuDC4YfsGM548XWgINmRc3M="; + hash = "sha256-4R2rOCfnhElII0+a5hnvbn+kKQLEtH1jBvfFdxpLEBk="; }; models = @@ -101,21 +101,10 @@ buildPythonPackage { pythonImportsCheck = [ "rapidocr_onnxruntime" ]; - nativeCheckInputs = [ - pytestCheckHook - requests - ]; - - # These are tests for different backends. - disabledTestPaths = [ - "tests/test_vino.py" - "tests/test_paddle.py" - ]; - - disabledTests = [ - # Needs Internet access - "test_long_img" - ]; + # As of version 2.1.0, 61 out of 70 tests require internet access. + # It's just not plausible to manually pick out ones that actually work + # in a hermetic build environment anymore :( + doCheck = false; meta = { # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 diff --git a/pkgs/development/python-modules/razdel/default.nix b/pkgs/development/python-modules/razdel/default.nix index a5f23fbd37f8..7337f52b7d29 100644 --- a/pkgs/development/python-modules/razdel/default.nix +++ b/pkgs/development/python-modules/razdel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ pytest7CheckHook ]; - pytestFlagsArray = [ "razdel" ]; + enabledTestPaths = [ "razdel" ]; pythonImportsCheck = [ "razdel" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rclone-python/default.nix b/pkgs/development/python-modules/rclone-python/default.nix index 6d0a508c3fc2..1b6be818b936 100644 --- a/pkgs/development/python-modules/rclone-python/default.nix +++ b/pkgs/development/python-modules/rclone-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rclone-python"; - version = "0.1.21"; + version = "0.1.23"; pyproject = true; src = fetchFromGitHub { owner = "Johannes11833"; repo = "rclone_python"; tag = "v${version}"; - hash = "sha256-lYrPSDBWGVQmT2/MgzbtZ6hHNZXINCmmFP+ZHFZQDw8="; + hash = "sha256-vvsiXS3uI0TcL+X8+75BQmycrF+EGIgQE1dmGef35rI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix index 35fd59c920a1..30928b536475 100644 --- a/pkgs/development/python-modules/reconplogger/default.nix +++ b/pkgs/development/python-modules/reconplogger/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "reconplogger" ]; - pytestFlagsArray = [ "reconplogger_tests.py" ]; + enabledTestPaths = [ "reconplogger_tests.py" ]; meta = with lib; { description = "Module to ease the standardization of logging within omni:us"; diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index dda175d64495..4da64f6afaeb 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; # integration tests require a Redshift cluster - pytestFlagsArray = [ "test/unit" ]; + enabledTestPaths = [ "test/unit" ]; __darwinAllowLocalNetworking = true; # required for tests diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 424d0f5f3de0..7bb09d8283f7 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { # https://github.com/fwestenberg/reolink/issues/83 doCheck = false; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/repoze-lru/default.nix b/pkgs/development/python-modules/repoze-lru/default.nix index 1178d9c1e977..7e1caafaedc3 100644 --- a/pkgs/development/python-modules/repoze-lru/default.nix +++ b/pkgs/development/python-modules/repoze-lru/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "repoze/lru/tests.py" ]; + enabledTestPaths = [ "repoze/lru/tests.py" ]; disabledTests = [ # time sensitive tests diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 0c95519aab62..f5b649a25396 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -88,7 +88,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d); ''; - pytestFlagsArray = [ + enabledTestPaths = [ # Integration tests require local DBs "tests/unit" ]; diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 33a465dd51e5..176d9233ae42 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + enabledTestPaths = [ "test/test.py" ]; disabledTests = [ # Test require network access diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 99187427d880..8a8da6b937fe 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -5,39 +5,41 @@ certifi, chardet, charset-normalizer, - fetchPypi, + fetchFromGitHub, idna, pysocks, pytest-mock, pytest-xdist, pytestCheckHook, pythonOlder, + setuptools, urllib3, }: buildPythonPackage rec { pname = "requests"; - version = "2.32.3"; - format = "setuptools"; + version = "2.32.4"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; __darwinAllowLocalNetworking = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-VTZUF3NOsYJVWQqf+euX6eHaho1MzWQCOZ6vaK8gp2A="; + src = fetchFromGitHub { + owner = "psf"; + repo = "requests"; + tag = "v${version}"; + hash = "sha256-sD9GLCAa3y9L1J+fcd+ZXBtW4jNL40hOesKXORhcjGQ="; }; patches = [ # https://github.com/psf/requests/issues/6730 # https://github.com/psf/requests/pull/6731 ./ca-load-regression.patch - - # https://seclists.org/fulldisclosure/2025/Jun/2 - ./CVE-2024-47081.patch ]; + build-system = [ setuptools ]; + dependencies = [ certifi charset-normalizer diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index 30028c1921fe..601cee0c3b51 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "2.10.0"; + version = "2.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; tag = "v${version}"; - hash = "sha256-K/Wk1TZWurhSm3fIAijO+L1ao4pURnlthwxdkI6yZWM="; + hash = "sha256-ubStw6SphRabXIaRDMXMbki4pkg9Wjt/J0CinQvytz4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/restructuredtext-lint/default.nix b/pkgs/development/python-modules/restructuredtext-lint/default.nix index 29249205de92..add3298e2a2f 100644 --- a/pkgs/development/python-modules/restructuredtext-lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext-lint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "restructuredtext_lint/test/test.py" ]; + enabledTestPaths = [ "restructuredtext_lint/test/test.py" ]; pythonImportsCheck = [ "restructuredtext_lint" ]; diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix index 1d426b3558fa..874878308f11 100644 --- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/*.py" ]; + enabledTestPaths = [ "tests/*.py" ]; disabledTests = [ # This test fail for unknown reason, I suspect it to be flaky. diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 15e766dd0a83..109fc786e775 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "robotframework-databaselibrary"; - version = "2.1.3"; + version = "2.1.4"; pyproject = true; src = fetchFromGitHub { owner = "MarketSquare"; repo = "Robotframework-Database-Library"; tag = "v.${version}"; - hash = "sha256-XsRXQU31Q2iGUMJgDvIIcSsT8guALZO5tnIjwGLR8+Q="; + hash = "sha256-ZZOhGZTJGWYCHyvJXDYGn9BMuPioCVIu0KONGkXsRmk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index f5a7a7183eea..7cb634b02c1e 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "RequestsLibrary" ]; - pytestFlagsArray = [ "utests" ]; + enabledTestPaths = [ "utests" ]; meta = with lib; { description = "Robot Framework keyword library wrapper around the HTTP client library requests"; diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 048822afb1d0..8a0ba517280d 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test" ]; + enabledTestPaths = [ "test" ]; pythonImportsCheck = [ "robottools" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index b14f11541b29..7f30ea89797a 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.3.1"; + version = "7.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; tag = "v${version}"; - hash = "sha256-gcmHud5HPDwRSXX3VD+mpeD2ySdV6BIhfPfvDdz9OsQ="; + hash = "sha256-JxZI0i9Aj/TX4BkIi+jeBdTy0ckv5Fdy5tHRI9vQ8Ss="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rpcq/default.nix b/pkgs/development/python-modules/rpcq/default.nix index 19bd05550ca5..f7a1eac3d304 100644 --- a/pkgs/development/python-modules/rpcq/default.nix +++ b/pkgs/development/python-modules/rpcq/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ # Don't run tests that spin-up a zmq server "rpcq/test/test_base.py" "rpcq/test/test_spec.py" diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index b0043a841bd5..f88db017d3b3 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; disabledTests = [ # TypeError: loads() got an unexpected keyword argument 'name' diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix index 3e7edbb6e8a1..e98c04b4fa7b 100644 --- a/pkgs/development/python-modules/ruyaml/default.nix +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -35,9 +35,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; pythonImportsCheck = [ "ruyaml" ]; diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index 8239d9ab4247..92de3c61d677 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -90,7 +90,9 @@ buildPythonPackage rec { pytestCheckHook torch ]; - pytestFlagsArray = [ "tests" ]; + + enabledTestPaths = [ "tests" ]; + disabledTests = [ # AttributeError: module 'torch' has no attribute 'float4_e2m1fn_x2' "test_odd_dtype_fp4" @@ -103,6 +105,7 @@ buildPythonPackage rec { # != 'Erro[41 chars] 5]: SliceOutOfRange { dim_index: 1, asked: 20, dim_size: 5 }' "test_numpy_slice" ]; + # don't require PaddlePaddle (not in Nixpkgs), Flax, or Tensorflow (onerous) to run tests: disabledTestPaths = [ diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix index 8c2d80ae32e8..af289bac323c 100644 --- a/pkgs/development/python-modules/sagemaker-core/default.nix +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sagemaker-core"; - version = "1.0.41"; + version = "1.0.42"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-core"; tag = "v${version}"; - hash = "sha256-XW7BJZc4VZiWe2d1p8MySYXWhzkwe0YjuPGwyswYUjY="; + hash = "sha256-To4VjTuE9fkVQSXR1k6NMAjrByzFhAidvui8w+etOQc="; }; build-system = [ diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index 0b110511c70b..1f68eb22dd6d 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { preCheck = "rm test/test_pictorial.ipynb"; # Tries to download files - pytestFlagsArray = [ "--nbval-lax" ]; + pytestFlags = [ "--nbval-lax" ]; pythonImportsCheck = [ "schemdraw" ]; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 901d94e374fa..3da89a537923 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # only the $out dir contains the built cython extensions, so we run the tests inside there - pytestFlagsArray = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; + enabledTestPaths = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; disabledTestPaths = [ # don't know why, but this segfaults diff --git a/pkgs/development/python-modules/scikit-learn-extra/default.nix b/pkgs/development/python-modules/scikit-learn-extra/default.nix index 95cdcce5d10e..1d7ff13472a6 100644 --- a/pkgs/development/python-modules/scikit-learn-extra/default.nix +++ b/pkgs/development/python-modules/scikit-learn-extra/default.nix @@ -42,7 +42,10 @@ buildPythonPackage rec { rm -r sklearn_extra ''; - pytestFlagsArray = [ "--pyargs sklearn_extra" ]; + pytestFlags = [ + "--pyargs" + "sklearn_extra" + ]; disabledTestPaths = [ "benchmarks" "examples" diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index ac73ec1f4b9c..319d7c71e7f2 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -79,6 +79,12 @@ buildPythonPackage rec { [ # Skip test_feature_importance_regression - does web fetch "test_feature_importance_regression" + + # Fail due to new deprecation warnings in scipy + # FIXME: reenable when fixed upstream + "test_logistic_regression_path_convergence_fail" + "test_linalg_warning_with_newton_solver" + "test_newton_cholesky_fallback_to_lbfgs" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # doesn't seem to produce correct results? diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index 4fd972b25995..bb834dac7c77 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -59,7 +59,10 @@ buildPythonPackage rec { cd "$(mktemp -d)" ''; - pytestFlagsArray = [ "--pyargs skmisc" ]; + pytestFlags = [ + "--pyargs" + "skmisc" + ]; pythonImportsCheck = [ "skmisc" ]; diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix index 3a64ae17a484..ce38381ca3ef 100644 --- a/pkgs/development/python-modules/scipy-stubs/default.nix +++ b/pkgs/development/python-modules/scipy-stubs/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "scipy-stubs"; - version = "1.16.0.0"; + version = "1.16.0.2"; pyproject = true; src = fetchFromGitHub { owner = "scipy"; repo = "scipy-stubs"; tag = "v${version}"; - hash = "sha256-LuBypvtbLp7Zo8Rou1JwBwJjZr0BBic25dhX5Yg1Esk="; + hash = "sha256-xaBii3vONwfHlrsLr+uvXvirZ2WT1OgUzlYxRIRnGdI="; }; disabled = pythonOlder "3.11"; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index f6eccfe6da32..f08228330bc7 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -48,8 +48,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.15.3"; - srcHash = "sha256-97z5CLRq/2kWjL2+ewHRA71vSfvCLHVJdOUZfDFnyhM="; + version = "1.16.0"; + srcHash = "sha256-PFWUq7RsqMgBK1bTw52y1renoPygWNreikNTFHWE2Ig="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -104,7 +104,7 @@ buildPythonPackage { # that override globally the `numpy` attribute to point to `numpy_1`. postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "numpy>=2.0.0,<2.5" numpy + --replace-fail "numpy>=2.0.0,<2.6" numpy ''; build-system = @@ -119,7 +119,7 @@ buildPythonPackage { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Minimal version required according to: - # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188 + # https://github.com/scipy/scipy/blob/v1.16.0/scipy/meson.build#L238-L244 (xcbuild.override { sdkVer = "13.3"; }) @@ -143,23 +143,17 @@ buildPythonPackage { pytest-xdist ]; - disabledTests = - [ - "test_cumulative_simpson_against_simpson_with_default_dx" - # https://github.com/scipy/scipy/issues/22789 - "test_funcs" - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - # The following tests are broken on aarch64-darwin with newer compilers and library versions. - # See https://github.com/scipy/scipy/issues/18308 - "test_a_b_neg_int_after_euler_hypergeometric_transformation" - "test_dst4_definition_ortho" - "test_load_mat4_le" - "hyp2f1_test_case47" - "hyp2f1_test_case3" - "test_uint64_max" - "test_large_m4" # https://github.com/scipy/scipy/issues/22466 - ]; + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # The following tests are broken on aarch64-darwin with newer compilers and library versions. + # See https://github.com/scipy/scipy/issues/18308 + "test_a_b_neg_int_after_euler_hypergeometric_transformation" + "test_dst4_definition_ortho" + "test_load_mat4_le" + "hyp2f1_test_case47" + "hyp2f1_test_case3" + "test_uint64_max" + "test_large_m4" # https://github.com/scipy/scipy/issues/22466 + ]; doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index a702ab5589c0..6960ea7fd2b4 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { patches = [ ./fix_test_generate.patch ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "src/seqdiag/tests/" ]; + enabledTestPaths = [ "src/seqdiag/tests/" ]; pythonImportsCheck = [ "seqdiag" ]; diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index 4d1c79fda5ab..d70d38f0d451 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace "boto3~=1.9, >=1.9.56" "boto3" ''; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; pythonImportsCheck = [ "serverlessrepo" ]; diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index a53df0fb0a58..cbf498154e96 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "setuptools_scm_git_archive" ]; diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 3935e6ed1474..e507aa2dc5d5 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; # A test needs the HOME directory to be different from $TMPDIR. preCheck = '' diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix index 823f8247e34d..1737c0b52090 100644 --- a/pkgs/development/python-modules/signxml/default.nix +++ b/pkgs/development/python-modules/signxml/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "signxml" ]; - pytestFlagsArray = [ "test/test.py" ]; + enabledTestPaths = [ "test/test.py" ]; meta = with lib; { description = "Python XML Signature and XAdES library"; diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 178782630f75..83548517b28f 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test_simpleeval.py" ]; + enabledTestPaths = [ "test_simpleeval.py" ]; pythonImportsCheck = [ "simpleeval" ]; diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix index 8cb89a0d4966..391701e6ca24 100644 --- a/pkgs/development/python-modules/simplesat/default.nix +++ b/pkgs/development/python-modules/simplesat/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { --replace-fail "assertRaisesRegexp" "assertRaisesRegex" ''; - pytestFlagsArray = [ "simplesat/tests" ]; + enabledTestPaths = [ "simplesat/tests" ]; meta = with lib; { description = "Prototype for SAT-based dependency handling"; diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix index e04394dc3f93..6e7e889d9d10 100644 --- a/pkgs/development/python-modules/simsimd/default.nix +++ b/pkgs/development/python-modules/simsimd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "simsimd"; - version = "6.4.9"; + version = "6.5.0"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "simsimd"; tag = "v${version}"; - hash = "sha256-q992FqXRmsMk3PJ/b3+BQcytitlDdk3hcLWRrZIZFXY="; + hash = "sha256-un3Wyvj1vwhDiai2FSflkEYOpLbeH7aFznDilB7cupU="; }; build-system = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { tabulate ]; - pytestFlagsArray = [ + enabledTestPaths = [ "scripts/test.py" ]; diff --git a/pkgs/development/python-modules/siphash24/default.nix b/pkgs/development/python-modules/siphash24/default.nix index f700a76b6123..f7255c9aa387 100644 --- a/pkgs/development/python-modules/siphash24/default.nix +++ b/pkgs/development/python-modules/siphash24/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { "siphash24" ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sismic/default.nix b/pkgs/development/python-modules/sismic/default.nix index 82c76e43eba9..1d61ad2689c9 100644 --- a/pkgs/development/python-modules/sismic/default.nix +++ b/pkgs/development/python-modules/sismic/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { pythonImportsCheck = [ "sismic" ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; disabledTests = [ # Time related tests, might lead to flaky tests on slow/busy machines diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index 90a37ba3bba4..dc049fe200f3 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pytest-cov-stub streamlit ]; - pytestFlagsArray = [ "skops" ]; + enabledTestPaths = [ "skops" ]; disabledTests = [ # flaky "test_base_case_works_as_expected" diff --git a/pkgs/development/python-modules/slovnet/default.nix b/pkgs/development/python-modules/slovnet/default.nix index 182b0475766a..2800ae54bf47 100644 --- a/pkgs/development/python-modules/slovnet/default.nix +++ b/pkgs/development/python-modules/slovnet/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { razdel ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; disabledTestPaths = [ # Tries to download model binary artifacts: "tests/test_api.py" diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 475835eb6948..45632ab37969 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { responses ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ "smart_open" ]; + enabledTestPaths = [ "smart_open" ]; disabledTests = [ # https://github.com/RaRe-Technologies/smart_open/issues/784 diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index bba548d81860..a9cef0233048 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, isPyPy, setuptools, docutils, @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "smartypants"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; disabled = isPyPy; @@ -21,18 +20,9 @@ buildPythonPackage rec { owner = "leohemsted"; repo = "smartypants.py"; tag = "v${version}"; - hash = "sha256-V1rV1B8jVADkS0NhnDkoVz8xxkqrsIHb1mP9m5Z94QI="; + hash = "sha256-jSGiT36Rr0P6eEWZIHtMj4go3KGDRaF2spLxLNruDec="; }; - patches = [ - (fetchpatch2 { - # https://github.com/leohemsted/smartypants.py/pull/21 - name = "smartypants-3.12-compat.patch"; - url = "https://github.com/leohemsted/smartypants.py/commit/ea46bf36343044a7a61ba3acce4a7f188d986ec5.patch"; - hash = "sha256-9lsiiZKFFKHLy7j3y9ff4gt01szY+2AHpWPAKQgKwZg="; - }) - ]; - build-system = [ setuptools ]; nativeCheckInputs = [ @@ -45,12 +35,12 @@ buildPythonPackage rec { patchShebangs smartypants ''; - meta = with lib; { - description = "Python with the SmartyPants"; + meta = { + description = "Translate plain ASCII quotation marks and other characters into “smart” typographic HTML entities"; homepage = "https://github.com/leohemsted/smartypants.py"; changelog = "https://github.com/leohemsted/smartypants.py/blob/v${version}/CHANGES.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dotlambda ]; mainProgram = "smartypants"; }; } diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index d6ecd04ce4f9..3ec3baca2d5a 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "snakemake_interface_common" ]; - pytestFlagsArray = [ "tests/tests.py" ]; + enabledTestPaths = [ "tests/tests.py" ]; meta = with lib; { description = "Common functions and classes for Snakemake and its plugins"; diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix index 5be194ba2de6..4cd34e9cffaa 100644 --- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-interface-report-plugins"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake-interface-report-plugins"; tag = "v${version}"; - hash = "sha256-yk2fYlueaobXJgF7ob6jTccEz8r0geq1HFVsa+ZO30Q="; + hash = "sha256-PSybPYo7soq7GHY7mo9q0yGxoFX2pvVeAXgRsa6oXoo="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 8b00710680f3..0005433a36ef 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -59,11 +59,10 @@ buildPythonPackage rec { cd build/lib ''; - pytestFlagsArray = [ + pytestFlags = [ # FutureWarning: Can't acquire a memory view of a Dask array. This will raise in the future # https://github.com/radio-astro-tools/spectral-cube/issues/943 - "-W" - "ignore::FutureWarning" + "-Wignore::FutureWarning" ]; disabledTests = diff --git a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix index be6b4698f1b5..ec2be51de60e 100644 --- a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sphinx ]; - pytestFlagsArray = [ "tests/build.py" ]; + enabledTestPaths = [ "tests/build.py" ]; pythonImportsCheck = [ "sphinx_rtd_dark_mode" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 377682ae2529..3e1f64080743 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-bibtex"; - version = "2.6.3"; + version = "2.6.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mcmtroffaes"; repo = "sphinxcontrib-bibtex"; tag = version; - hash = "sha256-cqz5Jamtlflo5rFhWPCPlYoymApUtXPG4oTRjfDI+WY="; + hash = "sha256-sT23DkIfJcb3cFBFdL31RRzlDoJRcCUYIdpUVuYjGuo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 556f21fba780..779dd51505c8 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "3.1.0a1"; + version = "3.1.0a2"; pyproject = true; src = fetchFromGitHub { owner = "spyder-ide"; repo = "spyder-kernels"; tag = "v${version}"; - hash = "sha256-/Dd+yCLctOC7ao26EU6LrhBD1SKGd84XLepMdDJnFow="; + hash = "sha256-3P4id66b/URu1iNgLr0TWUz0xToqslhdIw52QCMbsMI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 4e0370f9c44b..b1bdd3a7f606 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -92,9 +92,8 @@ buildPythonPackage rec { "test_render_mock_ddl" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; pythonImportsCheck = [ "sqlalchemy_utils" ]; diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index 481f45860068..df01743ef358 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sqlitedict" ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; meta = with lib; { description = "Persistent, thread-safe dict"; diff --git a/pkgs/development/python-modules/sseclient-py/default.nix b/pkgs/development/python-modules/sseclient-py/default.nix index b8ea4f4053f3..8f50c2aa38a9 100644 --- a/pkgs/development/python-modules/sseclient-py/default.nix +++ b/pkgs/development/python-modules/sseclient-py/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sseclient" ]; - pytestFlagsArray = [ "tests/unittests.py" ]; + enabledTestPaths = [ "tests/unittests.py" ]; meta = with lib; { description = "Pure-Python Server Side Events (SSE) client"; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 1033df5d7220..ad9b7c7d56a1 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -58,13 +58,10 @@ buildPythonPackage rec { typing-extensions ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" - "-W" - "ignore::trio.TrioDeprecationWarning" - "-W" - "ignore::ResourceWarning" # FIXME remove once test suite is fully compatible with anyio 4.4.0 + pytestFlags = [ + "-Wignore::DeprecationWarning" + "-Wignore::trio.TrioDeprecationWarning" + "-Wignore::ResourceWarning" # FIXME remove once test suite is fully compatible with anyio 4.4.0 ]; pythonImportsCheck = [ "starlette" ]; diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index 72b34c80524d..d6cdb3ef4d65 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "statsd/tests.py" ]; + enabledTestPaths = [ "statsd/tests.py" ]; meta = with lib; { maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index f7fccd9e43aa..0499b856422f 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.14.4"; + version = "0.14.5"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-XWng85Bg3HLAZ/m7boAzttzNsLrhAddqfvC8yU6Ji2c="; + hash = "sha256-3iYOWMzP0s7d+DW1WjVyM9bKhToapPkPdVOlLMccbd8="; }; build-system = [ diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix index 4fbb1a4b394d..8df37c45ac8e 100644 --- a/pkgs/development/python-modules/stim/default.nix +++ b/pkgs/development/python-modules/stim/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - pytestFlagsArray = [ + enabledTestPaths = [ # From .github/workflows "src/" "glue/cirq" diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 10d5e35c6e2d..42dc18d593f2 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; meta = with lib; { description = "Flash firmware to STM32 microcontrollers in Python"; diff --git a/pkgs/development/python-modules/streaming-form-data/default.nix b/pkgs/development/python-modules/streaming-form-data/default.nix index 12d8b464ab73..95fa920e8fdf 100644 --- a/pkgs/development/python-modules/streaming-form-data/default.nix +++ b/pkgs/development/python-modules/streaming-form-data/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests-toolbelt ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; pythonImportsCheck = [ "streaming_form_data" ]; diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index 32170ae34794..dd281a1d85f2 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "scripts/test.py" ]; + enabledTestPaths = [ "scripts/test.py" ]; meta = { changelog = "https://github.com/ashvardanian/StringZilla/releases/tag/${src.tag}"; diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 383325b15e0b..08dd9f0a0785 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "stumpy" ]; - pytestFlagsArray = [ + enabledTestPaths = [ # whole testsuite is very CPU intensive, only run core tests # TODO: move entire test suite to passthru.tests "tests/test_core.py" diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index b101ec505aeb..d1dec1faaa66 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -50,7 +50,7 @@ buildPythonPackage { pytestCheckHook ]; - pytestFlagsArray = [ "python/subunit" ]; + enabledTestPaths = [ "python/subunit" ]; disabledTestPaths = [ # these tests require testtools and don't work with pytest diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 54a9a59accf7..2eea23f6582a 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -145,9 +145,8 @@ buildPythonPackage rec { "sunpy/io/setup_package.py" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; # Wants a configuration file diff --git a/pkgs/development/python-modules/svgdigitizer/default.nix b/pkgs/development/python-modules/svgdigitizer/default.nix new file mode 100644 index 000000000000..e66a37255080 --- /dev/null +++ b/pkgs/development/python-modules/svgdigitizer/default.nix @@ -0,0 +1,84 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + stdenv, + + # build-system + setuptools, + + # dependencies + astropy, + click, + frictionless, + matplotlib, + mergedeep, + pandas, + pillow, + pybtex, + pymupdf, + pyyaml, + scipy, + svg-path, + svgpathtools, + svgwrite, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "svgdigitizer"; + version = "0.12.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "echemdb"; + repo = "svgdigitizer"; + tag = version; + hash = "sha256-aodPjms92+/6bbheIs/8w+M4T+mfw5PWf1dsxFuojwA="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + astropy + click + frictionless + matplotlib + mergedeep + pandas + pillow + pybtex + pymupdf + pyyaml + scipy + svg-path + svgpathtools + svgwrite + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + pytestFlags = [ + "--doctest-modules" + "svgdigitizer" + ]; + + pythonImportsCheck = [ + "svgdigitizer" + ]; + + meta = { + description = "(x,y) Data Points from SVG files"; + homepage = "https://github.com/echemdb/svgdigitizer"; + changelog = "https://github.com/echemdb/svgdigitizer/blob/${src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ doronbehar ]; + # https://github.com/echemdb/svgdigitizer/issues/252 + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/svgpathtools/default.nix b/pkgs/development/python-modules/svgpathtools/default.nix new file mode 100644 index 000000000000..abd043fed018 --- /dev/null +++ b/pkgs/development/python-modules/svgpathtools/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + numpy, + scipy, + svgwrite, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "svgpathtools"; + version = "1.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mathandy"; + repo = "svgpathtools"; + tag = "v${version}"; + hash = "sha256-SzYssDJ+uGb5zXZ16XaMCvIPF8BKJ4VVI/gUghz1IyA="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + scipy + svgwrite + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "svgpathtools" + ]; + + meta = { + description = "A collection of tools for manipulating and analyzing SVG Path objects and Bezier curves"; + homepage = "https://github.com/mathandy/svgpathtools"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix index 6672a3054cdb..0239a7e021b2 100644 --- a/pkgs/development/python-modules/swh-objstorage/default.nix +++ b/pkgs/development/python-modules/swh-objstorage/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "swh.objstorage" ]; - pytestFlagsArray = [ "swh/objstorage/tests" ]; + enabledTestPaths = [ "swh/objstorage/tests" ]; nativeCheckInputs = [ aiohttp diff --git a/pkgs/development/python-modules/symbolic/default.nix b/pkgs/development/python-modules/symbolic/default.nix index 9f2ae618135a..d5d7fd24905b 100644 --- a/pkgs/development/python-modules/symbolic/default.nix +++ b/pkgs/development/python-modules/symbolic/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "py" ]; + enabledTestPaths = [ "py" ]; pythonImportsCheck = [ "symbolic" ]; diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix index 8fd7fc89bb66..dcc0765dada0 100644 --- a/pkgs/development/python-modules/systembridgeconnector/default.nix +++ b/pkgs/development/python-modules/systembridgeconnector/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { "test_wait_for_response_timeout" ]; - pytestFlagsArray = [ "--snapshot-warn-unused" ]; + pytestFlags = [ "--snapshot-warn-unused" ]; meta = { changelog = "https://github.com/timmo001/system-bridge-connector/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix index aabc71b724a3..69d876ab2d2d 100644 --- a/pkgs/development/python-modules/systembridgemodels/default.nix +++ b/pkgs/development/python-modules/systembridgemodels/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { "test_update" ]; - pytestFlagsArray = [ "--snapshot-warn-unused" ]; + pytestFlags = [ "--snapshot-warn-unused" ]; meta = { changelog = "https://github.com/timmo001/system-bridge-models/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index d2c43108acd3..2d4e63824622 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit-tests/" ]; + enabledTestPaths = [ "tests/unit-tests/" ]; pythonImportsCheck = [ "teamcity" ]; diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix index 836ff7ff3879..fedcc91a0d26 100644 --- a/pkgs/development/python-modules/telegraph/default.nix +++ b/pkgs/development/python-modules/telegraph/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; disabledTests = [ "test_get_page" ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 6cf1fd6b5fd4..fd93658c84ca 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tencentcloud" ]; - pytestFlagsArray = [ "tests/unit/" ]; + enabledTestPaths = [ "tests/unit/" ]; meta = with lib; { description = "Tencent Cloud API 3.0 SDK for Python"; diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index e5d4b6042e7d..66cc02861228 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -19,6 +19,7 @@ numpy, orjson, packaging, + pyvers, torch, # tests @@ -28,14 +29,14 @@ buildPythonPackage rec { pname = "tensordict"; - version = "0.8.3"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "tensordict"; tag = "v${version}"; - hash = "sha256-d/6JKGFcFLXY9pxsnP27uwnAnIQ9EKvfTS30DCwQrCM="; + hash = "sha256-OdS9dw/BtSLZuY857O2njlFOMQj5IJ6v9c2aRP+H1Hc="; }; build-system = [ @@ -56,6 +57,7 @@ buildPythonPackage rec { numpy orjson packaging + pyvers torch ]; diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 72d202322eb8..b6e4534c0e8a 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "tensorly.contrib" ]; - pytestFlagsArray = [ "tensorly" ]; + enabledTestPaths = [ "tensorly" ]; disabledTests = [ # this can fail on hydra and other peoples machines, check with others before re-enabling diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix index d4b6a15b86ae..e9e60684fbd2 100644 --- a/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { "test_parse_endpoint" ]; - pytestFlagsArray = [ "tests/unit" ]; + enabledTestPaths = [ "tests/unit" ]; pythonImportsCheck = [ "tesla_powerwall" ]; diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index aa7608b5e62c..d28de79e9d91 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tess/tests.py" ]; + enabledTestPaths = [ "tess/tests.py" ]; preCheck = '' cd $out/${python.sitePackages} diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 409435d4a533..0cc3d187af0b 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "testfixtures/tests/test_django" ]; - pytestFlagsArray = [ "testfixtures/tests" ]; + enabledTestPaths = [ "testfixtures/tests" ]; pythonImportsCheck = [ "testfixtures" ]; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 31e94229e771..d65a9c120e9f 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ # Almost all tests have to deal with downloading a dataset, only test pure tests "tests/test_constants.py" "tests/preprocessing/test_normalize.py" diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix index 127c6f453a92..d5dacef7917c 100644 --- a/pkgs/development/python-modules/textstat/default.nix +++ b/pkgs/development/python-modules/textstat/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { "textstat" ]; - pytestFlagsArray = [ + enabledTestPaths = [ "test.py" ]; diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index 82ebb624d73e..ccf7f474336c 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "texttable" ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; meta = with lib; { description = "Module to generate a formatted text table, using ASCII characters"; diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 8ab0f653b73d..33410f6c2ce8 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "textual"; - version = "3.7.1"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-ceA4Mv/oq4tZRC8rY6xkpuAcS/f3GXcY891EoOCES/M="; + hash = "sha256-rVDr4Snp5qnErxWRM9yoxnzzX8gg8nD3RbBkL1rmgqI="; }; build-system = [ poetry-core ]; @@ -77,15 +77,9 @@ buildPythonPackage rec { disabledTests = [ # Assertion issues "test_textual_env_var" - - # Fail since tree-sitter-markdown was updated to 0.5.0 - # ValueError: Incompatible Language version 15. Must be between 13 and 14 - # https://github.com/Textualize/textual/issues/5868 - "test_setting_builtin_language_via_attribute" - "test_setting_builtin_language_via_constructor" ]; - pytestFlagsArray = [ + pytestFlags = [ # Some tests in groups require state from previous tests # See https://github.com/Textualize/textual/issues/4924#issuecomment-2304889067 "--dist=loadgroup" @@ -101,5 +95,7 @@ buildPythonPackage rec { changelog = "https://github.com/Textualize/textual/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gepbird ]; + # https://github.com/Textualize/textual/issues/5868 + broken = true; }; } diff --git a/pkgs/development/python-modules/textx/tests.nix b/pkgs/development/python-modules/textx/tests.nix index ff1c888d2dbb..00223ee6ac8f 100644 --- a/pkgs/development/python-modules/textx/tests.nix +++ b/pkgs/development/python-modules/textx/tests.nix @@ -45,7 +45,7 @@ buildPythonPackage { textx-types-dsl ]; - pytestFlagsArray = [ "tests/functional" ]; + enabledTestPaths = [ "tests/functional" ]; disabledTests = [ "test_examples" # assertion error: 0 == 12 ]; diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix index 08bc01676832..7c3281338126 100644 --- a/pkgs/development/python-modules/throttler/default.nix +++ b/pkgs/development/python-modules/throttler/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; disabledTestPaths = [ # time sensitive tests diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix index 107b8bee5886..b5b8bb6aaec1 100644 --- a/pkgs/development/python-modules/timeago/default.nix +++ b/pkgs/development/python-modules/timeago/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test/testcase.py" ]; + enabledTestPaths = [ "test/testcase.py" ]; pythonImportsCheck = [ "timeago" ]; diff --git a/pkgs/development/python-modules/timeslot/default.nix b/pkgs/development/python-modules/timeslot/default.nix index 0b60dd3cc004..e8e1673b14a0 100644 --- a/pkgs/development/python-modules/timeslot/default.nix +++ b/pkgs/development/python-modules/timeslot/default.nix @@ -27,11 +27,11 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ + pytestFlags = [ # The pyproject.toml specifies the flag `--cov=timeslot`, # This causes an error when running without pytest-cov, # so use this flag to override that option, as we don't need coverage. - "--override-ini addopts=''" + "--override-ini=addopts=" ]; pythonImportsCheck = [ "timeslot" ]; diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index b93e00cbf64f..eca27fbca2d1 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pytest-timeout ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: diff --git a/pkgs/development/python-modules/tinyrecord/default.nix b/pkgs/development/python-modules/tinyrecord/default.nix index 6b883f6721d7..14c994df25b6 100644 --- a/pkgs/development/python-modules/tinyrecord/default.nix +++ b/pkgs/development/python-modules/tinyrecord/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { tinydb ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "tinyrecord" ]; diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 4fd97242ccd3..4573f1d27679 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "titlecase/tests.py" ]; + enabledTestPaths = [ "titlecase/tests.py" ]; pythonImportsCheck = [ "titlecase" ]; diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index c0e7cf37db56..f12d2dae9421 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -17,12 +17,26 @@ torch, # optional-dependencies - ale-py, - gym, - pygame, - torchsnapshot, + # atari gymnasium, + # checkpointing + torchsnapshot, + # gym-continuous mujoco, + # llm + accelerate, + datasets, + einops, + immutabledict, + langdetect, + nltk, + playwright, + protobuf, + safetensors, + sentencepiece, + transformers, + vllm, + # offline-data h5py, huggingface-hub, minari, @@ -32,7 +46,9 @@ scikit-learn, torchvision, tqdm, + # rendering moviepy, + # utils git, hydra-core, tensorboard, @@ -48,14 +64,14 @@ buildPythonPackage rec { pname = "torchrl"; - version = "0.8.1"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "rl"; tag = "v${version}"; - hash = "sha256-ANoqIAVKSq023hG83Q71t8oLzud1LeVN5WVPYL3nOks="; + hash = "sha256-afaWDX5lIAoGTfrBSqrktYoA1S4hv6ogBaKYHc8dQ6E="; }; build-system = [ @@ -73,16 +89,26 @@ buildPythonPackage rec { ]; optional-dependencies = { - atari = [ - ale-py - gym - pygame - ]; + atari = gymnasium.optional-dependencies.atari; checkpointing = [ torchsnapshot ]; gym-continuous = [ gymnasium mujoco ]; + llm = [ + accelerate + datasets + einops + immutabledict + langdetect + nltk + playwright + protobuf + safetensors + sentencepiece + transformers + vllm + ]; offline-data = [ h5py huggingface-hub @@ -131,10 +157,31 @@ buildPythonPackage rec { ] ++ optional-dependencies.atari ++ optional-dependencies.gym-continuous + ++ optional-dependencies.llm ++ optional-dependencies.rendering; disabledTests = [ + # Require network + "test_create_or_load_dataset" + "test_from_text_env_tokenizer" + "test_from_text_env_tokenizer_catframes" + "test_from_text_rb_slicesampler" + "test_generate" + "test_get_dataloader" + "test_get_scores" + "test_preproc_data" + "test_prompt_tensordict_tokenizer" + "test_reward_model" + "test_tensordict_tokenizer" + "test_transform_compose" + "test_transform_model" + "test_transform_no_env" + "test_transform_rb" + + # ray.exceptions.RuntimeEnvSetupError: Failed to set up runtime environment + "TestRayCollector" + # torchrl is incompatible with gymnasium>=1.0 # https://github.com/pytorch/rl/discussions/2483 "test_resetting_strategies" @@ -194,6 +241,16 @@ buildPythonPackage rec { "test_vecnorm_parallel_auto" ]; + disabledTestPaths = [ + # ERROR collecting test/smoke_test.py + # import file mismatch: + # imported module 'smoke_test' has this __file__ attribute: + # /build/source/test/llm/smoke_test.py + # which is not the same as the test file we want to collect: + # /build/source/test/smoke_test.py + "test/llm" + ]; + meta = { description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning"; homepage = "https://github.com/pytorch/rl"; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 88b3d70531a3..3ebf8baac17c 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -41,11 +41,9 @@ buildPythonPackage rec { pandas ]; - pytestFlagsArray = [ - "-W" - "ignore::FutureWarning" - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::FutureWarning" + "-Wignore::DeprecationWarning" ]; # Remove performance testing. diff --git a/pkgs/development/python-modules/tree-sitter-markdown/default.nix b/pkgs/development/python-modules/tree-sitter-markdown/default.nix index eacbdcaf2675..8f9584b13475 100644 --- a/pkgs/development/python-modules/tree-sitter-markdown/default.nix +++ b/pkgs/development/python-modules/tree-sitter-markdown/default.nix @@ -9,14 +9,15 @@ buildPythonPackage rec { pname = "tree-sitter-markdown"; - version = "0.5.0"; + # only update to the latest version on PyPI + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-markdown"; tag = "v${version}"; - hash = "sha256-I9KDE1yZce8KIGPLG5tmv5r/NCWwN95R6fIyvGdx+So="; + hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8="; }; build-system = [ @@ -41,6 +42,9 @@ buildPythonPackage rec { homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"; changelog = "https://github.com/tree-sitter-grammars/tree-sitter-markdown/releases/tag/${src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + gepbird + ]; }; } diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix index 8820bd0680b4..f720341200b1 100644 --- a/pkgs/development/python-modules/tree-sitter-rust/default.nix +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tree-sitter-rust"; - version = "0.23.2"; + version = "0.24.0"; pyproject = true; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; tag = "v${version}"; - hash = "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc="; + hash = "sha256-y3sJURlSTM7LRRN5WGIAeslsdRZU522Tfcu6dnXH/XQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/tree-sitter-yaml/default.nix b/pkgs/development/python-modules/tree-sitter-yaml/default.nix index e212ea8b0e0d..261118b68894 100644 --- a/pkgs/development/python-modules/tree-sitter-yaml/default.nix +++ b/pkgs/development/python-modules/tree-sitter-yaml/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "tree-sitter-yaml"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; tag = "v${version}"; - hash = "sha256-23/zcjnQUQt32N2EdQMzWM9srkXfQxlBvOo7FWH6rnw="; + hash = "sha256-Z2L/aQWIyZ8cSqbfjm/i10fJP++yZ2tZgho0U3asA0g="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Rxjimtp5Lg0x8wgWvyyCepMJipPdc0TplxznrF9COtM="; + hash = "sha256-QvqvyjnCgSuSiiY4SB5nB9S7LnGP1F+tySxue359SWY="; }; build-system = [ diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index 1ca0885a73ac..19f839ffcb61 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "tree-sitter"; - version = "0.24.0"; + version = "0.24.0-unstable-2025-06-02"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter"; repo = "py-tree-sitter"; - tag = "v${version}"; - hash = "sha256-ZDt/8suteaAjGdk71l8eej7jDkkVpVDBIZS63SA8tsU="; + rev = "9c78f3b8d10f81b97fbb2181c9333323d6375480"; + hash = "sha256-jPqTraGrYFXBlci4Zaleyp/NTQhvuI39tYWRckjnV2E="; fetchSubmodules = true; }; @@ -56,11 +56,21 @@ buildPythonPackage rec { "test_dot_graphs" ]; - meta = { - description = "Python bindings to the Tree-sitter parsing library"; - homepage = "https://github.com/tree-sitter/py-tree-sitter"; - changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/${src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; - }; + meta = + let + # for an -unstable version, we grab the release notes for the last tagged + # version it is based upon + lastTag = lib.pipe version [ + lib.splitVersion + (lib.take 3) + (lib.concatStringsSep ".") + ]; + in + { + description = "Python bindings to the Tree-sitter parsing library"; + homepage = "https://github.com/tree-sitter/py-tree-sitter"; + changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${lastTag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; } diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 560450ea4225..b500129c05e6 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { "test_load" ]; - pytestFlagsArray = [ "tests/test_minimal.py" ]; + enabledTestPaths = [ "tests/test_minimal.py" ]; pythonImportsCheck = [ "trimesh" diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index 42464ef43cf0..8b4b901b36a4 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -41,12 +41,10 @@ buildPythonPackage rec { sniffio ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; - pytestFlagsArray = [ + pytestFlags = [ # RuntimeWarning: Can't run the Python asyncio tests because they're not installed - "-W" - "ignore::RuntimeWarning" - "-W" - "ignore::DeprecationWarning" + "-Wignore::RuntimeWarning" + "-Wignore::DeprecationWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 288e7db4add0..4d12513d021f 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -23,12 +23,13 @@ pytestCheckHook, pytest-trio, trustme, - yapf, }: let # escape infinite recursion with pytest-trio pytest-trio' = (pytest-trio.override { trio = null; }).overrideAttrs { + # `pythonRemoveDeps` is not working properly + dontCheckRuntimeDeps = true; doCheck = false; pythonImportsCheck = [ ]; }; @@ -67,7 +68,6 @@ buildPythonPackage rec { pytestCheckHook pytest-trio' trustme - yapf ]; preCheck = '' @@ -76,9 +76,8 @@ buildPythonPackage rec { PYTHONPATH=$PWD/src:$PYTHONPATH ''; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. diff --git a/pkgs/development/python-modules/trx-python/default.nix b/pkgs/development/python-modules/trx-python/default.nix index d3cefddc8e83..09c3ccab9fe6 100644 --- a/pkgs/development/python-modules/trx-python/default.nix +++ b/pkgs/development/python-modules/trx-python/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - pytestFlagsArray = [ "trx/tests" ]; + enabledTestPaths = [ "trx/tests" ]; disabledTestPaths = [ # access to network diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 3da347dc5340..45b88c075ee8 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { "test_ttp_templates_dir_env_variable" ]; - pytestFlagsArray = [ "test/pytest" ]; + enabledTestPaths = [ "test/pytest" ]; meta = with lib; { changelog = "https://github.com/dmulyalin/ttp/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix index bb7f83599ecd..2cc2de443b30 100644 --- a/pkgs/development/python-modules/tweedledum/default.nix +++ b/pkgs/development/python-modules/tweedledum/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tweedledum" ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "python/test" ]; + enabledTestPaths = [ "python/test" ]; meta = with lib; { description = "Library for synthesizing and manipulating quantum circuits"; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index b5d9cfdbb370..a9ca8f0853ce 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { ++ (lib.optional (pythonOlder "3.11") typing-extensions) ++ (lib.flatten (lib.attrValues optional-dependencies)); - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; disabledTests = [ # 1Password CLI is not available diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix index 0eae662561a1..748fe0f05016 100644 --- a/pkgs/development/python-modules/typeshed-client/default.nix +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "typeshed_client" ]; - pytestFlagsArray = [ "tests/test.py" ]; + enabledTestPaths = [ "tests/test.py" ]; meta = with lib; { description = "Retrieve information from typeshed and other typing stubs"; diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 0caba72c818d..1c222d6ddce5 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { cd $TMP ''; - pytestFlagsArray = [ + pytestFlags = [ "--pyargs" "uarray" ]; diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 0da212286f9d..ed8f25390b30 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "7.14.1"; + version = "7.14.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-e5VfG20hl+SGssNsLMoQ2ULJAcVS6gahNkC6XqRuXb0="; + hash = "sha256-amCE5y/4tAdrvlk6ZSa6QaG9XuLnFfz1ml1r/H80fdE="; }; build-system = [ poetry-core ]; @@ -91,7 +91,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; disabledTests = [ # https://127.0.0.1 vs https://127.0.0.1:0 diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index d43d050835ca..f69a6391c7fc 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlags = [ "--benchmark-disable" ]; pythonImportsCheck = [ "ulid_transform" ]; diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index 33c89f940659..2056c41979f8 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { onnxruntime ]; - pytestFlagsArray = [ + enabledTestPaths = [ # rest of the tests require internet access "tests/test_python.py" ]; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index e7bfba65d81d..89b03edc4b9d 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.2.2"; + version = "3.2.3"; pyproject = true; src = fetchFromGitHub { owner = "lmfit"; repo = "uncertainties"; tag = version; - hash = "sha256-cm0FeJCxyBLN0GCKPnscBCx9p9qCDQdwRfhBRgQIhAo="; + hash = "sha256-YapujmwTlmUfTQwHsuh01V+jqsBbTd0Q9adGNiE8Go0="; }; build-system = [ @@ -39,10 +39,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "uncertainties" ]; - meta = with lib; { - homepage = "https://pythonhosted.org/uncertainties/"; + meta = { + homepage = "https://uncertainties.readthedocs.io/"; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; - maintainers = with maintainers; [ rnhmjoj ]; - license = licenses.bsd3; + maintainers = with lib.maintainers; [ + rnhmjoj + doronbehar + ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/undetected-chromedriver/default.nix b/pkgs/development/python-modules/undetected-chromedriver/default.nix index bcb349bfe36d..7a96528c4f83 100644 --- a/pkgs/development/python-modules/undetected-chromedriver/default.nix +++ b/pkgs/development/python-modules/undetected-chromedriver/default.nix @@ -49,6 +49,6 @@ buildPythonPackage { description = "Python library for the custom Selenium ChromeDriver that passes all bot mitigation systems"; homepage = "https://github.com/ultrafunkamsterdam/undetected-chromedriver"; license = licenses.gpl3Only; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 32e7a66db70a..8f472a443515 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "slugify/tests.py" ]; + enabledTestPaths = [ "slugify/tests.py" ]; meta = with lib; { description = "Generates unicode slugs"; diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 2de32e8aacdb..317d6e524452 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlags = [ "--asyncio-mode=auto" ]; pythonImportsCheck = [ "unifi_discovery" ]; diff --git a/pkgs/development/python-modules/urwid-satext/default.nix b/pkgs/development/python-modules/urwid-satext/default.nix new file mode 100644 index 000000000000..5c4d35f1dda2 --- /dev/null +++ b/pkgs/development/python-modules/urwid-satext/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchhg, + setuptools, + urwid, +}: + +buildPythonPackage rec { + pname = "urwid-satext"; + version = "0.8.0-unstable-2023-04-08"; + pyproject = true; + + src = fetchhg { + url = "https://repos.goffi.org/urwid-satext"; + rev = "6689aa54b20cb38731c68d4d39d86d01d25c21fa"; + hash = "sha256-llCONyYV2kVVmT4EsugnW9j5X5PIeYEnnk4i5rQnE0w="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + urwid + ]; + + pythonImportsCheck = [ + "urwid_satext" + ]; + + # no pytest tests exist + doCheck = false; + + meta = { + description = "SàT extension widgets for Urwid"; + homepage = "https://libervia.org"; + changelog = "https://repos.goffi.org/urwid-satext/file/${src.rev}/CHANGELOG"; + license = lib.licenses.lgpl3Plus; + teams = with lib.teams; [ ngi ]; + maintainers = [ lib.maintainers.oluchitheanalyst ]; + }; +} diff --git a/pkgs/development/python-modules/vega-datasets/default.nix b/pkgs/development/python-modules/vega-datasets/default.nix index b7de5f6c1b65..efe73ec81ce7 100644 --- a/pkgs/development/python-modules/vega-datasets/default.nix +++ b/pkgs/development/python-modules/vega-datasets/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "--doctest-modules" ]; + pytestFlags = [ "--doctest-modules" ]; pythonImportsCheck = [ "vega_datasets" ]; diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix index 3e327a51474e..a82df635287c 100644 --- a/pkgs/development/python-modules/virt-firmware/default.nix +++ b/pkgs/development/python-modules/virt-firmware/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pkgs.systemd ]; - pytestFlagsArray = [ "tests/tests.py" ]; + enabledTestPaths = [ "tests/tests.py" ]; pythonImportsCheck = [ "virt.firmware.efi" ]; diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 42cc038834fe..041ccd2fbd40 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; meta = with lib; { description = "Module for reading vCard and vCalendar files"; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index df56f903e01e..2ed86fdeb456 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "voluptuous" ]; - pytestFlagsArray = [ "voluptuous/tests/" ]; + enabledTestPaths = [ "voluptuous/tests/" ]; meta = with lib; { description = "Python data validation library"; diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index b14ec720ea41..4b939184b93b 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test_wakeonlan.py" ]; + enabledTestPaths = [ "test_wakeonlan.py" ]; pythonImportsCheck = [ "wakeonlan" ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 47544172f33a..980982b0cd1b 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -275,7 +275,7 @@ buildPythonPackage rec { ]; # test_matplotlib_image_with_multiple_axes may take >60s - pytestFlagsArray = [ + pytestFlags = [ "--timeout=1024" ]; diff --git a/pkgs/development/python-modules/wasserstein/default.nix b/pkgs/development/python-modules/wasserstein/default.nix index c9a9495b42ef..1215d3037080 100644 --- a/pkgs/development/python-modules/wasserstein/default.nix +++ b/pkgs/development/python-modules/wasserstein/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "wasserstein/tests" ]; + enabledTestPaths = [ "wasserstein/tests" ]; disabledTestPaths = [ "wasserstein/tests/test_emd.py" # requires "ot" # cyclic dependency on energyflow diff --git a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix index fb7328d5c34f..8fee1eab7e09 100644 --- a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix +++ b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; pythonImportsCheck = [ "wcag_contrast_ratio" ]; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 42986d887fab..69fd64c3b8c5 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { "test_client_with_extra_options" ]; - pytestFlagsArray = [ + enabledTestPaths = [ "test" "mock_tests" ]; diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index 125b6b48df4d..c5874dd5c8c2 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -55,9 +55,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "wheel_inspect" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index e717e925cf16..e821fb93e80c 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.13"; + version = "4.0.14"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/8tnvJ/r0QI0o2J5X2Q5J/TgwF2TQscntl0jhPj+rLY="; + hash = "sha256-o2KbBOPtuJMhLfhiA4xyMvYpczc4adtQhK7XObQ3ta8="; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/pkgs/development/python-modules/wsme/default.nix b/pkgs/development/python-modules/wsme/default.nix index 31c2ebd9aae9..dff49eba099b 100644 --- a/pkgs/development/python-modules/wsme/default.nix +++ b/pkgs/development/python-modules/wsme/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { webtest ]; - pytestFlagsArray = [ + enabledTestPaths = [ "wsme/tests" "tests/pecantest" "tests/test_sphinxext.py" diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index ea46539a5db5..949f66bc266a 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "wurlitzer" ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; meta = with lib; { description = "Capture C-level output in context managers"; diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index db01a4abeb48..46e77b3c3acd 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -26,7 +26,8 @@ einops, transformers, timm, -#, flash-attn + #, flash-attn + openmp, }: let inherit (torch) cudaCapabilities cudaPackages cudaSupport; @@ -66,23 +67,28 @@ buildPythonPackage { stdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv; - buildInputs = lib.optionals cudaSupport ( - with cudaPackages; - [ - # flash-attn build - cuda_cudart # cuda_runtime_api.h - libcusparse # cusparse.h - cuda_cccl # nv/target - libcublas # cublas_v2.h - libcusolver # cusolverDn.h - libcurand # curand_kernel.h - ] - ); + buildInputs = + lib.optional stdenv.hostPlatform.isDarwin openmp + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + # flash-attn build + cuda_cudart # cuda_runtime_api.h + libcusparse # cusparse.h + cuda_cccl # nv/target + libcublas # cublas_v2.h + libcusolver # cusolverDn.h + libcurand # curand_kernel.h + ] + ); - nativeBuildInputs = [ - ninja - which - ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); + nativeBuildInputs = + [ + ninja + which + ] + ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]) + ++ lib.optional stdenv.hostPlatform.isDarwin openmp.dev; dependencies = [ numpy @@ -123,9 +129,5 @@ buildPythonPackage { changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ happysalada ]; - badPlatforms = [ - # fatal error: 'omp.h' file not found - lib.systems.inspect.patterns.isDarwin - ]; }; } diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 502f0a84c11d..37d8dfa2903f 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "xsdata"; - version = "25.4"; + version = "25.7"; pyproject = true; src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; tag = "v${version}"; - hash = "sha256-2sHHDFv2p+O5ru9ajnmbk6ULm40h0hMyYiIAFh3PC8I="; + hash = "sha256-npwJlyUYjoYzvwaZZK4PIqhJmTeYGDDfc4T4/ODcx4c="; }; patches = [ @@ -84,7 +84,7 @@ buildPythonPackage rec { description = "Naive XML & JSON bindings for Python"; mainProgram = "xsdata"; homepage = "https://github.com/tefra/xsdata"; - changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.md"; + changelog = "https://github.com/tefra/xsdata/blob/${src.tag}/CHANGES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index dacfc5d51199..fb48b1960281 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -61,9 +61,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "yamlfix" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + pytestFlags = [ + "-Wignore::DeprecationWarning" ]; meta = { diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index c0e1bae93728..1db47ffb07e6 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { setupPyBuildFlags = [ "--dynamic-linking" ]; - pytestFlagsArray = [ "tests.py" ]; + enabledTestPaths = [ "tests.py" ]; pythonImportsCheck = [ "yara" ]; diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index b31b5324163f..7424cae54327 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; + enabledTestPaths = [ "tests/" ]; pythonImportsCheck = [ "yaramod" ]; diff --git a/pkgs/development/python-modules/yargy/default.nix b/pkgs/development/python-modules/yargy/default.nix index 1b13419b04bb..5a4e7099763b 100644 --- a/pkgs/development/python-modules/yargy/default.nix +++ b/pkgs/development/python-modules/yargy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pymorphy2 ]; pythonImportsCheck = [ "yargy" ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests" ]; + enabledTestPaths = [ "tests" ]; meta = with lib; { description = "Rule-based facts extraction for Russian language"; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 0061b635ce6b..5805d35482d1 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - cython, + cython_3_1, expandvars, setuptools, idna, @@ -17,18 +17,18 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.20.0"; + version = "1.21.1"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "yarl"; tag = "v${version}"; - hash = "sha256-O1ImUy+F+Ekj+Sij4XKC1cguTbbOPQbD2V5DpwDSxto="; + hash = "sha256-YN2Gn/wokwbBbVcKvqNNJZ8eZKxwwdKbA84kPsx1Dg0="; }; build-system = [ - cython + cython_3_1 expandvars setuptools ]; diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 8b08b68fb29c..98f2ca486fcf 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "yeelight/tests.py" ]; + enabledTestPaths = [ "yeelight/tests.py" ]; pythonImportsCheck = [ "yeelight" ]; diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index a0e3a27ac169..e638a4d25897 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + enabledTestPaths = [ "test/test.py" ]; pythonImportsCheck = [ "yq" ]; diff --git a/pkgs/development/python-modules/zc-lockfile/default.nix b/pkgs/development/python-modules/zc-lockfile/default.nix index d09983531126..e4c4066fc25d 100644 --- a/pkgs/development/python-modules/zc-lockfile/default.nix +++ b/pkgs/development/python-modules/zc-lockfile/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { zope-testing ]; - pytestFlagsArray = [ "src/zc/lockfile/tests.py" ]; + enabledTestPaths = [ "src/zc/lockfile/tests.py" ]; pythonNamespaces = [ "zc" ]; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 1528e81361f2..1ff7cd4d6608 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ZConfig" ]; - pytestFlagsArray = [ "-s" ]; + pytestFlags = [ "-s" ]; meta = { description = "Structured Configuration Library"; diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 17990e64a151..4b6aac44ea95 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { in lib.concatMapStrings copyFontCmd checkFonts; - pytestFlagsArray = [ "--nbval-lax" ]; + pytestFlags = [ "--nbval-lax" ]; pythonImportsCheck = [ "ziafont" ]; diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index 97d6d45ce06a..aaad09e45ede 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { in lib.concatMapStrings copyFontCmd checkFonts; - pytestFlagsArray = [ "--nbval-lax" ]; + pytestFlags = [ "--nbval-lax" ]; pythonImportsCheck = [ "ziamath" ]; diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 9be00b700a20..094530d4bb9e 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--reruns=3" ]; + pytestFlags = [ "--reruns=3" ]; disabledTests = [ # failing since zigpy 0.60.0 diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index b68dd60e3fec..9aed2df47d68 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -76,6 +76,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests require network access "tests/ota/test_ota_providers.py" + # All tests fail to shutdown thread during teardown + "tests/ota/test_ota_matching.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 16c3998e5b3e..39403aa09ddf 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "src/zope/cachedescriptors/tests.py" ]; + enabledTestPaths = [ "src/zope/cachedescriptors/tests.py" ]; pythonImportsCheck = [ "zope.cachedescriptors" ]; diff --git a/pkgs/development/python-modules/zope-deprecation/default.nix b/pkgs/development/python-modules/zope-deprecation/default.nix index fca9f968a1ea..cd96c14011e9 100644 --- a/pkgs/development/python-modules/zope-deprecation/default.nix +++ b/pkgs/development/python-modules/zope-deprecation/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "src/zope/deprecation/tests.py" ]; + enabledTestPaths = [ "src/zope/deprecation/tests.py" ]; pythonImportsCheck = [ "zope.deprecation" ]; diff --git a/pkgs/development/python-modules/zope-dottedname/default.nix b/pkgs/development/python-modules/zope-dottedname/default.nix index 429f6198a73c..242aa87aa2ab 100644 --- a/pkgs/development/python-modules/zope-dottedname/default.nix +++ b/pkgs/development/python-modules/zope-dottedname/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "src/zope/dottedname/tests.py" ]; + enabledTestPaths = [ "src/zope/dottedname/tests.py" ]; pythonImportsCheck = [ "zope.dottedname" ]; diff --git a/pkgs/development/python-modules/zope-event/default.nix b/pkgs/development/python-modules/zope-event/default.nix index e63aebca47de..ee9ea2639f02 100644 --- a/pkgs/development/python-modules/zope-event/default.nix +++ b/pkgs/development/python-modules/zope-event/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "src/zope/event/tests.py" ]; + enabledTestPaths = [ "src/zope/event/tests.py" ]; pythonNamespaces = [ "zope" ]; diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix index a8d6d6a69583..e95da7af7d88 100644 --- a/pkgs/development/python-modules/zope-testing/default.nix +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "src/zope/testing/tests.py" ]; + enabledTestPaths = [ "src/zope/testing/tests.py" ]; pythonImportsCheck = [ "zope.testing" ]; diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index e902ea024198..d14c2b822797 100644 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -2,35 +2,55 @@ lib, buildPythonPackage, fetchPypi, + isPyPy, cffi, + setuptools, hypothesis, - pythonOlder, + pytestCheckHook, }: buildPythonPackage rec { pname = "zstandard"; version = "0.23.0"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-stjGLQjnJV9o96dAuuhbPJuOVGa6qcv39X8c3grGvAk="; }; - propagatedNativeBuildInputs = [ cffi ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<69.0.0" "setuptools" \ + --replace-fail "cffi==" "cffi>=" + ''; - propagatedBuildInputs = [ cffi ]; + build-system = [ + cffi + setuptools + ]; - nativeCheckInputs = [ hypothesis ]; + dependencies = lib.optionals isPyPy [ cffi ]; + + # python-zstandard depends on unstable zstd C APIs and may break with version mismatches, + # so we don't provide system zstd for this package + # https://github.com/indygreg/python-zstandard/blob/9eb56949b1764a166845e065542690942a3203d3/c-ext/backend_c.c#L137-L150 + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + preCheck = '' + rm -r zstandard + ''; pythonImportsCheck = [ "zstandard" ]; - meta = with lib; { + meta = { description = "zstandard bindings for Python"; homepage = "https://github.com/indygreg/python-zstandard"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ arnoldfarkas ]; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ arnoldfarkas ]; }; } diff --git a/pkgs/development/python-modules/zxing-cpp/default.nix b/pkgs/development/python-modules/zxing-cpp/default.nix index 0f900b55b7c2..35c96d1fa444 100644 --- a/pkgs/development/python-modules/zxing-cpp/default.nix +++ b/pkgs/development/python-modules/zxing-cpp/default.nix @@ -7,7 +7,7 @@ pybind11, libzxing-cpp, pytestCheckHook, - zint, + libzint, }: buildPythonPackage rec { @@ -41,14 +41,14 @@ buildPythonPackage rec { cmake ]; - buildInputs = [ zint ]; + buildInputs = [ libzint ]; nativeCheckInputs = [ pillow pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + enabledTestPaths = [ "test.py" ]; pythonImportsCheck = [ "zxingcpp" ]; } diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix index dca39f5be407..1644cd122c95 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/6/clr/default.nix @@ -237,6 +237,8 @@ stdenv.mkDerivation (finalAttrs: { "1100" "1101" "1102" + "1200" # RX 9070 + "1201" # RX 9070 XT ] (target: "gfx${target}"); inherit hipClangPath; diff --git a/pkgs/development/rocm-modules/6/composable_kernel/base.nix b/pkgs/development/rocm-modules/6/composable_kernel/base.nix index 2ed9532ff3e5..29fa699e97e4 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/base.nix @@ -25,6 +25,8 @@ "gfx1100" "gfx1101" "gfx1102" + "gfx1200" + "gfx1201" ] ), }: diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 0f4a83262664..c399061c1992 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -505,4 +505,8 @@ outer "gfx1101" "gfx1102" ]; + gfx12 = scopeForArches [ + "gfx1200" + "gfx1201" + ]; } diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix index cdb5d705b068..9a1011671a5e 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/6/llvm/default.nix @@ -349,6 +349,8 @@ rec { }; # Ensure we don't leak refs to compiler that was used to bootstrap this LLVM disallowedReferences = (old.disallowedReferences or [ ]) ++ disallowedRefsForToolchain; + # Enable structured attrs for separateDebugInfo, because it is required with disallowedReferences set + __structuredAttrs = true; requiredSystemFeatures = (old.requiredSystemFeatures or [ ]) ++ [ "big-parallel" ]; # https://github.com/llvm/llvm-project/blob/6976deebafa8e7de993ce159aa6b82c0e7089313/clang/cmake/caches/DistributionExample-stage2.cmake#L9-L11 cmakeFlags = diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index 2b110e0f127f..110b96ec118b 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -52,6 +52,8 @@ "gfx1100" "gfx1101" "gfx1102" + "gfx1200" + "gfx1201" ] ), }: diff --git a/pkgs/development/rocm-modules/6/rocsolver/default.nix b/pkgs/development/rocm-modules/6/rocsolver/default.nix index a9e06550a8ed..317690b40e8b 100644 --- a/pkgs/development/rocm-modules/6/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/6/rocsolver/default.nix @@ -27,6 +27,8 @@ "gfx1100" "gfx1101" "gfx1102" + "gfx1200" + "gfx1201" ] ), }: diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 6cfedadca7d8..e40040332bd1 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -142,6 +142,9 @@ let # our patches cause the tests to fail doCheck = false; + + # patchShebangs corrupts the magic escript shebang+zip files + dontPatchShebangs = true; }) ); in diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index e3cba7ead56d..9494ff61a362 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.7.0"; - srcHash = "sha256-5EmvmfkAUMkmImS37jAPOoEADYeAzQgV6zhpRbP9FVk="; + version = "3.8.0"; + srcHash = "sha256-vU8lyWnXU2KnayZ863MMTMOc1/AkQ6p+uNiJOFqDNJk="; # The tarball contains vendored dependencies vendorHash = null; in diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 4fcaf9aa09c3..0ad6e9e7f830 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { pname = "devpi-server"; - version = "6.14.0"; + version = "6.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonApplication rec { owner = "devpi"; repo = "devpi"; rev = "server-${version}"; - hash = "sha256-j8iILbptUw8DUE9lFpjDp/VYzdJzmOYqM/RCnkpWdcA="; + hash = "sha256-tKR1xZju5bDbFu8t3SunTM8FlaXodSm/OjJ3Jfl7Dzk="; }; sourceRoot = "${src.name}/server"; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 0282e63f6b18..29a48d5c96fa 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doxygen"; - version = "1.13.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-tet2Ep2Mvucg2QBJbo9A6531cJhQ9L7+ZMmo07S8cwY="; + hash = "sha256-d90fIP8rDQ30fY1vF3wAPlIa8xrSEOdHTpPjYnduZdI="; }; # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509 diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 04a1fcc973da..e731d8bd9dde 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,12 +34,12 @@ }, "36": { "hashes": { - "aarch64-darwin": "e79f3fd064cec1b8cd867cd567fbe69f3346520740e22748bfe9b5fb2f01f521", - "aarch64-linux": "0e84759948f590538e7e0a00eafd128d68c9d3572b0cce0a8758a78a79de6e86", - "armv7l-linux": "94c5a1f3aec2cf72f5df820e8aa7d3e6fb5945bd6b75451ffef1efd08fa074aa", + "aarch64-darwin": "e4b79adf57b6e85ab6c818c283a2ed075fdc989da201e279ff94ace89051501d", + "aarch64-linux": "7511e5e62393f5ee1a7e97c39b0c6d78e5d083817d5589d6c07a2924dd9c277a", + "armv7l-linux": "089ebc98b798398b0413afb04836ad8c9db2adc4c41057ba4089e50e7f485c38", "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9", - "x86_64-darwin": "93d60bd40a9b41f126ab04442a1781ccdb7934d012d8606cfdebe059d922e308", - "x86_64-linux": "27b4efb0d86a628407716268c2b4057c7b695390bd121f500c0daaea2e6c9af5" + "x86_64-darwin": "95ebf1d455cc3b694fe057221d8053a0f1cbbb64b74bf5982d5a43cffc7e074b", + "x86_64-linux": "315da2bc92bf40bcab5b1da28778048fb5f4eeca75bcc78e0f25cda1773e094e" }, "version": "36.7.1" }, diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index cdcf59551c0e..e7054bf8ef0c 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,12 +34,12 @@ }, "36": { "hashes": { - "aarch64-darwin": "58620f79f034970abe41b7c3ae2e317dc8935d937ca07a37017ff528fb7affd3", - "aarch64-linux": "cd87231b0db40c8193e65bedf69451604c246867e56c7d52deb15dbdf4e7d527", - "armv7l-linux": "cab434d3c281756ebd6f4fda4477a744a8081ac5eb8c938824d7391f8d5e2e32", + "aarch64-darwin": "cdcf2c88d2d951761517669886521043d4e63fb5538fab01a5469594f8af4fa9", + "aarch64-linux": "f629a35f5ee5ce902581ae4d4cdfacbd25dc72573805abe8484f28a6b7f74abe", + "armv7l-linux": "b9db0483bdff794d08cdd0e30a861b6b9e31a94f99b37893f2a7fbc6069e74ff", "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9", - "x86_64-darwin": "bd851936d81cc4ddb2591ff2544ce6952ce49052ed6c929eb6c2a712e63ce4ea", - "x86_64-linux": "c4219caa0f8806e9ffabc7dccfb29ae2f9bca02a11fedd1090ad4c800c9783b1" + "x86_64-darwin": "3d212fd07716510f894b3e5833d5bb7a53298a8add1fe96d5264d16c2235eda1", + "x86_64-linux": "1a6f7a0df64475a467b20548ab41c8576781b5e34a6bf74751c7384623acd2fb" }, "version": "36.7.1" }, diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 9ad44968d38e..9cb4a80efa66 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -15,6 +15,7 @@ which, unzip, lua, + versionCheckHook, # for 'luarocks pack' zip, nix-update-script, @@ -25,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luarocks_bootstrap"; - version = "3.11.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; - rev = "v${finalAttrs.version}"; - hash = "sha256-GglygI8HP+aDFEuucOkjQ2Pgfv4+jW+og+2vL3KoZCQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-PGK4gjEhCJt2+0viNU0/qJBBOxPIy2swXplQOolmP2E="; }; patches = [ @@ -64,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: { installShellFiles lua unzip + versionCheckHook ]; buildInputs = [ @@ -107,6 +109,10 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/luarocks"; + versionCheckProgramArg = "--version"; + # unpack hook for src.rock and rockspec files setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 698c5c75bdfe..c0f2213da657 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -24,6 +24,8 @@ luarocks_bootstrap.overrideAttrs (old: { patches = [ ]; + doInstallCheck = false; + passthru = { updateScript = unstableGitUpdater { # tags incompletely inherited from regular luarocks diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index c7ec3be0d4b2..bdeb13230440 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -30,8 +30,8 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.25.4"; - hash = "sha256-6qE/LXAGzV68HHr4lB74vmSn6mGF9EV7enjWOyNQjDQ="; + version = "0.25.6"; + hash = "sha256-2/DF2xyiKi5HAqqeGt1TIMvAWFfZgcfVccK4zrTqq88="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -171,8 +171,7 @@ rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version; - useFetchCargoVendor = true; - cargoHash = "sha256-/KCvLsbb6DullLpRoSYbxtSsm/TMc6o0Y/QmK6BN748="; + cargoHash = "sha256-sGh16M7cbT5ct1sT2FcUUoIQFcoOftTuQ0aSCjtkTEs="; buildInputs = [ installShellFiles ] diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json index c412e01f1735..838e798e560a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json @@ -1,12 +1,13 @@ { "url": "https://github.com/tree-sitter/tree-sitter-bash", - "rev": "487734f87fd87118028a65a4599352fa99c9cde8", - "date": "2024-11-11T01:52:16-05:00", - "path": "/nix/store/llqfabr73wh33skh2qzhwjh93zc5cy09-tree-sitter-bash", - "sha256": "1smlcfkxxknhya1b1h72zj3ccg35szbg9mii2xwh7iq9acnlzpgc", - "hash": "sha256-7N1PLVMJxwN5FzHW9NbXZTzGhvziwLCC8tDO3qdjtOo=", + "rev": "56b54c61fb48bce0c63e3dfa2240b5d274384763", + "date": "2025-06-04T09:38:10-07:00", + "path": "/nix/store/zy2ii6304db3z54x2afg8as71wkbgffd-tree-sitter-bash", + "sha256": "1488r0lqldy92v8jr3n6w6iv99fdbcnmb1zxfshiz9azcgz8s5mx", + "hash": "sha256-vRaN/mNfpR+hdv2HVS1bzaW0o+HGjizRFsk3iinICJE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json index 73451c3654d4..36bccb90e009 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json index 3b1ebf2fe4d4..72e29abbc908 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json @@ -1,12 +1,13 @@ { "url": "https://github.com/latex-lsp/tree-sitter-bibtex", - "rev": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34", - "date": "2021-03-26T15:53:50+01:00", - "path": "/nix/store/pg00zy53rni7znda2vbyyhkkclgja3kq-tree-sitter-bibtex", - "sha256": "0m7f3dkqbmy8x1bhl11m8f4p6n76wfvh99rp46zrqv39355nw1y2", - "hash": "sha256-wgduSxlpbJy/ITenBLfj5lhziUM1BApX6MjXhWcb7lQ=", + "rev": "8d04ed27b3bc7929f14b7df9236797dab9f3fa66", + "date": "2025-04-19T10:23:36+02:00", + "path": "/nix/store/cfx6c2nl3vmm29phi5l7yg4mq8hapqji-tree-sitter-bibtex", + "sha256": "0pjjk23a3gyz0rpgy99qkal9gs65i15k8bsc37s87x94dxdcdrah", + "hash": "sha256-UOXGWm8k9YP0GUwvNEuIxeiXqJo4Jf9uBt+/oYaYUl4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json index 8d5167b488db..582ed02c1412 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json index c909530a21a6..65414bf90a02 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 435292c24e30..b29372cbc061 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 35988b2c081a..392d537fef62 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,12 +1,13 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "2a265d69a4caf57108a73ad2ed1e6922dd2f998c", - "date": "2025-02-08T10:48:10-06:00", - "path": "/nix/store/0xnd082cryjnml9iaibcfgbp3bc5svxb-tree-sitter-c", - "sha256": "1vw7jd3wrb4vnigfllfmqxa8fwcpvgp1invswizz0grxv249piza", - "hash": "sha256-6sebiNg9P/B/5HrbGO7bl3GHVMfVUepetJuszEeTh+8=", + "rev": "7fa1be1b694b6e763686793d97da01f36a0e5c12", + "date": "2025-05-24T13:29:12-04:00", + "path": "/nix/store/bms26kscizz0zd4x18smicqz5p7va9d4-tree-sitter-c", + "sha256": "19yc4g5fdibfqbn49ggywk9k2by78s8lrsjp1cx2lagb1dvxnv42", + "hash": "sha256-gmzbdwvrKSo6C1fqTJFGxy8x0+T+vUTswm7F5sojzKc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json index 34f5a128ce56..e38432e27045 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -1,12 +1,13 @@ { "url": "https://github.com/sogaiu/tree-sitter-clojure", - "rev": "f4236d4da8aa92bc105d9c118746474c608e6af7", - "date": "2024-05-22T23:05:15+09:00", - "path": "/nix/store/vl1d7aql1bcvn65khrgs13rfk90q08ik-tree-sitter-clojure", - "sha256": "16hnb5d8shz216sv9hj5hxpg63ri86w5pf9bzi5z3f37zh7vlljj", - "hash": "sha256-UlK6D/xnuPFL/Cu5W7hBMQ/zbodFwrS1CeJDjVpZFpo=", + "rev": "40c5fc2e2a0f511a802a82002553c5de00feeaf4", + "date": "2025-05-26T17:10:02+09:00", + "path": "/nix/store/lkzsixjxwr6b2gwxsba0qah3k121axgi-tree-sitter-clojure", + "sha256": "163jm1qgrh9ha1xbjlbkcffcxkdbhsvj5kplknq4gcb080wlp6dp", + "hash": "sha256-t5lLOUBgsUewnfTOIreGq83OnGNzUbl6UDDB/HCocpg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index 00d30c080ed4..07b7b433cd5a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,12 +1,13 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "e409ae33f00e04cde30f2bcffb979caf1a33562a", - "date": "2024-10-14T03:37:52+03:00", - "path": "/nix/store/hgwv6jwacl1md38yccvvvhigyk6h21s2-tree-sitter-cmake", - "sha256": "1v2kkxf9w0y9mwwgimgyvn1s9cmmp6jg71ckr001w1w8szyqqf7q", - "hash": "sha256-+DiM/deIBx4AyJOF86S5tbKkg93+1fg4r8kDnlyfU+w=", + "rev": "cf9799600b2ba5e6620fdabddec3b2db8306bc46", + "date": "2025-05-23T09:02:01Z", + "path": "/nix/store/20nwq76zin7f8lhaccdhj4jm4yzvqclr-tree-sitter-cmake", + "sha256": "0mqkmdqw0x7b2a83is8w8va32s0qzf3dlfzx0hwxfz7rn5dn459v", + "hash": "sha256-OxViW7H5fNc5BP072ob7GGgx1EYc6TiQEut0wHGrE1c=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json index ed34fe8a5d56..bb3a2b8e2735 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json @@ -1,12 +1,13 @@ { "url": "https://github.com/stsewd/tree-sitter-comment", - "rev": "ef429992748f89e176243411e94b8ffc8777d118", - "date": "2023-06-03T20:48:17-05:00", - "path": "/nix/store/0kg71dvg10f1m2f08z1b2wh1ap4w4hw6-tree-sitter-comment", - "sha256": "1d5g69i8jplyg888yr7wzjb46cqnchwf4kdzgb83him7cwfx9wax", - "hash": "sha256-XfHUHWenRjjQer9N4jhkFjNDlvz8ZI8Qep5eiWIyr7Q=", + "rev": "689be73775bd2dd57b938b8e12bf50fec35a6ca3", + "date": "2025-05-03T18:43:55-05:00", + "path": "/nix/store/7s2q0ka47nf94kaih3w12572my3r2ksz-tree-sitter-comment", + "sha256": "1x0l8phr4x07n739z0ax8faxq0l6irmpkdprrv1z088zqdr43l1v", + "hash": "sha256-O9BBcsMfIfDDzvm2eWuOhgLclUNdgZ/GsQd0kuFFFPQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json index b17e5ca89527..a13d53821c8c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json @@ -1,12 +1,13 @@ { "url": "https://github.com/thehamsta/tree-sitter-commonlisp", - "rev": "25856774aaab983c573bb2f9cc1ebbc97941f7b9", - "date": "2024-04-06T22:22:41+02:00", - "path": "/nix/store/mlji0h6k2x17jni9q3y571dmk5k4xi85-tree-sitter-commonlisp", - "sha256": "12fh2sinasnfp6rfq5d9qq24nfg55bclc5rp8mnw3a2ccyc5icis", - "hash": "sha256-OrJYmGdMqMFtRTcXRtkq5TlLBMapFeyyuc5qZaMW0Ik=", + "rev": "9db594efb43574c5fe4a1f880568b1f0d0ee6057", + "date": "2025-03-16T16:36:54+01:00", + "path": "/nix/store/96phqhn770ds8i0j0l88phldl7d03g72-tree-sitter-commonlisp", + "sha256": "0xg3ay8l62h7s35abkxi4gjfvndzdvvrpgh1z980q1ib5935sxf0", + "hash": "sha256-wHVdRiorBgxQ+gG+m/duv9nt5COxz6XK0AcKQ5FX43U=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 7230d1854286..b62ff93df2c3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index bb9cc18588ed..e9e4a52ddf0c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index 19ed0721d352..36413eb77f40 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,12 +1,13 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "9cdfe2d453e5f60fd818935a5895f223e2e6feed", - "date": "2025-01-25T13:03:37+01:00", - "path": "/nix/store/xz5zddyszj1sgr3lp17f021n2x13dmj7-tree-sitter-cuda", - "sha256": "0krk5f0g87cp1mkdn2x6sadldqnvhxxy8zsvc8z2bxc50vb4lw9m", - "hash": "sha256-NXFK1gaF9SU+Ylt/5HuH2+JGm9KmC9tmDZcd9IArM08=", + "rev": "014628ae8d2df391b88ddb9fa0260fd97f770829", + "date": "2025-03-16T17:20:16+01:00", + "path": "/nix/store/w0cl4ga4bis992vyfmj8l0pq385z0cka-tree-sitter-cuda", + "sha256": "1qyh00rapch29czvnqs3364bx0bi4gyapfxb0v8m4r2m8kybnlff", + "hash": "sha256-zlG7/ERVZFLRBqu7q/wjcYG+iBlDY7s/SwKyqzIA0OM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json index a5738d305587..f98691b115b0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json index 6a993f0f4735..d3424c21a17a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json @@ -1,12 +1,13 @@ { "url": "https://github.com/usernobody14/tree-sitter-dart", - "rev": "e81af6ab94a728ed99c30083be72d88e6d56cf9e", - "date": "2024-11-16T21:53:35-07:00", - "path": "/nix/store/jb7wiv90s78p45pj9mqvmbgk06xhjlj5-tree-sitter-dart", - "sha256": "0zl46vkm4p1jmivmnpyyzc58fwhx5frfgi0rfxna43h0qxdv62wy", - "hash": "sha256-nguzW8cADqJsdxnE57IrHXKHCvveX1t3rDJcUuc2hH4=", + "rev": "80e23c07b64494f7e21090bb3450223ef0b192f4", + "date": "2025-02-28T15:18:07-07:00", + "path": "/nix/store/7pfv5380h2fwv0rg0ckdjg8h71vzq71f-tree-sitter-dart", + "sha256": "00wzdgmi6kph4lk988brpy03j43a8vvfcjx9plnnnk07a14l3hbc", + "hash": "sha256-bMFBSVAHTGstvalL5vZGahA5gL95IZQmJfBOE+trnwM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json index 60fcf5a46ec4..069c8263f262 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json index 951deac2d086..045280a60371 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json index 6665c2fefcd4..10d9408ec72d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json index 887be0651b9d..945336f543ac 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json @@ -1,12 +1,13 @@ { "url": "https://github.com/glehmann/tree-sitter-earthfile", - "rev": "ae378d9d1306e9a967698516041f6f8803db5592", - "date": "2025-02-18T21:51:34+01:00", - "path": "/nix/store/wy3w667k4gdxvj6rx83f64r7jbmal4dn-tree-sitter-earthfile", - "sha256": "112vc8rv5dzvvbhf7n01qnacvjfpyi9kfzdbsm0gzkpnhk52rah4", - "hash": "sha256-BKosyoT2zv9A1at9N1P018nNlMUB2OPg2vu3sjNiW4Q=", + "rev": "a37c5ee95ce401ca311c0ae1369d9cfb953e151d", + "date": "2025-05-13T08:33:41+02:00", + "path": "/nix/store/dhmdlbq30jfmsl719k8pawcffs8xpin0-tree-sitter-earthfile", + "sha256": "1gld2wrxa9bfhka70pnyapq7agwxh2mgwa7qj5mq8ga73gfi52lm", + "hash": "sha256-lYoS3RtHPYRrkfgo/qqAnT918FXeXnDUhG4l1TMXjb4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json index 34dc023949d2..799c8f70ca52 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json index 970cf5370bf0..0a784c3ab43b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index 628e919cf835..ea4fd28a9576 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json index 1f0333795f1b..a0163c06c5fb 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index 426ad295313c..c60ca6e00877 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json index 2b1a7b6c8761..962b41354ba6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json index 0241833bbf3d..5d8bd9e2b65d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index 7df79d76a303..5364cadfcc4c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index 78ec184a9b8c..907447c4ab30 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json index cfc6a0ff44bd..4d5d994dd962 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json @@ -1,12 +1,13 @@ { "url": "https://github.com/stadelmanma/tree-sitter-fortran", - "rev": "022b032d31299c5d8336cdfd0ece97de20a609c0", - "date": "2025-01-23T13:28:14-05:00", - "path": "/nix/store/vncpfx5db12ish9rzf26phj25373nqs4-tree-sitter-fortran", - "sha256": "1mncdji60qa9r8jbiywmcid714ylc3gniq25l8mxj1p4zq95nd29", - "hash": "sha256-STRbEv7kBtkrokXgaN9g1JNwWmSV+7gkyklhYKJszNY=", + "rev": "ab9aa007a8d982a5a7926663a8ab989cea0f5d9e", + "date": "2025-05-30T13:36:15-04:00", + "path": "/nix/store/rfny2ivglrrr0wqsby82l0yw63d3gdvp-tree-sitter-fortran", + "sha256": "13szimmilfd1lps9j73zyp4lmg630ml1gg802lsfxxdjc944yrcc", + "hash": "sha256-jGVPSGKy9e40FQC9F2gFw7xKyfV/HJn0paE5GmuNX48=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json index e766346aece9..5091a489397e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json @@ -1,12 +1,13 @@ { "url": "https://github.com/prestonknopp/tree-sitter-gdscript", - "rev": "b5dea4d852db65f0872d849c24533eb121e03c76", - "date": "2024-02-21T19:10:52-08:00", - "path": "/nix/store/254bkv3lkgp7jk555rmxqxyg4p4g9smy-tree-sitter-gdscript", - "sha256": "17m2gdpdya8afm7fqgggi81m71xkiibbqa61vs2sspym6zna1ygx", - "hash": "sha256-/fmg7DfVX62F3sEovFaMs4dTA4rvPexOdQop3257op4=", + "rev": "e964ce912b5b835f1caedb600df9d5be77e803a8", + "date": "2025-05-14T11:22:28-07:00", + "path": "/nix/store/ab2prhn6ckp7kyfnxnymx8zvbna4jda2-tree-sitter-gdscript", + "sha256": "19rdpyd05x29b7isv8jnc8jlawlpzh91b11yggiqgjz6il0vkdww", + "hash": "sha256-nLe5AY3my4fjez6EFRL8l3JFJWJWoq3jWUn0Apq/Lac=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json index db1db3bfb97c..e63a56c69a16 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json index 945973f934bd..1f4c1e5ab620 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json @@ -1,12 +1,13 @@ { "url": "https://github.com/gleam-lang/tree-sitter-gleam", - "rev": "af6043419f5aa0f8b6c2a26db0187aefa46c7f5f", - "date": "2025-02-07T14:27:03Z", - "path": "/nix/store/k54xiiqza536lzgvdw8yizsp6czdalln-tree-sitter-gleam", - "sha256": "0b7k2ah7a29simvvzm3f01vna5lzvv1mi7idvzpc056wjbgnvrg8", - "hash": "sha256-6OVt35LcFMDu3y2eWMPenxZldwBu1L93jToJdaAS8yw=", + "rev": "6ece453acf8b14568c10f629f8cd25d3dde3794f", + "date": "2025-05-17T12:51:15Z", + "path": "/nix/store/aahaa06y7w5in76pfp787k5gyamx7599-tree-sitter-gleam", + "sha256": "00f481cjn1mz0319jq89775a81nlmqnkc6fvv3qblpiq37fplzcz", + "hash": "sha256-n3163Rk4Xrrw2NsZNi2u1AakyjkJYZnCAL8GK1lAxAE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json index 87da016a651e..83e5e7b9c1c4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json index 0d6d9a127406..adb5bb72ba90 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json @@ -1,12 +1,13 @@ { "url": "https://github.com/thehamsta/tree-sitter-glsl", - "rev": "66aec57f7119c7e8e40665b723cd7af5594f15ee", - "date": "2024-09-12T12:52:04+02:00", - "path": "/nix/store/xzxngsr3nhs1586c47iwdx9k20yaansc-tree-sitter-glsl", - "sha256": "0gp3bn31xz5rq52amx059r9sllk3749f1ajmbs1fkjb833f2kvqh", - "hash": "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4=", + "rev": "e47b8b62b59d0e3529f1c31b03e025d6bd475044", + "date": "2025-03-16T18:14:20+01:00", + "path": "/nix/store/87vf9kgi9yzzksj0s7h707ky79kckf5f-tree-sitter-glsl", + "sha256": "0d0ymklms4a91b310f0vwl80yy50sji4qq9sdgly5qh42kyjnijb", + "hash": "sha256-S0Yr/RQE4uLpazphTKLUoHgPEOUbOBDGCkkRXemsHjQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 4efe2cc2b3ac..db3cc5ace052 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json index 28902ff10907..dded3a02e446 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json @@ -1,12 +1,13 @@ { "url": "https://github.com/prestonknopp/tree-sitter-godot-resource", - "rev": "479bfc12579ba54ac5b4dcb320fd0cb81eaabe7d", - "date": "2025-01-02T02:55:15-08:00", - "path": "/nix/store/3mvxmgjpkr02vxr6iwhqivqkajzzywkb-tree-sitter-godot-resource", - "sha256": "18fjf4fj3fyfsq6nvmi5qy1ddwlfcz8sxiq8wq8qrvc7fvfwni1q", - "hash": "sha256-OETL3XaH7YwR5gjHrtFnjvLWgscl1m0N1s67IR1x0qE=", + "rev": "a1a7295b376fbd2531601f4ffff191b031ffc795", + "date": "2025-05-14T13:16:54-07:00", + "path": "/nix/store/aiffb583jhinm3ph5l0pz70igyskdc4f-tree-sitter-godot-resource", + "sha256": "1jhl7fwrjd07y3bcmwc6v3lyq04yma49q575cgld94ssmcp0rmgs", + "hash": "sha256-+tUMLqtak9ToY+UUnIiqngDs6diG8crW8Ac0mbk7FMo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json index 4be7f396a7c8..fdb0a4efeb8c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json index 05eca90427d3..92cff1e75067 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json index eb16f2cd9c29..55c44102e945 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 3bcd64dcbe5a..15f39a70a440 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json index 738b02ffdb69..bffd99b20a24 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json @@ -1,12 +1,13 @@ { "url": "https://github.com/MichaHoffmann/tree-sitter-hcl", - "rev": "636dbe70301ecbab8f353c8c78b3406fe4f185f5", - "date": "2023-07-25T19:21:31+02:00", - "path": "/nix/store/k5rmjfpgn4vpxxqc05xb5fflcck9645v-tree-sitter-hcl", - "sha256": "1yydi61jki7xpabi0aq6ykz4w4cya15g8rp34apb6qq9hm4lm9di", - "hash": "sha256-saVKSYUJY7OuIuNm9EpQnhFO/vQGKxCXuv3EKYOJzfs=", + "rev": "009def4ae38ec30e5b40beeae26efe93484ab286", + "date": "2025-05-16T09:08:19+02:00", + "path": "/nix/store/4fzs7sm98lvygqj7ylpfhg9lpkzyz8as-tree-sitter-hcl", + "sha256": "01amk7cm968a3i511kzzbyvhbxhk6h1v5g5klap7vh0y11r3ilyy", + "hash": "sha256-3tM4cggewH2uorO8sgM0E/YFt1//zxBKHAqZVNmZVQU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index 3be25c4f6391..af406a845f16 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json index 7fd16a4f1aec..e4c8d8263c4e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json index 08a9a4166c1a..23a679566782 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json index 4d6137d9284d..2e05e32a1b6d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json index f63d8243613a..462946d0da99 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json @@ -1,12 +1,13 @@ { "url": "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang", - "rev": "86025136c12cd1058985479a6b1935829077f1af", - "date": "2024-02-10T18:00:17+03:00", - "path": "/nix/store/q5csx65ydwbz66bgjjpa6c1yvy3zy6vq-tree-sitter-hyprlang", - "sha256": "0z84nl1mb77rwqq86ggaiqdd2lwg3nxrlkbhsn8zhcqnaphq0wfl", - "hash": "sha256-1HGA4VUWM/iR1XBNmrsdj1PRGo7qPYMw5vmcVQO1BH0=", + "rev": "d0441fd4b883ecc0e70140723a1cf5907992639a", + "date": "2025-05-09T22:23:24+03:00", + "path": "/nix/store/ajpg66r1yvns2rpbspqhgh7b1ggm6jcf-tree-sitter-hyprlang", + "sha256": "171p3hj36a1jqflg9xv138445j4m4m16na6bgpm1km3l67jhvl54", + "hash": "sha256-pNAN5TF01Bnqfcsoa0IllchCCBph9/SowzIoMyQcN5w=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json index 1cf76f6cd3b1..0687cb404e24 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json @@ -1,12 +1,13 @@ { "url": "https://github.com/sogaiu/tree-sitter-janet-simple", - "rev": "b08b402207fba0037d5152ce7c521351147f4388", - "date": "2025-02-03T20:32:35+09:00", - "path": "/nix/store/w0rsgjajpifbl7ygy1kwr87l42gcsh52-tree-sitter-janet-simple", - "sha256": "0bqk72915yg6vfby7179rxacbla7if8rzq4zhy1d0g98pyx4qqzn", - "hash": "sha256-9mNMur8oPdCCh5/gn5GLR9HFVM/phOOX2+b5EpI4Ey8=", + "rev": "7e28cbf1ca061887ea43591a2898001f4245fddf", + "date": "2025-05-19T21:38:53+09:00", + "path": "/nix/store/k9njvidvlpqlri2dsmfvz3h21b1214a6-tree-sitter-janet-simple", + "sha256": "05xn760xxax8q2dsvyj3yw90rhnq7nmv54p0i8af34nhjwyi8sx9", + "hash": "sha256-qWsUPZfQkuEUiuCSsqs92MIMEvdD+q2bwKir3oE5thc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index c23f7c315443..b7aed2572e37 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index fd8859be185c..a0290d215193 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json index a00bbfddb9d5..5153927b22df 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json index dda51e46775b..10187c1f9699 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json index 5565bdfabf8e..28f4996486d0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json index 518f0c115f18..a8bd511ad98b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index 7d3ebefad07e..2d0e55210dca 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json index 572143e5e2ae..961b173484ff 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json index 6838779aa463..e218e748c0ad 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json index 83f57b4c4cd9..ce53103c667c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json index 44b506fed455..8b67459fe23d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index 9e6eb0167e0b..810b0acc9964 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json index 4d5c43e8209b..24ea0a0a6df7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json @@ -1,12 +1,13 @@ { "url": "https://github.com/cbarrete/tree-sitter-ledger", - "rev": "d313153eef68c557ba4538b20de2d0e92f3ef6f8", - "date": "2024-12-01T20:38:56-05:00", - "path": "/nix/store/msd18izp2w9lwsz0i7n1r3r007xaqgvx-tree-sitter-ledger", - "sha256": "0k880rxgknlr9gfya9fafi3gmv7gcdph5kxqnpbf9kmrm193glgx", - "hash": "sha256-/dE3Uqi5zuTWtbjPAm9j7+z6RnTKJeXdS5na+XoGCE0=", + "rev": "96c92d4908a836bf8f661166721c98439f8afb80", + "date": "2025-05-04T15:50:31-04:00", + "path": "/nix/store/jxnv96mxkypk3hkpy14hlw0yv60ryfsm-tree-sitter-ledger", + "sha256": "0g4yh8xxmcf7r0acazmzp4j08c6fx3d25b76i7fgchv7id658v1g", + "hash": "sha256-L2xUTItnQ/bcieasItrozjAEJLm/fsUUyMex2juCnjw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json index e63f2032140e..a97a2e58a677 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json @@ -1,12 +1,13 @@ { "url": "https://github.com/benwilliamgraham/tree-sitter-llvm", - "rev": "c14cb839003348692158b845db9edda201374548", - "date": "2024-10-07T15:28:34-07:00", - "path": "/nix/store/aravnn08ip3zggkbww6ap73xb5zvrf6g-tree-sitter-llvm", - "sha256": "1fh5nq7war87zrphlv5v2g55gmsbhyv3385va7k1y8gh3czg0x9g", - "hash": "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo=", + "rev": "1ac83114e71839fa67f4cce2f864ebbbdf6e2a4f", + "date": "2025-05-13T09:33:06+02:00", + "path": "/nix/store/yqc7r12pmy0y1bxad2cgpss5kpmd9vzr-tree-sitter-llvm", + "sha256": "00srqg073ml85zimmj1a1251nka18i04gm0m1jcpa6fmbbrx6knr", + "hash": "sha256-2U7T81rVGXWZDBXUR0BEQU0biggqyFrjL4jWccDDWQM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index b01889fcedbb..6b29c432c482 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,12 +1,13 @@ { "url": "https://github.com/MunifTanjim/tree-sitter-lua", - "rev": "99fc677e6971c425e8d407f59c77ab897e585c92", - "date": "2024-09-09T11:10:03-04:00", - "path": "/nix/store/iiih0sfdls1h8q7ca12y0rhc7g5jl76w-tree-sitter-lua", - "sha256": "0wrbxmb6j8xyckf5jw14jf97cb9fn7yhalap6xxgsag84ypfsqj3", - "hash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=", + "rev": "4fbec840c34149b7d5fe10097c93a320ee4af053", + "date": "2025-05-16T19:32:03+02:00", + "path": "/nix/store/3x9qgcifbb12l80kxq57sz8l3xzrq35k-tree-sitter-lua", + "sha256": "1fvfbi5csn3w0zjjr29c05gdhjmy6d8cx1d6s38j6qmfasm1gvvw", + "hash": "sha256-fO8XqlauYiPR0KaFzlAzvkrYXgEsiSzlB3xYzUpcbrs=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json index 8d116744dffa..5fa65cec3ea8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index 250b848c1bdf..fcf8e44b10a8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,12 +1,13 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "1c8dea73bc0c996d92dd9ebc30dd388716b1c5db", - "date": "2024-09-11T16:28:36+03:00", - "path": "/nix/store/g4696miy9vzcw0qwd00rar36qn08jn2l-tree-sitter-markdown", - "sha256": "13xfyclim1yql6swbk4y12sxgvn799ldbzjl35n5rrkz7wgnwm9s", - "hash": "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=", + "rev": "afaa4138517363362f54c89330c9d79391e81168", + "date": "2025-05-17T18:46:59+02:00", + "path": "/nix/store/46fzwyl91h2w34b73sscbjh1ggl3s15l-tree-sitter-markdown", + "sha256": "0aprf5kvqcpjx58xwdxh4lsgz6mzcsdipjv3405fywcrbh9q7li3", + "hash": "sha256-I9KDE1yZce8KIGPLG5tmv5r/NCWwN95R6fIyvGdx+So=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json index 240684336b19..fc5819800286 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json @@ -1,12 +1,13 @@ { "url": "https://github.com/norgate-av/tree-sitter-netlinx", - "rev": "6d3c01e54d150c6d3dcf99cad95a1f5fa0293018", - "date": "2025-04-20T17:23:44+01:00", - "path": "/nix/store/mnl4bx3006gy841ky2vgyyfx9fnibm2m-tree-sitter-netlinx", - "sha256": "13kyl1a0d9x6k6ivcyzbplkcsdjy3kd4raym1zz8c5gs9xwg6vb4", - "hash": "sha256-ZG3zeE/6FYb+D9WrTNocXjbNJr3re7ajmaanBlSgfo4=", + "rev": "296c0e62cd507fc23cd1f1db06142f808483cf1a", + "date": "2025-05-11T11:31:14+01:00", + "path": "/nix/store/yi7az5hhp3dmn5mbk2cin6m5pmbp5fby-tree-sitter-netlinx", + "sha256": "09q2w9g4bb8v603b4ykxn5g8ndqjfhrgskslsmzhy095r3jysb2q", + "hash": "sha256-WCzt5cglAQ9/1VRP/TJ0EjeLXrF9erIGMButRV7iAic=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json index 614ac8c59836..13d0c4d6e287 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index fc10495be349..8fb244417e92 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,12 +1,13 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "b3a88cf3e597d48c33657deca4fda7a75c0069c1", - "date": "2025-01-31T17:04:23Z", - "path": "/nix/store/lvw6n2174vjd5g7jmylpk84040gpsyj6-tree-sitter-nix", - "sha256": "16gkm286jvkv7kygs6ap9h06dvp96akahjdvqrdjzzp1vlsqlf5s", - "hash": "sha256-ujiKNd3h/i9bxrtJqKYy6e5mAExXGf38PHtuaZCo85k=", + "rev": "cfc53fd287d23ab7281440a8526c73542984669b", + "date": "2025-03-10T21:49:48Z", + "path": "/nix/store/aqzm346ck43x74b409jiikbbxqchgyr1-tree-sitter-nix", + "sha256": "0bmalpgvfcz1zd72wq43r5qvhj3dqqp7zn9kfb6bs0valrxagaks", + "hash": "sha256-eqqneqZqA73McjPZfy7GbUi4ccmDYC5O++Ezt9+lqi4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json index 968e703cc352..93a878458f14 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 74af23993264..b81123a662d8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json index a13f59babed2..a455eaf1e630 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json @@ -1,12 +1,13 @@ { "url": "https://github.com/nushell/tree-sitter-nu", - "rev": "2a153c88d5d44d96653057c7cc14292f4e641bef", - "date": "2025-02-14T22:21:43-06:00", - "path": "/nix/store/di072yk2yrla0fw45sxa0niy5dd7a8gw-tree-sitter-nu", - "sha256": "1jyd7xvnxv5c9i7ankxslmgarvmnhaam6ylhzk2v5lcfjk21gzij", - "hash": "sha256-Mv4XxJSO0bLF/JB6U5WCtu6sXqW6T6tOTKzsbnc/zcs=", + "rev": "100d06e29d13a8ebfc3f29173c07a5c4f2050586", + "date": "2025-06-03T11:43:38Z", + "path": "/nix/store/3a41rx3rs29c625ywqv0pw7s7am4gwn5-tree-sitter-nu", + "sha256": "07aa73flw0z56fqgqv4y7xyf0akh50ydavjyzyczwc7hyl15mak4", + "hash": "sha256-ZKpaAvXwMP6Z/15u1TwocCrgfD+ebPywM+UDTt04Sh0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index c75060f12fa9..a7d178462936 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,12 +1,13 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "a45fda5fe73cda92f2593d16340b3f6bd46674b8", - "date": "2025-01-11T22:05:51+01:00", - "path": "/nix/store/jl174nzwf7fb982fyfwczc4ilmsis4sd-tree-sitter-ocaml", - "sha256": "17g2ynqhjf1nyhdidz9j9s0s12iys3b2vbywxkygwyccj7rb8zdi", - "hash": "sha256-sX208pGMef787NyvLdbQPoqggU4y/RYb9DY4CbH14p0=", + "rev": "0cc270ff90ca09c29d0f2f9dec69ddfef55a3eff", + "date": "2025-05-29T16:15:06+02:00", + "path": "/nix/store/796cycklipmf50nxh0431jfdlard661i-tree-sitter-ocaml", + "sha256": "1mrqpdzwrj3hkrv0xib3h3fvj9z3iai5gjwry9dilhdjl2n2akvv", + "hash": "sha256-e08lrKCyQRpb8pnLV6KK4ye53YBjxQ52nnDIzH+7ONc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json index 817231cc8425..0dba72be49a3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index 14f22e9e243d..35b384620faf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json index a63896e4c319..7255f39b0e4a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index fabb7c2e806c..c64e2aedce34 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,12 +1,13 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8", - "date": "2024-11-19T21:55:55-06:00", - "path": "/nix/store/nl2r9rkvhnhdd3f9zn59nv7k4d1j6m68-tree-sitter-php", - "sha256": "0qkjp5n3ys0jckg67zcdf4mkb01ilnkqx61wga13ys2infgd8agq", - "hash": "sha256-+CnUnrNRaD+CejyYjqelMYA1K3GN/WPeZBJoP2y5cmI=", + "rev": "f7cf7348737d8cff1b13407a0bfedce02ee7b046", + "date": "2025-02-27T03:54:39-06:00", + "path": "/nix/store/6hwqa10mfcs32cqq5ab48c444yihm106-tree-sitter-php", + "sha256": "05qhz14vvqgwpxgdfr1skwgrv041zwc3wxjyx6y679965nn0lrji", + "hash": "sha256-UWYKrC0mpWO86V52Phj/gYCdH586ZNdev/zhvUn4EBc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json index a53b5c2e17c2..f9e43499a03a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json index c2d65eb704c8..bbdf72a731cc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json index 0bea1a55e3e0..7d14348180b8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json index dcdaf0ad6a3b..e69c0abcd1c3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 6d8279cf9e5e..208f595116b1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json index 8daf67a2c621..68fa4bd7f0da 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index f6d02a241070..f00559186659 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json index 4c2825dafb4e..4e54ec8ca781 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json @@ -1,12 +1,13 @@ { "url": "https://github.com/nvim-treesitter/tree-sitter-query", - "rev": "0555ac0da902abff06076e40501102cee3ba68bd", - "date": "2025-02-02T17:30:49+01:00", - "path": "/nix/store/ab5v1pf3vckwhnix7r0c1l5g8x30v4zl-tree-sitter-query", - "sha256": "0dqy7i2jdd9dqf1ppqzcmkzd9yndb11r78l0pv1zyl7dm7h5g76q", - "hash": "sha256-2JxX4KntUP/DvoCik0NYzfrU/qzs43uDwy21JkU8Hjc=", + "rev": "892ebd701a79be0412ff1478177030a725d0c7b7", + "date": "2025-05-16T18:22:36+02:00", + "path": "/nix/store/rivlmbcc3gn7fqwljgk3z7zhk2s1ivzh-tree-sitter-query", + "sha256": "0is8lzj13zz6sq36wrfmhv7mjbgfvlrqnxf5dxzqa2vncj45v0bv", + "hash": "sha256-e4FdiGR2C4V/b8V1izPd7i1Zz4bVZW4G1ub/EeSnSEc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json index 4754dba33b8d..f7dda61658e5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json index 62357a454806..0ddb5f97a963 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json index 1df81f913967..962eac562dad 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json index 9b98afddeef0..d58e72454870 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json index f8401f3ed865..c2db9a7aedcc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index 9ec40c9df6b4..6f6d6eb72802 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 5cfe2a766547..4b2112b72674 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,12 +1,13 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "cad8a206f2e4194676b9699f26f6560d07130d3f", - "date": "2024-11-24T13:48:58-05:00", - "path": "/nix/store/2xxvslz0q5vl8z94hs1g8cb4x2ri2pan-tree-sitter-rust", - "sha256": "1xxxysiwj0r97sp4wsdmm23pcgsngiw39gsa9jm0achan6basgv9", - "hash": "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc=", + "rev": "18b0515fca567f5a10aee9978c6d2640e878671a", + "date": "2025-04-01T14:02:57-07:00", + "path": "/nix/store/ilgg71axwwq17wcpy3sm5qkqkfh26bgd-tree-sitter-rust", + "sha256": "0x7xqxspdfnbgn9nvrsl2rsnrjbs01i5hy8k8p5wwk2j358hjyyb", + "hash": "sha256-y3sJURlSTM7LRRN5WGIAeslsdRZU522Tfcu6dnXH/XQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index b2de7e082f84..c4e47bf15191 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json index ef5caa8e43ec..d03302900db6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json @@ -1,12 +1,13 @@ { "url": "https://github.com/6cdh/tree-sitter-scheme", - "rev": "63e25a4a84142ae7ee0ee01fe3a32c985ca16745", - "date": "2024-09-08T01:23:30+08:00", - "path": "/nix/store/1wk7w5vkxcwqx24qlm203z1z5rw95vn8-tree-sitter-scheme", - "sha256": "12p8g2mnd73lanibk16llhbx7xarlcl2ihngcibhpa4bzppcbb8l", - "hash": "sha256-FK3F7v2LqAtXZM/CKCijWfXTF6TUhLmiVXScZqt46Io=", + "rev": "e35b41a183164f4a12e10da3d0c430e837c3d75a", + "date": "2025-05-25T19:18:44+08:00", + "path": "/nix/store/lg0zvr4w9pryyz725vd5hdf7gvg7idx1-tree-sitter-scheme", + "sha256": "12dclaaj4snar68hcwfc1kmnbww4ykf1ab2q81r3k9989m7f1ckn", + "hash": "sha256-drLgTk0opTlyQFgsFdz0hPNl6wzMcQaRycpqIpWirIk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json index 6212e7a66822..f25d2196fb47 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json index c95def892a1a..f63a144843fd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json index bc24e7aa108b..80e7839df85f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json index 3108dc0d129e..a4d4f7bfe956 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index 3c950cdb7ffd..9c3c7898b0cf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json index ebf0c40e5579..7f47d64fd963 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json index 047ede66e432..4e693c88f96c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index 7ffb07e2e731..d7e1dce60b16 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json index 827afca5f9b1..967abcd46f39 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json index fae3c615dce4..634c62d4e732 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json @@ -1,12 +1,13 @@ { "url": "https://github.com/vrischmann/tree-sitter-templ", - "rev": "def9849184de71a797c4e2b2837df85abeccf92c", - "date": "2025-02-06T21:56:41+01:00", - "path": "/nix/store/qjzb3snk7m49qhfhdd1z7lhjlhwgg4mk-tree-sitter-templ", - "sha256": "1035mfjikzy9c6w4wf59z91vyh0m36gdcw8xj4qa5i0k9ma8pq1d", - "hash": "sha256-LeCLVE0TxKIwkR1x1p4ZFUC/Q/qpOE64Ycn/GaWrZYA=", + "rev": "de35706f89beed5087670a9c4421b7794ef02411", + "date": "2025-06-01T21:02:54+02:00", + "path": "/nix/store/9m1jydr3j1m876dmazg9kzvs7878a7ly-tree-sitter-templ", + "sha256": "0vbhks5879b7bpygxr9zba142zsb760j4im1gzbgcl6yj6q59j30", + "hash": "sha256-YMhUsJHeUPbWf6FGIoE5S39Bglo/5f78XWelg4qecG0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json index 74a2a35cbe52..eaa3810597b8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json @@ -1,12 +1,13 @@ { "url": "https://github.com/uncenter/tree-sitter-tera", - "rev": "284840b9809741c7fe474204c62f687b04da8104", - "date": "2025-02-07T10:08:29-05:00", - "path": "/nix/store/lzcz6qpp4cz3ki1ray05fgii7m48zf84-tree-sitter-tera", - "sha256": "1mrrl47gk8zzi6l9k65h53xpwharni1k6k2bm90is96sxiq883n3", - "hash": "sha256-ww6EcOzaJB1BqktMM0O0WUF++yiwmJmoif+j+Q6hOdc=", + "rev": "d006172998fa8b81f96b0f2fc7fa2bf25207c46b", + "date": "2025-04-16T08:51:56-04:00", + "path": "/nix/store/364masbjrvf29v30h4hbzwds1j438k7a-tree-sitter-tera", + "sha256": "0cwihdzlm8jk8g006j234pjnw0apv3l8ixn4kmdc60hzh3bb9ypr", + "hash": "sha256-+fq01oAfAsNancT2iOjYVwFu5SVDSAPAQ1OiSn+DkTM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json index 70a6bdf840dc..f8c71de32cc2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json @@ -1,12 +1,13 @@ { "url": "https://github.com/ambroisie/tree-sitter-tiger", - "rev": "a7f11d946b44244f71df41d2a78af0665d618dae", - "date": "2023-08-29T21:54:01+01:00", - "path": "/nix/store/ynxdy89llzc9kqqw0h2fmv81dna7wrxq-tree-sitter-tiger", - "sha256": "100cpj00w021hk0cgn5qbgqa6yn8ji58hl77qf3054h2jxzxnsnc", - "hash": "sha256-zGrbf5cCkgKGw+dQiEqUyHqj8Fu42MfAhEEADoC8DIA=", + "rev": "4a77b2d7a004587646bddc4e854779044b6db459", + "date": "2025-03-13T19:58:23Z", + "path": "/nix/store/ps5vkphx7wqlzzj8j02sqi7hcgmbwh1c-tree-sitter-tiger", + "sha256": "0d4rwxi6zc8psy2adw8lhmvvk0f1miv6w517aiqq11njfbg4kdwc", + "hash": "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index fda7ed856d18..31f805c26b87 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json index 5a329320368a..46c62e91c5ae 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json index cf6c2941a241..b38bdb4efa69 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json index 8523faec3758..cf7e1a6389c6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json index 67d49b9507e0..d832cc784436 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 524720491330..1dedf08f9884 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json index 1a10518cbfd3..ff9c3b0644a2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json index 5ce9ec929f5e..a6e730e442ed 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json index 8fc8bbf4d539..ee51cfb86568 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index eec5937247b6..fced9927e7c0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json index 6d7140853580..e54a956a0316 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json index 51c6f00b20a3..5aaece48adf5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json index 71879d700f85..55c6653c18da 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json index e7e4b42987d5..94b8ac0f1cf3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json index 441acd3efcb7..e9f5b2ba1e62 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index daede42ece96..8363525841c7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -8,5 +8,6 @@ "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index 8e26d173fd90..164feec97923 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -22,6 +22,7 @@ in pnpmWorkspaces ? [ ], prePnpmInstall ? "", pnpmInstallFlags ? [ ], + fetcherVersion ? null, ... }@args: let @@ -45,6 +46,10 @@ in "pnpm.fetchDeps: `pnpmWorkspace` is no longer supported, please migrate to `pnpmWorkspaces`." ) true; + assert (lib.throwIf (fetcherVersion == null) + "pnpm.fetchDeps: `fetcherVersion` is not set, see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion." + ) true; + stdenvNoCC.mkDerivation ( finalAttrs: ( @@ -96,6 +101,11 @@ in --registry="$NIX_NPM_REGISTRY" \ --frozen-lockfile + # Store newer fetcherVersion in case pnpm.configHook also needs it + if [[ ${toString fetcherVersion} -gt 1 ]]; then + echo ${toString fetcherVersion} > $out/.fetcher-version + fi + runHook postInstall ''; @@ -108,6 +118,23 @@ in jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f done + # Ensure consistent permissions + # NOTE: For reasons not yet fully understood, pnpm might create files with + # inconsistent permissions, for example inside the ubuntu-24.04 + # github actions runner. + # To ensure stable derivations, we need to set permissions + # consistently, namely: + # * All files with `-exec` suffix have 555. + # * All other files have 444. + # * All folders have 555. + # See https://github.com/NixOS/nixpkgs/pull/350063 + # See https://github.com/NixOS/nixpkgs/issues/422889 + if [[ ${toString fetcherVersion} -ge 2 ]]; then + find $out -type f -name "*-exec" -print0 | xargs -0 chmod 555 + find $out -type f -not -name "*-exec" -print0 | xargs -0 chmod 444 + find $out -type d -print0 | xargs -0 chmod 555 + fi + runHook postFixup ''; diff --git a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh index f66f06c0a867..a9fc3050435b 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh +++ b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh @@ -12,6 +12,13 @@ pnpmConfigHook() { exit 1 fi + fetcherVersion=1 + if [[ -e "${pnpmDeps}/.fetcher-version" ]]; then + fetcherVersion=$(cat "${pnpmDeps}/.fetcher-version") + fi + + echo "Using fetcherVersion: $fetcherVersion" + echo "Configuring pnpm store" export HOME=$(mktemp -d) diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 2009c7a3549f..61553b7ce0e9 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -11,16 +11,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.71.1"; + version = "0.72.0"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - hash = "sha256-RL9P0dPYWLlEGgGWZuIvyULJfH+c/B+3sySVadJQS3w="; + hash = "sha256-0hIxXKq7zu/gq0QAs2Ffuq584a9w1RWctPs9SBfc0/I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4EyDjHreFFFSGf7UoftCh6eI/8nfIP1ANlYWq0K8a3I="; + cargoHash = "sha256-K/iM79RfNU+3f2ae6wy/FMFAD68vfqzSUebqALPJpJY="; buildInputs = [ (lib.getLib clang.cc) ]; diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix index 67a2a2a12844..9b8f98f0630f 100644 --- a/pkgs/development/web/nodejs/gyp-patches.nix +++ b/pkgs/development/web/nodejs/gyp-patches.nix @@ -1,22 +1,28 @@ -{ fetchpatch2 }: +{ + lib, + fetchpatch2, + patch_npm ? true, + patch_tools ? true, +}: let - name = "gyp-darwin-sandbox.patch"; - url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch"; + url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch?full_index=1"; in -[ +lib.optionals patch_tools ([ # Fixes builds with Nix sandbox on Darwin for gyp. # See https://github.com/NixOS/nixpkgs/issues/261820 # and https://github.com/nodejs/gyp-next/pull/216 (fetchpatch2 { - inherit name url; - hash = "sha256-l8FzgLq9CbVJCkXfnTyDQ+vXKCz65wpaffE74oSU+kY="; + inherit url; + hash = "sha256-iV9qvj0meZkgRzFNur2v1jtLZahbqvSJ237NoM8pPZc="; stripLen = 1; extraPrefix = "tools/gyp/"; }) +]) +++ lib.optionals patch_npm ([ (fetchpatch2 { - inherit name url; - hash = "sha256-UVUn4onXfJgFoAdApLAbliiBgM9rxDdIo53WjFryoBI="; + inherit url; + hash = "sha256-1iyeeAprmWpmLafvOOXW45iZ4jWFSloWJxQ0reAKBOo="; stripLen = 1; extraPrefix = "deps/npm/node_modules/node-gyp/gyp/"; }) -] +]) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 873a333e5f38..0ec9e4ec9633 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -428,6 +428,9 @@ let "test-debugger-random-port-with-inspect-port" "test-debugger-launch" "test-debugger-pid" + + # Those are annoyingly flaky, but not enough to be marked as such upstream. + "test-wasi" ] ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [ # These tests fail on x86_64-darwin (even without sandbox). @@ -435,10 +438,13 @@ let "test-fs-readv" "test-fs-readv-sync" "test-vm-memleak" + + # Those are annoyingly flaky, but not enough to be marked as such upstream. + "test-tick-processor-arguments" + "test-set-raw-mode-reset-signal" ] - ++ lib.optional ( - stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64 && majorVersion == "20" - ) "test-tick-processor-arguments" # flaky + # Those are annoyingly flaky, but not enough to be marked as such upstream. + ++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit" ) }" ]; diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 462766a97d27..6110bbed9e63 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -14,11 +14,15 @@ let inherit openssl; python = python3; }; + + gypPatches = callPackage ./gyp-patches.nix { + patch_tools = false; + }; in buildNodejs { inherit enableNpm; - version = "22.16.0"; - sha256 = "720894f323e5c1ac24968eb2676660c90730d715cb7f090be71a668662a17c37"; + version = "22.17.0"; + sha256 = "7a3ef2aedb905ea7926e5209157266e2376a5db619d9ac0cba3c967f6f5db4f9"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then @@ -44,6 +48,7 @@ buildNodejs { hash = "sha256-hSTLljmVzYmc3WAVeRq9EPYluXGXFeWVXkykufGQPVw="; }) ] + ++ gypPatches ++ [ ./configure-armv6-vfpv2.patch ./disable-darwin-v8-system-instrumentation-node19.patch @@ -52,11 +57,11 @@ buildNodejs { ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - # Can be removed after https://github.com/NixOS/nixpkgs/pull/403958. + # Fix for flaky test + # TODO: remove when included in a release (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/9aa57bf8dab2dbfb8b6974fe71d5dbe6daf66244.patch?full_index=1"; - hash = "sha256-k3h8mPgvaIYGAkGmaL+ix7kUnyLw4/PF7wXMAWrPMXo="; - revert = true; + url = "https://github.com/nodejs/node/commit/cd685fe3b6b18d2a1433f2635470513896faebe6.patch?full_index=1"; + hash = "sha256-KA7WBFnLXCKx+QVDGxFixsbj3Y7uJkAKEUTeLShI1Xo="; }) ]; } diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index a467106884b9..7dadeb4aa380 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -17,13 +17,13 @@ let data = stdenv.mkDerivation (finalAttrs: { pname = "path-of-building-data"; - version = "2.55.3"; + version = "2.55.4"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-LGn5dDH1oRD6bi3KGqyiQh7Gu/8k+RRgGRFkUaFa19E="; + hash = "sha256-lRzK5ykdmFH6/I0jmhOB0V7njXsszcp9yaJPx5SBStY="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix index 83d91106b6a5..d0b5c09a101d 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -5,10 +5,6 @@ mkKdeDerivation { pname = "extra-cmake-modules"; - # Don't depend on qdoc (leaks everywhere, causes random cross issues), we don't install the docs anyway - # Upstream PR: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/534 - patches = [ ./no-qdoc.patch ]; - outputs = [ "out" ]; # Packages that have an Android APK (e.g. KWeather) require Python3 at build time. diff --git a/pkgs/kde/frameworks/extra-cmake-modules/no-qdoc.patch b/pkgs/kde/frameworks/extra-cmake-modules/no-qdoc.patch deleted file mode 100644 index aac013520510..000000000000 --- a/pkgs/kde/frameworks/extra-cmake-modules/no-qdoc.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/modules/ECMGenerateQDoc.cmake b/modules/ECMGenerateQDoc.cmake -index b6d64783314de790a5444c3c0d125b8e455883d9..68c570506fdc118ddef6249bce78051569298b4c 100644 ---- a/modules/ECMGenerateQDoc.cmake -+++ b/modules/ECMGenerateQDoc.cmake -@@ -55,8 +55,13 @@ add_custom_target(generate_qch) - add_custom_target(install_qch_docs) - - function(ecm_generate_qdoc target qdocconf_file) -- find_package(Qt6Tools CONFIG REQUIRED) -- find_package(Qt6 COMPONENTS ToolsTools CONFIG REQUIRED) -+ find_package(Qt6Tools CONFIG QUIET) -+ find_package(Qt6 OPTIONAL_COMPONENTS ToolsTools CONFIG QUIET) -+ -+ if (NOT Qt6Tools_FOUND OR NOT Qt6ToolsTools_FOUND) -+ message(STATUS "Qt6Tools or Qt6ToolsTools not found, not generating API documentation") -+ return() -+ endif() - - if (NOT TARGET ${target}) - message(FATAL_ERROR "${target} is not a target") diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix index 71e6d884af98..3ec166b8c061 100644 --- a/pkgs/kde/frameworks/kimageformats/default.nix +++ b/pkgs/kde/frameworks/kimageformats/default.nix @@ -15,7 +15,8 @@ mkKdeDerivation { extraBuildInputs = [ libheif libjxl - libavif + # FIXME: cmake files are broken, disabled for now + # libavif libraw openexr ]; diff --git a/pkgs/kde/frameworks/kio/0001-Remove-impure-smbd-search-path.patch b/pkgs/kde/frameworks/kio/0001-Remove-impure-smbd-search-path.patch deleted file mode 100644 index e541f7a05e8d..000000000000 --- a/pkgs/kde/frameworks/kio/0001-Remove-impure-smbd-search-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From af54a2a37655df26a33bc6783cb472c38f65322f Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 28 Mar 2021 10:31:12 -0500 -Subject: [PATCH 1/2] Remove impure smbd search path - ---- - src/core/ksambashare.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp -index e810ce4..7cfb4e6 100644 ---- a/src/core/ksambashare.cpp -+++ b/src/core/ksambashare.cpp -@@ -61,7 +61,7 @@ KSambaSharePrivate::~KSambaSharePrivate() - bool KSambaSharePrivate::isSambaInstalled() - { - const bool daemonExists = -- !QStandardPaths::findExecutable(QStringLiteral("smbd"), {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty(); -+ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty(); - if (!daemonExists) { - qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd"; - } --- -2.30.1 - diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix index 0bdcb039adff..3e6e6ab0ec74 100644 --- a/pkgs/kde/frameworks/kio/default.nix +++ b/pkgs/kde/frameworks/kio/default.nix @@ -9,8 +9,6 @@ mkKdeDerivation { pname = "kio"; patches = [ - # Remove hardcoded smbd search path - ./0001-Remove-impure-smbd-search-path.patch # Allow loading kio-admin from the store ./allow-admin-from-store.patch ]; diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix index 0c5a3764d71a..608b405cebe0 100644 --- a/pkgs/kde/frameworks/kirigami/default.nix +++ b/pkgs/kde/frameworks/kirigami/default.nix @@ -18,15 +18,6 @@ let unwrapped = mkKdeDerivation { pname = "kirigami"; - # Backport patch recommended by upstream - # FIXME: remove in next update - patches = [ - (fetchpatch { - url = "https://invent.kde.org/frameworks/kirigami/-/commit/21788be688de90d4f12edb9f45967a481801bd5e.patch"; - hash = "sha256-BNp1Sc0qSXBJkyKSYW6sq0s2yN959iwnSxaZtOTmaNc="; - }) - ]; - extraNativeBuildInputs = [ qtsvg qttools diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 5ed6c2f595f1..ed65482e3acb 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/attica-6.15.0.tar.xz", - "hash": "sha256-4tCB8I1eajYYNjE7IJHU1adRjA972ve1PS25cLWgJz8=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/attica-6.16.0.tar.xz", + "hash": "sha256-XRyI9k0G942CWEtSdfIGI1aGb4K3/fuXKKxNxNUJvmo=" }, "baloo": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/baloo-6.15.0.tar.xz", - "hash": "sha256-JBAV/RTqD88oEID9FgmU+StuC6B1DPr9SI0xvw4Kf08=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/baloo-6.16.0.tar.xz", + "hash": "sha256-jCf+7KJasHOGLkM8c1eC8ocTVo0TkKhHcbG6Q/YXH2U=" }, "bluez-qt": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/bluez-qt-6.15.0.tar.xz", - "hash": "sha256-DHCoQ347EKYlkmBiPUgCxEIvf5vU/feb9Swl/uVQEic=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/bluez-qt-6.16.0.tar.xz", + "hash": "sha256-d/bDDzeou+z3PV849DCDh55CCJY50BeUU0V9O1h9pZQ=" }, "breeze-icons": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/breeze-icons-6.15.0.tar.xz", - "hash": "sha256-JdkhAvlVTqI+tu6BQ0OVtRfZP8huXgQVg0p/9EnvhVw=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/breeze-icons-6.16.0.tar.xz", + "hash": "sha256-lG55O2dBJtuYTi94O+SzSOnGjCUn003dcl+csIYpNrQ=" }, "extra-cmake-modules": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/extra-cmake-modules-6.15.0.tar.xz", - "hash": "sha256-980CIJWp5r2+WJdyCiS/2oHSEXV7fAixcwYZYr8u4LI=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/extra-cmake-modules-6.16.0.tar.xz", + "hash": "sha256-6IHBnjNb64IybgLQAHZufugyTXzoWD3w9b/UwmmY+/4=" }, "frameworkintegration": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/frameworkintegration-6.15.0.tar.xz", - "hash": "sha256-bmSHDl09zuKn99ClCbUjZmf6EfeN04zYkjkR8cp7p4Y=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/frameworkintegration-6.16.0.tar.xz", + "hash": "sha256-oOPixXdrGeLeYnOJPwySfvfq3qhqYwHyHhg3fLdZB/w=" }, "kapidox": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kapidox-6.15.0.tar.xz", - "hash": "sha256-VjNGhVjB9liKq1NyrxlRgmZtFhHzQO2Swg/9OE0Z+Jg=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kapidox-6.16.0.tar.xz", + "hash": "sha256-PNJqLDN0teZgMPhcxjTDeNihMYkkn64QNNZKdw3Fzhs=" }, "karchive": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/karchive-6.15.0.tar.xz", - "hash": "sha256-7XQghyLgjdYG89bXMAf6/BoAzInC4p4xl1YC/vRaDxg=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/karchive-6.16.0.tar.xz", + "hash": "sha256-26GP8r4dC1ehgSoz3mYNTPdiPc+qj5wNZO/eIVJAnP8=" }, "kauth": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kauth-6.15.0.tar.xz", - "hash": "sha256-Gce1mKeAulvv0w8l3mlFNoEaRqViLEosKIkvLzulphc=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kauth-6.16.0.tar.xz", + "hash": "sha256-BPPoT9pejOt/EAJm41aaNOgomxBGr07HUFme+tYDSWM=" }, "kbookmarks": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kbookmarks-6.15.0.tar.xz", - "hash": "sha256-BsqMYZ1Sr3vCe4nQs6yZy9EIIHVrKZQT6C+RZP5fuGM=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kbookmarks-6.16.0.tar.xz", + "hash": "sha256-ykZWrUmt1SS0tovChgcaWuR/g+xGof2ODDcT1wrWrbU=" }, "kcalendarcore": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kcalendarcore-6.15.0.tar.xz", - "hash": "sha256-ExQ08ZyTF0LYTwcRP7sFPqGj22EBMCU+K7kn6OrNHTk=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kcalendarcore-6.16.0.tar.xz", + "hash": "sha256-Uh0dKzVuPXzS4L9oeRnJhlXGJs3p7VIOQvxzDnqVvZs=" }, "kcmutils": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kcmutils-6.15.0.tar.xz", - "hash": "sha256-VuenZIZRzpaY6n0f+Yt/7GWYER030vKK4NZUfTyY/wQ=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kcmutils-6.16.0.tar.xz", + "hash": "sha256-QD9esyiP+7xky2dBBIAH3egr45DaLFC6FHy0dJIeM0Q=" }, "kcodecs": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kcodecs-6.15.0.tar.xz", - "hash": "sha256-vfV3M/LWQcsMt0nO1fb2fkLI6dF9s/bC5qIFTIZjbsE=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kcodecs-6.16.0.tar.xz", + "hash": "sha256-2NI83IU6qDK/OYhsa2c/7ocnniWM8Bq+sKz+pfcY5ZU=" }, "kcolorscheme": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kcolorscheme-6.15.0.tar.xz", - "hash": "sha256-d54dBOXKAlG2x1xZyevLvJ1b7qJ1YoqmhdAmDsmKVfI=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kcolorscheme-6.16.0.tar.xz", + "hash": "sha256-RgJtCj1SKUM4n6PvZqEp2fx25eYpXIT4F9ErqqJocwM=" }, "kcompletion": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kcompletion-6.15.0.tar.xz", - "hash": "sha256-k4ytMY3KovyouLjUhT+j96vYM9zwO1HhmhdOYZXMwn0=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kcompletion-6.16.0.tar.xz", + "hash": "sha256-P3HX8kynBFKTIu6tfSEyMx6UYeuRq0idbj2ZDZ18oTM=" }, "kconfig": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kconfig-6.15.0.tar.xz", - "hash": "sha256-yORMn3kLAXHopbLw+jCscKlcxlXHEWUOVLlTM1vmuWs=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kconfig-6.16.0.tar.xz", + "hash": "sha256-umzFjwJf75UlvGQPeWe3wJBTtZLEI2jgltl6lGYaNSU=" }, "kconfigwidgets": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kconfigwidgets-6.15.0.tar.xz", - "hash": "sha256-8Aai/PaNJPe3K3aOBe5bmmHyxd3u6HpvyaAiyDrT8LI=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kconfigwidgets-6.16.0.tar.xz", + "hash": "sha256-YcAlb9rgSbElhr0eDZMegFFdPHAvF4WoiZTuVO7i1cU=" }, "kcontacts": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kcontacts-6.15.0.tar.xz", - "hash": "sha256-mxgJVcgPegn49VLfenCFAf20xPC87hDC5HOsZ+orRXo=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kcontacts-6.16.0.tar.xz", + "hash": "sha256-/1epqxGblYlTNdQnSBAJz/cq6c9tD8L6mlBPls+sal4=" }, "kcoreaddons": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kcoreaddons-6.15.0.tar.xz", - "hash": "sha256-l4w7DYsRtoH/B7vWppU9VM4con57xT2TRy3Za5QjKNc=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kcoreaddons-6.16.0.tar.xz", + "hash": "sha256-eYonRMKW0Tshbq3X5dgBpv1pVpRKIUerKDDDmZMK4qA=" }, "kcrash": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kcrash-6.15.0.tar.xz", - "hash": "sha256-mSSMfKikwqF4NqjMNP+rkgoiO4CVApxjBGE92XNPFHQ=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kcrash-6.16.0.tar.xz", + "hash": "sha256-BuOhCbpZejlRVDMCUElcPgOndLfW8hOjUnia2cNpHcM=" }, "kdav": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kdav-6.15.0.tar.xz", - "hash": "sha256-/OWsZhvyDpmuB9Q/tWZWcY+Qn7mL9idWyB8WJAxTV54=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kdav-6.16.0.tar.xz", + "hash": "sha256-WKHHZkaztSdGp2kOy5hgRIpZ33f8ppGZgxNSdFcGsyU=" }, "kdbusaddons": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kdbusaddons-6.15.0.tar.xz", - "hash": "sha256-/Mwf7zx0WQ0oozQs91a7D/hzdzNsoTZi712qfa+v42A=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kdbusaddons-6.16.0.tar.xz", + "hash": "sha256-O6G5YoSDo4oTt7zmqsCuLW8Rb2JgGTB4biVNpN/V0UU=" }, "kdeclarative": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kdeclarative-6.15.0.tar.xz", - "hash": "sha256-NydIDzw+NsiCQcy8rorEB4/wHmaRFAla/K2e4UuqAJ0=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kdeclarative-6.16.0.tar.xz", + "hash": "sha256-xY33ofUBKG+W0M8LOWWY7eFus8rbyKBdNSNs5N8xyA4=" }, "kded": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kded-6.15.0.tar.xz", - "hash": "sha256-C0wPGUD+HxjU2sxn9mP204Ih3md/lNn7OYhqKwYW1DQ=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kded-6.16.0.tar.xz", + "hash": "sha256-STcvsB3VPCWyeJYD7WroX+VKcS7X90JsiE0HXTE4Gyo=" }, "kdesu": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kdesu-6.15.0.tar.xz", - "hash": "sha256-nrTBGhdCryyxfPHn4Yuw+9tF7hbwg3OcQYy+nUWvGAY=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kdesu-6.16.0.tar.xz", + "hash": "sha256-+cv66IWWz9ALJpdEyJoELfvASCc+NfHH4VhCnbVcjWg=" }, "kdnssd": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kdnssd-6.15.0.tar.xz", - "hash": "sha256-GSFko5XOnwZnGEyuePNpp8C4rKsODQc83tsqVLx8TVo=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kdnssd-6.16.0.tar.xz", + "hash": "sha256-sIvfBcfZjjE2aZWiCHrHRxqJk8SZF9PNecC6HS9pqOA=" }, "kdoctools": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kdoctools-6.15.0.tar.xz", - "hash": "sha256-QwvlkFsL9t+0t+DiwK63WYbu8KMPEzINnUyrkH/Wvvc=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kdoctools-6.16.0.tar.xz", + "hash": "sha256-XAxTGnl4ZQ9ZOmOiq6GmQdWQU350xkSqNhxjWEsRWqI=" }, "kfilemetadata": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kfilemetadata-6.15.0.tar.xz", - "hash": "sha256-0eYs4bf9ZehIqBohG7XLESbM4TVPcDEqAQTAnAPdZUI=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kfilemetadata-6.16.0.tar.xz", + "hash": "sha256-R9aAtiaXQhvf6j3L/rVjUo4+uo2vSFZMPD2lZON2QMU=" }, "kglobalaccel": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kglobalaccel-6.15.0.tar.xz", - "hash": "sha256-hOp3elOTlIPNl9HdwGkzOvHoFBm/7g9txdtNPTYKtVQ=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kglobalaccel-6.16.0.tar.xz", + "hash": "sha256-ZmNGGoJ5i13MufROkcDDfhLJUfh+KVw7p/Rl2se9SqE=" }, "kguiaddons": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kguiaddons-6.15.0.tar.xz", - "hash": "sha256-Vty6tMIwmyg0O+1zkBxTBxxAnf0HdoQN1t2S4tRw168=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kguiaddons-6.16.0.tar.xz", + "hash": "sha256-nh1TpPvh63zMEGEKFzfZslYHVvib9lCUCnQ1bap9suI=" }, "kholidays": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kholidays-6.15.0.tar.xz", - "hash": "sha256-OWhgudY9O7jwywxDPguzz3chOUhC8/uDicg+B7oK5pU=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kholidays-6.16.0.tar.xz", + "hash": "sha256-VwKcNb0Iw2D4hFOyAuDGe5qr3W+fk/LqBmtqhnjdBQE=" }, "ki18n": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/ki18n-6.15.0.tar.xz", - "hash": "sha256-GJd1XZ/eWhvqb31xJEwmYrmRG0uIlMxTdAv+OLTV2R0=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/ki18n-6.16.0.tar.xz", + "hash": "sha256-xSrRCxQ2XmDEohnLZnBtEUR2ZFKXyyqfFUmHR89EIdc=" }, "kiconthemes": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kiconthemes-6.15.0.tar.xz", - "hash": "sha256-iEJwOJlyL5q2tK7AtFw4vumJbjLazLPrF+8BRATJYGs=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kiconthemes-6.16.0.tar.xz", + "hash": "sha256-pzopdsxJNhyPoMYS9TyoGvzyx0psTVWsiikW9X0H5AI=" }, "kidletime": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kidletime-6.15.0.tar.xz", - "hash": "sha256-COxHJIUCzcLIoAO0S1k2v9qdrid6GtuSGAGJJ0XofP4=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kidletime-6.16.0.tar.xz", + "hash": "sha256-V6ekDXCT16Zpf5pD/1XLyyYp7F0o7OSjeqQADvqmGy0=" }, "kimageformats": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kimageformats-6.15.0.tar.xz", - "hash": "sha256-L6sRnGTxFwJhZvSYQKvlwe/j6PmhDZZrNAb/tqYIQDA=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kimageformats-6.16.0.tar.xz", + "hash": "sha256-ht+7BauEX3sZp/7IjhNdFOR68U3BcT2fs5GWZRDB3Es=" }, "kio": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kio-6.15.0.tar.xz", - "hash": "sha256-LUzMW/Bwq8vJRaII7L8gF7OxlfqZ5M6165lQiI93wak=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kio-6.16.0.tar.xz", + "hash": "sha256-Z16/igxyv9/UNO9zUwy3rpISeu/wloiW1nzFqiIzPow=" }, "kirigami": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kirigami-6.15.0.tar.xz", - "hash": "sha256-czrH2cGX/n3pD0FkNUm+PODzcj7NTUoVdYxMccr8JTE=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kirigami-6.16.0.tar.xz", + "hash": "sha256-FtEUKqzYUU+Vz5vbRLKnIPM5e17mikiaVMhqVgr1VRY=" }, "kitemmodels": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kitemmodels-6.15.0.tar.xz", - "hash": "sha256-joydMaAMQe2DYYl1Woa4L9loR01jiPAzJZ3WWrGOfJQ=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kitemmodels-6.16.0.tar.xz", + "hash": "sha256-cXZuqeePcL1PYbFg9wsx94JcX0x8dNOXFmqdrnsdz1w=" }, "kitemviews": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kitemviews-6.15.0.tar.xz", - "hash": "sha256-DyfRiRR7uZK5ThpqVc7WLiqvXFs9g+QfJtaw4ml2V4A=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kitemviews-6.16.0.tar.xz", + "hash": "sha256-xFVB2F7BsG0WC4GcA/BzzwAaYEEfHUVwamEdnquSFN0=" }, "kjobwidgets": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kjobwidgets-6.15.0.tar.xz", - "hash": "sha256-1ce2jqiCl4WpH9bkx7OsVx1Yve4ZN3dkjlIJjEnwVP4=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kjobwidgets-6.16.0.tar.xz", + "hash": "sha256-UXcD8BiOx911mvONosAyLuKnYxIlGJhTYmr5r/C5Syo=" }, "knewstuff": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/knewstuff-6.15.0.tar.xz", - "hash": "sha256-10n+IViah832SEFuvRMDilNs2OAZUxNXpnGU5eowBn0=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/knewstuff-6.16.0.tar.xz", + "hash": "sha256-U+QJqJvXqMHxWOKFG67gPutRZMn6Kp0MD5VtI9bhTmI=" }, "knotifications": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/knotifications-6.15.0.tar.xz", - "hash": "sha256-l7+H61eIOrOuSDxHIGiKHKU5dwuZF5tkYQqAK7la7e4=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/knotifications-6.16.0.tar.xz", + "hash": "sha256-Qj2kEFllekljRenXUoqw4N3lP2eBYPL64su8WDypO58=" }, "knotifyconfig": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/knotifyconfig-6.15.0.tar.xz", - "hash": "sha256-vwMTIh/O8OR0uWNjTG1SUmuYWDAOnvDhRK/ChOjcdKw=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/knotifyconfig-6.16.0.tar.xz", + "hash": "sha256-kNgo39VsCWU7yVyR5yyQwBnUAhQ3dZ1B5eCay7GDypg=" }, "kpackage": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kpackage-6.15.0.tar.xz", - "hash": "sha256-XJYVu9kq9n4b8UeilzmjRqc7Of88RkD55AjVQwlmYS0=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kpackage-6.16.0.tar.xz", + "hash": "sha256-pF/OECbbO2XN0d0OETdICOJoaRSgYvZkTrqo7TCO48s=" }, "kparts": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kparts-6.15.0.tar.xz", - "hash": "sha256-M0q/jCrFmMVxFc6bhyrcWh+1DoiZvO1Bbjn9My48R0I=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kparts-6.16.0.tar.xz", + "hash": "sha256-3z40gzQPqeuyDlwL9VfOxI3r/Sr53TE70bxFUTHGu2c=" }, "kpeople": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kpeople-6.15.0.tar.xz", - "hash": "sha256-UAXzm3JXhWmgy5Uj5Xz45i6BVyMm/Gkb6fvs8o5jjqg=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kpeople-6.16.0.tar.xz", + "hash": "sha256-9tT7agWVy7D7CiabFQT59fCkgWYyjIoujeWGFAOV+2o=" }, "kplotting": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kplotting-6.15.0.tar.xz", - "hash": "sha256-X3EF8BXu5nrN64qW+5RIGGpgW2Jz8K+JoFXCchyrWdw=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kplotting-6.16.0.tar.xz", + "hash": "sha256-ohF+0QtcWZL5sWDLmLxTBCzdJX3mubny9bpKalwAvQY=" }, "kpty": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kpty-6.15.0.tar.xz", - "hash": "sha256-0qacjJzG1pbExxc1e7bWWB9d32Sq2D6a6YkDsfLgqLE=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kpty-6.16.0.tar.xz", + "hash": "sha256-l2Gx9a9/oQ5+PKi1KpoQ4kr5lN565kLBVdunyZsU6c8=" }, "kquickcharts": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kquickcharts-6.15.0.tar.xz", - "hash": "sha256-+fL0vqV3/tin8d3qNGF+/nRRekkunAch8C8swI+2eG0=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kquickcharts-6.16.0.tar.xz", + "hash": "sha256-A6cPpbWx8Ji7zAIN0XkrjAuZnYvnzNGzS3n1t6OfGD0=" }, "krunner": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/krunner-6.15.0.tar.xz", - "hash": "sha256-jK4nEG0zVCJ5pc7GK8wOyv7ItUD1ODOPdKJ/oNCS+fM=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/krunner-6.16.0.tar.xz", + "hash": "sha256-8xF0ETFVLRSHWIBwfXBAICi/sADQ2W+Ac0ZDEfyrXbw=" }, "kservice": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kservice-6.15.0.tar.xz", - "hash": "sha256-w3G/5uJellv03OHx5CyEwvaJl+1J3Bm9vGQZR4I1Jp0=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kservice-6.16.0.tar.xz", + "hash": "sha256-7l7J6pMVqdHlLT5t4duLuPPZRcQmCoUjy+NIl7HMCB4=" }, "kstatusnotifieritem": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kstatusnotifieritem-6.15.0.tar.xz", - "hash": "sha256-JBMsyWdXBHi1TkTu8QY8GTIXgBJg3FGGDgiB+g2QvQ0=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kstatusnotifieritem-6.16.0.tar.xz", + "hash": "sha256-c8JZCy9vtfYfw7fcAh33Y78POWnB6rjF0Lhd9EWsrSA=" }, "ksvg": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/ksvg-6.15.0.tar.xz", - "hash": "sha256-lVxc6yiHnRAQbLgH9PJZgQxwW7u92vFwrw1WP71YAZc=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/ksvg-6.16.0.tar.xz", + "hash": "sha256-7jvwcm6EE3wTHM1cYcF/CO3AwNjp+ifSbNOkUk9c9sM=" }, "ktexteditor": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/ktexteditor-6.15.0.tar.xz", - "hash": "sha256-6pp8CEBCJQvfoz6b9fwdxwDVWytf2PKrpkC/+QOS4j0=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/ktexteditor-6.16.0.tar.xz", + "hash": "sha256-q+v+ep7kuhq44bG4A16UihdEUczoq0rYJ404mg5ZcSg=" }, "ktexttemplate": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/ktexttemplate-6.15.0.tar.xz", - "hash": "sha256-XGUuuuXTLRuE+kOK2UzGIWIdMeCrz+87ClEaWG1peoQ=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/ktexttemplate-6.16.0.tar.xz", + "hash": "sha256-GIDPGokAMdxhclE9Pf54841XJhhJeCIMpxQqOm5A+bU=" }, "ktextwidgets": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/ktextwidgets-6.15.0.tar.xz", - "hash": "sha256-4TSUHvmJYikla65pebx8En+dybh5RIs2mky2siYEJkk=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/ktextwidgets-6.16.0.tar.xz", + "hash": "sha256-y3GK4SwoobF/LlUvCPEhrqmabdX/Q3snBYGrknCgLqE=" }, "kunitconversion": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kunitconversion-6.15.0.tar.xz", - "hash": "sha256-QTsCVNUeNXFx1B8csWJivkV3X7lKauXCaTT7X/ANKvg=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kunitconversion-6.16.0.tar.xz", + "hash": "sha256-paRy6b9YQZEZXdQH0JvEZ5o0uGmpern9+DqspY6LDg0=" }, "kuserfeedback": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kuserfeedback-6.15.0.tar.xz", - "hash": "sha256-DB6tibqY96otPkJ2IKNlzU8cnKMCUO7Gr7T5D+wYf4M=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kuserfeedback-6.16.0.tar.xz", + "hash": "sha256-9PdE4KqHikyYSZ7vp5jq7Z3ZzesZIYIpKlTf1+uB5vU=" }, "kwallet": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kwallet-6.15.0.tar.xz", - "hash": "sha256-/brETCUlsS4ks7pZcZEqL/2R/f6nnDoSS86JYhc1iTw=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kwallet-6.16.0.tar.xz", + "hash": "sha256-2N0zDSxGQ9M1BQwXCSUilBCKdat3zbZytW9AvKaFTu0=" }, "kwidgetsaddons": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kwidgetsaddons-6.15.0.tar.xz", - "hash": "sha256-I1V+g9pdSb8XIqrQeEYBWh/OzBCnA0KsnLVLes/4hDU=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kwidgetsaddons-6.16.0.tar.xz", + "hash": "sha256-dmP4gFL9jKlHuf4Lvq0E/yKOiE8SRJijKMww6fFykVw=" }, "kwindowsystem": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kwindowsystem-6.15.0.tar.xz", - "hash": "sha256-OdarY75X7UTDz8YTG6jlBzqfkqXye8WPY4sHndBj5MA=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kwindowsystem-6.16.0.tar.xz", + "hash": "sha256-3DtaxeXq6lt2r46F8GXdvOkf9+P8wTxtYArVO7U7GzE=" }, "kxmlgui": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/kxmlgui-6.15.0.tar.xz", - "hash": "sha256-QM6NRy0XGoGYBq8NWmjD+R1Za1rotLKcRlkqCXjXwwU=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/kxmlgui-6.16.0.tar.xz", + "hash": "sha256-Jv5TddlQKcWoKNW0f8SyDoaEvDvojfG8lAgoIc4yp04=" }, "modemmanager-qt": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/modemmanager-qt-6.15.0.tar.xz", - "hash": "sha256-LtXe1N285weMXuHylVM8CVFRpWIlYUhIVnTwqeOTLmE=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/modemmanager-qt-6.16.0.tar.xz", + "hash": "sha256-O5kp60TDNZpr6cX/D68oGKJ3E/4kfcJdSX87UfYi+J4=" }, "networkmanager-qt": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/networkmanager-qt-6.15.0.tar.xz", - "hash": "sha256-rEF4Y0KxBv50V9QU4teSicbXINz6pYwnHFDI5KdUs5s=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/networkmanager-qt-6.16.0.tar.xz", + "hash": "sha256-ue0LqpFZzFqsdlG+SKmAzHy1g5M8QSzvg4WWEoy9ZkU=" }, "prison": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/prison-6.15.0.tar.xz", - "hash": "sha256-ND8dvIL+b92q0IuTpgBI7RGgDFyX+yswQw1xmdYU378=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/prison-6.16.0.tar.xz", + "hash": "sha256-OCsrnjoAVcNLYCkDUrhWaov/dcqHNblTSgdjg9bk5RA=" }, "purpose": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/purpose-6.15.0.tar.xz", - "hash": "sha256-0cDJSmpsoR4txEdDHQBeEac97DNpK+9hmwuXu1JfxJ4=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/purpose-6.16.0.tar.xz", + "hash": "sha256-qg/yyY4M1RfE2BkUuij0phAbJe6ayxd0gJZ/RbA5iL8=" }, "qqc2-desktop-style": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/qqc2-desktop-style-6.15.0.tar.xz", - "hash": "sha256-q+Kq/QTra3AHdspXZOuFz4cFqYdiTLoYlBOTpnwhUQo=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/qqc2-desktop-style-6.16.0.tar.xz", + "hash": "sha256-OrEsPiMsbFvco5c4rG8aUXvv9tpY3jbhAUuDVf9jw+c=" }, "solid": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/solid-6.15.0.tar.xz", - "hash": "sha256-YIstOtmHNpcYov6KX6e3HHX6pRog6v9bprDt8OXru0o=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/solid-6.16.0.tar.xz", + "hash": "sha256-AOxgnXmTNbr7l7an1KXAYatKDrEOQIno4QSUIyG+uKA=" }, "sonnet": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/sonnet-6.15.0.tar.xz", - "hash": "sha256-D3xzFa+68sj32JjUqWDFu6uFHmUzj3mu5U926SUjSIY=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/sonnet-6.16.0.tar.xz", + "hash": "sha256-F0LNOh3Es7ejhx79lxXv0nEL/7eimg6rFdTBeqzKwrg=" }, "syndication": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/syndication-6.15.0.tar.xz", - "hash": "sha256-jWreiBIpWp05eKwbLNRswPsYGcWYABViWChR2UQu4Bo=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/syndication-6.16.0.tar.xz", + "hash": "sha256-kB9ScHIJEYGBdAJObNL+RMlMdS822wzhjTp9zZpstt4=" }, "syntax-highlighting": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/syntax-highlighting-6.15.0.tar.xz", - "hash": "sha256-eySQ5rplb9hZdNl3au3oKKCkUOtE6teWnUhO2UhsdMw=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/syntax-highlighting-6.16.0.tar.xz", + "hash": "sha256-dKE3GbTz+l26cjUrVnPLbnu2EhveHiiG8dr/J+LyT1o=" }, "threadweaver": { - "version": "6.15.0", - "url": "mirror://kde/stable/frameworks/6.15/threadweaver-6.15.0.tar.xz", - "hash": "sha256-GuDlkxgsJeyKnuhXd6t2e2w3sPfnpoUdS21Jv+A9odA=" + "version": "6.16.0", + "url": "mirror://kde/stable/frameworks/6.16/threadweaver-6.16.0.tar.xz", + "hash": "sha256-6J0fJ2rvd0MN1X9/LlwZW3IBM06e0RTcJMe6WUMOFLY=" } } \ No newline at end of file diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 3d6f31030b6f..6af2da10e8a8 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.11"; + version = "2.4.12"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - hash = "sha256-moj+HaOimpF8P8Z85usxeDmdaOGlSMbYbHDZsTZR/XE="; + hash = "sha256-sd3hkaSuJ2DEciDILKYVWijDgnAebBoBWdEFSZAjHVk="; }; outputs = [ diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 6098c9a5d419..774185941a9b 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -7,7 +7,6 @@ python3Packages, makeWrapper, libsamplerate, - celt, wafHook, # Darwin Dependencies aften, @@ -19,7 +18,6 @@ dbus ? null, libffado ? null, alsa-lib ? null, - libopus ? null, # Extra options prefix ? "", @@ -38,7 +36,6 @@ let optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; optLibffado = if libOnly then null else shouldUsePkg libffado; optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; - optLibopus = shouldUsePkg libopus; in stdenv.mkDerivation (finalAttrs: { pname = "${prefix}jack2"; @@ -64,12 +61,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsamplerate - celt optDbus optPythonDBus optLibffado optAlsaLib - optLibopus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ aften diff --git a/pkgs/os-specific/linux/ajantv2/default.nix b/pkgs/os-specific/linux/ajantv2/default.nix index ba298dc278ee..39518f00d522 100644 --- a/pkgs/os-specific/linux/ajantv2/default.nix +++ b/pkgs/os-specific/linux/ajantv2/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation { inherit (libajantv2) src; sourceRoot = "${libajantv2.src.name}/driver/linux"; + patches = [ + ./fix-linux-6.15.patch + ]; + patchFlags = "-p3"; + hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -35,5 +40,7 @@ stdenv.mkDerivation { "aarch64-linux" ]; description = "AJA video driver"; + # FTB for hardened 5.10/5.15 kernels + broken = kernel.kernelOlder "6" && kernel.isHardened; }; } diff --git a/pkgs/os-specific/linux/ajantv2/fix-linux-6.15.patch b/pkgs/os-specific/linux/ajantv2/fix-linux-6.15.patch new file mode 100644 index 000000000000..10bfdf5f694c --- /dev/null +++ b/pkgs/os-specific/linux/ajantv2/fix-linux-6.15.patch @@ -0,0 +1,61 @@ +From 8eacfa908f7d9b366d68e0ea0516fdd867a1e492 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Sun, 22 Jun 2025 19:38:10 +0100 +Subject: [PATCH 5/5] Use ccflags-y instead of EXTRA_CFLAGS, which stopped + working in Linux 6.15 + +--- + driver/linux/Makefile | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/driver/linux/Makefile b/driver/linux/Makefile +index f714ff9b..da4ee90b 100644 +--- a/driver/linux/Makefile ++++ b/driver/linux/Makefile +@@ -25,10 +25,10 @@ VERSIONING = -DSDKVER_MAJ=$(SDKVER_MAJ) -DSDKVER_MIN=$(SDKVER_MIN) -DSDKVER_PN + DISTRO_INFO = -DDISTRO_TYPE=$(DISTRO_TYPE) -DDISTRO_IS_RHEL_LIKE=$(DISTRO_IS_RHEL_LIKE) \ + -DDISTRO_MAJ_VERSION=$(DISTRO_MAJ_VERSION) -DDISTRO_MIN_VERSION=$(DISTRO_MIN_VERSION) \ + -DDISTRO_KERNEL_PKG_MAJ=$(DISTRO_KERNEL_PKG_MAJ) -DDISTRO_KERNEL_PKG_MIN=$(DISTRO_KERNEL_PKG_MIN) -DDISTRO_KERNEL_PKG_PNT=$(DISTRO_KERNEL_PKG_PNT) +-EXTRA_CFLAGS += -DAJALinux -DXENA2 $(DBG) -D$(NTV2TARGET) -D$(A_ARCH) $(EXTRA_DEPS) $(VERSIONING) $(DISTRO_INFO) $(INCLUDES) -Wall -Wno-implicit-fallthrough ++ccflags-y += -DAJALinux -DXENA2 $(DBG) -D$(NTV2TARGET) -D$(A_ARCH) $(EXTRA_DEPS) $(VERSIONING) $(DISTRO_INFO) $(INCLUDES) -Wall -Wno-implicit-fallthrough + + ifdef AJA_HEVC +- EXTRA_CFLAGS += -DAJA_HEVC=$(AJA_HEVC) ++ ccflags-y += -DAJA_HEVC=$(AJA_HEVC) + endif + + # if rdma is set +@@ -73,7 +73,7 @@ ifeq ($(NVIDIA_KO),) + endif + + ifdef NVIDIA_IGPU +- EXTRA_CFLAGS += -DAJA_IGPU=1 ++ ccflags-y += -DAJA_IGPU=1 + ifneq ($(NVIDIA_KO),) + ifeq ($(NVIDIA_SYMVERS),) + NVIDIA_GEN_SYMVERS := ./nvidia-ko-to-module-symvers $(NVIDIA_KO) $(A_LINUX_DRIVER_PATH)/nvidia.symvers +@@ -91,17 +91,17 @@ endif + + # determine if the ko is gpl - no ko is proprietary igpu + ifeq ($(NVIDIA_KO),) +- EXTRA_CFLAGS += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 -DNVIDIA_PROPRIETARY=1 ++ ccflags-y += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 -DNVIDIA_PROPRIETARY=1 + else + ifeq ($(shell modinfo $(NVIDIA_KO) | grep license: | grep GPL),) +- EXTRA_CFLAGS += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 -DNVIDIA_PROPRIETARY=1 ++ ccflags-y += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 -DNVIDIA_PROPRIETARY=1 + else +- EXTRA_CFLAGS += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 ++ ccflags-y += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 + endif + endif + + ifdef AJA_CREATE_DEVICE_NODES +- EXTRA_CFLAGS += -DAJA_CREATE_DEVICE_NODES=$(AJA_CREATE_DEVICE_NODES) ++ ccflags-y += -DAJA_CREATE_DEVICE_NODES=$(AJA_CREATE_DEVICE_NODES) + endif + + AJANTV2INCS = $(A_LIB_NTV2_INC)/ajaexport.h \ +-- +2.49.0 + diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 1fee859946b2..b2ca5dca7cf9 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -3,12 +3,15 @@ stdenv, fetchurl, fetchFromGitHub, - fetchpatch2, kernel, }: let version = "6.30.223.271"; + # Patchset release number from rpmfusion, to more easily differentiate + # versions and updates. See `wl-kmod.spec` file: + # https://github.com/rpmfusion/wl-kmod/blob/master/wl-kmod.spec#L19 + release = "57"; hashes = { i686-linux = "sha256-T4twspOsjMXHDlca1dGHjQ8p0TOkb+eGmGjZwZtQWM0="; x86_64-linux = "sha256-X3l3TVvuyPdja1nA+wegMQju8eP9MkVjiyCFjHFBRL4="; @@ -21,8 +24,8 @@ let rpmFusionPatches = fetchFromGitHub { owner = "rpmfusion"; repo = "wl-kmod"; - rev = "9a5a0d7195e0f6b05ff97e948b97fb0b7427cbf2"; - hash = "sha256-pOOkkOjc77KGqc9fWuRyRsymd90OpLEnbOvxBbeIdKQ="; + rev = "b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957"; + hash = "sha256-v7mZ2S/eVfGTEXrxpdiemHhrC+P3/sPOZqTBhRtins4="; }; patchset = [ "wl-kmod-001_wext_workaround.patch" @@ -55,10 +58,14 @@ let "wl-kmod-028_kernel_6.12_adaptation.patch" "wl-kmod-029_kernel_6.13_adaptation.patch" "wl-kmod-030_kernel_6.14_adaptation.patch" + "wl-kmod-031_replace_EXTRA_CFLAGS_EXTRA_LDFLAGS_with_ccflags-y_ldflags-y.patch" + "wl-kmod-032_add_MODULE_DESCRIPTION_macro.patch" + "wl-kmod-033_disable_objtool_add_warning_unmaintained.patch" + "wl-kmod-034_kernel_6.15_adaptation_replace_del_timer_with_timer_delete.patch" ]; in stdenv.mkDerivation { - name = "broadcom-sta-${version}-${kernel.version}"; + name = "broadcom-sta-${version}-${release}-${kernel.version}"; src = fetchurl { url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}"; @@ -94,9 +101,25 @@ stdenv.mkDerivation { meta = { description = "Kernel module driver for some Broadcom's wireless cards"; - homepage = "http://www.broadcom.com/support/802.11/linux_sta.php"; + homepage = "https://www.broadcom.com/support/download-search?pg=Legacy%20Products&pf=Legacy%20Wireless&pn&pa&po&dk&pl"; license = lib.licenses.unfreeRedistributable; - maintainers = [ lib.maintainers.j0hax ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + j0hax + nullcube + ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; + knownVulnerabilities = [ + "CVE-2019-9501: heap buffer overflow, potentially allowing remote code execution by sending specially-crafted WiFi packets" + "CVE-2019-9502: heap buffer overflow, potentially allowing remote code execution by sending specially-crafted WiFi packets" + ( + "The Broadcom STA wireless driver is not maintained " + + "and is incompatible with Linux kernel security mitigations. " + + "It is heavily recommended to replace the hardware and remove the driver. " + + "Proceed at your own risk!" + ) + ]; }; } diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index e2d170865c2a..41c86f07a976 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { inherit hash; }; - preAutoreconf = "touch config.rpath"; - patches = lib.optional (!isFuse3 && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isLoongArch64)) (fetchpatch { @@ -52,6 +50,7 @@ stdenv.mkDerivation rec { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch?id=8a970396fca7aca2d5a761b8e7a8242f1eef14c9"; sha256 = "sha256-ELYBW/wxRcSMssv7ejCObrpsJHtOPJcGq33B9yHQII4="; }) + ./fuse2-gettext-0.25.patch ] ); @@ -76,17 +75,12 @@ stdenv.mkDerivation rec { "man" ] ++ lib.optional isFuse3 "udev"; - mesonFlags = lib.optionals isFuse3 ( - [ - "-Dudevrulesdir=/udev/rules.d" - "-Duseroot=false" - "-Dinitscriptdir=" - ] - # examples fail to build on musl - # error: ‘RENAME_NOREPLACE’ was not declared in this scope - # lib.optionals instead of lib.mesonBool to avoid rebuilds - ++ lib.optionals (stdenv.hostPlatform.isMusl) [ "-Dexamples=false" ] - ); + mesonFlags = lib.optionals isFuse3 [ + "-Dudevrulesdir=/udev/rules.d" + "-Duseroot=false" + "-Dinitscriptdir=" + "-Dexamples=false" # examples fail on musl and are just generally useless + ]; # Ensure that FUSE calls the setuid wrapper, not # $out/bin/fusermount. It falls back to calling fusermount in @@ -112,9 +106,6 @@ stdenv.mkDerivation rec { # No need to use the SUID wrapper. substituteInPlace util/mount.fuse.c \ --replace-fail '"su"' '"${lib.getBin shadow.su}/bin/su"' - substituteInPlace makeconf.sh \ - --replace-fail 'CONFIG_RPATH=/usr/share/gettext/config.rpath' 'CONFIG_RPATH=${lib.getLib gettext}/share/gettext/config.rpath' - ./makeconf.sh ''; # v2: no tests, v3: all tests get skipped in a sandbox diff --git a/pkgs/os-specific/linux/fuse/fuse2-gettext-0.25.patch b/pkgs/os-specific/linux/fuse/fuse2-gettext-0.25.patch new file mode 100644 index 000000000000..1f5cb7711eea --- /dev/null +++ b/pkgs/os-specific/linux/fuse/fuse2-gettext-0.25.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 9946a0e..4621771 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,6 +4,8 @@ AC_PREREQ(2.59d) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE([foreign]) ++AM_GNU_GETTEXT_VERSION([0.25]) ++AM_GNU_GETTEXT([external]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) + AC_CONFIG_HEADERS(include/config.h) + diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index fb6a33b29ad4..24fa44148956 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,15 +1,15 @@ { "testing": { - "version": "6.16-rc5", - "hash": "sha256:0will8rmmdlcxyrflr778264h9pfv67cpqqnas112r248vicnkny" + "version": "6.16-rc6", + "hash": "sha256:03sz5gbnz1s763nlq2sbqk3bmjca24hq2n9wrpqhy6gyrd11s22f" }, "6.1": { - "version": "6.1.144", - "hash": "sha256:1kvskw600nm6ybd5yr940cx3fz0l9myyqzsk7l30cxdx5yjbsj8g" + "version": "6.1.145", + "hash": "sha256:0qrkcrqb0migsrq6xl1idyz8n6vjbdk74z4sc9na97b6n5vp0r9i" }, "5.15": { - "version": "5.15.187", - "hash": "sha256:057zmzq364483gc5n9aab8mi0bxbk3nyc2nnziwq4hc197l6wy11" + "version": "5.15.188", + "hash": "sha256:1nfcrdwa2mgih57ch9kh8gc6jl950a7vpqgr56xk1b02303km5f4" }, "5.10": { "version": "5.10.239", @@ -20,12 +20,12 @@ "hash": "sha256:1adn0pbk8y1zp1yrz83ch6h4wypm2qvbnx4xig3sls2nfgvmi0f4" }, "6.6": { - "version": "6.6.97", - "hash": "sha256:0fzfp46czdk3v8mnphiv9n68xf434igjkhx9nxbdlhl1cdqc2rrv" + "version": "6.6.98", + "hash": "sha256:1raxyhvv0yay3k1izwcqdbq9322nflflfzcn9d1jrhmb032k8si9" }, "6.12": { - "version": "6.12.37", - "hash": "sha256:15gzcbkjkycvghjvpx3qshnc4416fw3ln2afip1hlpjv839dyvwk" + "version": "6.12.38", + "hash": "sha256:1k0gcwavn5iws3z1as39227i2hnc62qnfddjfqy7k7ymhf6zldgh" }, "6.15": { "version": "6.15.6", diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ae7e1cbcead2..8e04958ba462 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -23,9 +23,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.15.4"; # lqx - suffix = "lqx2"; # lqx - sha256 = "197m75li8lhkcil8mkb402v8f166n0m52l450dar8mq4y89r7x3j"; # lqx + version = "6.15.6"; # lqx + suffix = "lqx1"; # lqx + sha256 = "092yz6r6wzkafr0rafb1qdapghjwr33dlx3id5jn03jkq4g8jgmd"; # lqx isLqx = true; }; }; diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index 2b90ddf7ae65..9c4576c9256c 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installPhase = '' - runHook preInstall - - install -D ${pname}.ko $out/lib/modules/${kernel.modDirVersion}/extra/${pname}.ko - - runHook postInstall - ''; + installTargets = [ "modules_install" ]; + installFlags = [ + "-C" + "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + "M=$(PWD)" + ] ++ makeFlags; meta = with lib; { description = "Kernel module for Nvidia NIC firmware update"; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index a888c5b9a5da..9374f9585f92 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -101,13 +101,13 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "570.123.18"; - persistencedVersion = "550.142"; - settingsVersion = "550.142"; - sha256_64bit = "sha256-GoBNatVpits13a3xsJSUr9BFG+5xrUDROfHmvss2cSY="; - openSha256 = "sha256-AYl8En0ZAZXWlJ8J8LKbPvAEKX+y65L1aq4Hm+dJScs="; - settingsSha256 = "sha256-Wk6IlVvs23cB4s0aMeZzSvbOQqB1RnxGMv3HkKBoIgY="; - persistencedSha256 = "sha256-yQFrVk4i2dwReN0XoplkJ++iA1WFhnIkP7ns4ORmkFA="; + version = "570.123.19"; + persistencedVersion = "570.169"; + settingsVersion = "570.169"; + sha256_64bit = "sha256-K1ElpoTBjlLUG7slBrAhKqnEjUFwupiF7TS/8ogCf7c="; + openSha256 = "sha256-uGH2lnnADf5AGl5ShcbCOULsCIWtJlbxgHiz7I2efVE="; + settingsSha256 = "sha256-0E3UnpMukGMWcX8td6dqmpakaVbj4OhhKXgmqz77XZc="; + persistencedSha256 = "sha256-dttFu+TmbFI+mt1MbbmJcUnc1KIJ20eHZDR7YzfWmgE="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; broken = kernel.kernelAtLeast "6.15"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5d89887378e7..80a9ae1bb550 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -331,6 +331,7 @@ stdenv.mkDerivation (finalAttrs: { "dev" ] ++ (lib.optional (!buildLibsOnly) "man"); separateDebugInfo = true; + __structuredAttrs = true; hardeningDisable = [ diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 791cebda3abf..67f3ad828bf1 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -2,50 +2,60 @@ stdenv, lib, fetchurl, + glibc, + clang, + doxygen, + meson, + ninja, pkg-config, perl, argp-standalone, libjpeg, + json_c, + libbpf, + libelf, udev, udevCheckHook, withUtils ? true, withGUI ? true, alsa-lib, - libX11, + qt5compat, qtbase, libGLU, wrapQtAppsHook, }: -# See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) +# See libv4l in all-packages.nix for the libs only (overrides alsa, QT) let withQt = withUtils && withGUI; in # we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "v4l-utils"; - version = "1.24.1"; + version = "1.30.1"; src = fetchurl { - url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-y7f+imMH9c5TOgXN7XC7k8O6BjlaubbQB+tTt12AX1s="; + url = "https://linuxtv.org/downloads/v4l-utils/v4l-utils-${finalAttrs.version}.tar.xz"; + hash = "sha256-wc9UnC7DzznrXse/FXMTSeYbJqIbXpY5IttCIzO64Zc="; }; - outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ]; + outputs = + [ "out" ] + ++ lib.optional withUtils "lib" + ++ [ + "doc" + "dev" + ]; - configureFlags = ( - if withUtils then - [ - "--with-localedir=${placeholder "lib"}/share/locale" - "--with-udevdir=${placeholder "out"}/lib/udev" - ] - else - [ - "--disable-v4l-utils" - ] - ); + mesonFlags = [ + (lib.mesonBool "v4l-utils" withUtils) + (lib.mesonEnable "qv4l2" withQt) + (lib.mesonEnable "qvidcap" withQt) + (lib.mesonOption "gconvsysdir" "${glibc.out}/lib/gconv") + (lib.mesonOption "udevdir" "${placeholder "out"}/lib/udev") + ]; postFixup = '' # Create symlink for V4l1 compatibility @@ -53,25 +63,45 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ + clang + doxygen + meson + ninja pkg-config perl udevCheckHook ] ++ lib.optional withQt wrapQtAppsHook; buildInputs = - [ udev ] + [ + json_c + libbpf + libelf + udev + ] ++ lib.optional (!stdenv.hostPlatform.isGnu) argp-standalone ++ lib.optionals withQt [ alsa-lib - libX11 + qt5compat qtbase libGLU ]; + hardeningDisable = [ "zerocallusedregs" ]; + propagatedBuildInputs = [ libjpeg ]; + # these two `substituteInPlace` have been sent upstream as patches + # https://lore.kernel.org/linux-media/867c4d2e-7871-4280-8c89-d4b654597f32@public-files.de/T/ + # they might fail and have to be removed once the patches get accepted postPatch = '' patchShebangs utils/ + substituteInPlace \ + lib/libdvbv5/meson.build \ + --replace-fail "install_dir: 'include/libdvbv5'" "install_dir: get_option('includedir') / 'libdvbv5'" + substituteInPlace \ + meson.build \ + --replace-fail "get_option('datadir') / 'locale'" "get_option('localedir')" ''; enableParallelBuilding = true; @@ -81,12 +111,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = "https://linuxtv.org/projects.php"; - changelog = "https://git.linuxtv.org/v4l-utils.git/plain/ChangeLog?h=v4l-utils-${version}"; + changelog = "https://git.linuxtv.org/v4l-utils.git/plain/ChangeLog?h=v4l-utils-${finalAttrs.version}"; license = with licenses; [ lgpl21Plus gpl2Plus ]; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ + codyopel + yarny + ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/pkgs-lib/tests/default.nix b/pkgs/pkgs-lib/tests/default.nix index a78282c404f8..d7957a589c90 100644 --- a/pkgs/pkgs-lib/tests/default.nix +++ b/pkgs/pkgs-lib/tests/default.nix @@ -23,9 +23,9 @@ let structured = { formats = import ./formats.nix { inherit pkgs; }; java-properties = recurseIntoAttrs { - jdk8 = pkgs.callPackage ../formats/java-properties/test { jdk = pkgs.jdk8; }; jdk11 = pkgs.callPackage ../formats/java-properties/test { jdk = pkgs.jdk11_headless; }; jdk17 = pkgs.callPackage ../formats/java-properties/test { jdk = pkgs.jdk17_headless; }; + jdk = pkgs.callPackage ../formats/java-properties/test { jdk = pkgs.jdk_headless; }; }; libconfig = recurseIntoAttrs (import ../formats/libconfig/test { inherit pkgs; }); diff --git a/pkgs/servers/authelia/web.nix b/pkgs/servers/authelia/web.nix index 7b3083600603..3c4e0ae2ca72 100644 --- a/pkgs/servers/authelia/web.nix +++ b/pkgs/servers/authelia/web.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot ; hash = pnpmDepsHash; + fetcherVersion = 1; }; postPatch = '' diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 5201cd7f7da5..85bb78fcb89b 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -70,7 +70,11 @@ stdenv.mkDerivation { # Provide libgpm.so for compatibility postInstall = '' - ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so + if test -e "$out/lib/libgpm.so.2"; then + ln -sv "$out/lib/libgpm.so.2" "$out/lib/libgpm.so" + else + rm -f "$out/lib/libgpm.so.2" + fi ''; passthru.tests.static = pkgsStatic.gpm; diff --git a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix index 33b57159f978..4b880705dbc9 100644 --- a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix +++ b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.0.14.2"; + version = "0.0.15"; in buildHomeAssistantComponent { owner = "8none1"; @@ -18,8 +18,8 @@ buildHomeAssistantComponent { src = fetchFromGitHub { owner = "8none1"; repo = "lednetwf_ble"; - tag = "v.${version}"; - hash = "sha256-FgLUBCIYsmvrU8auraFVJ+hnl/p6KHpEeIWMT4KGJBM="; + tag = "v${version}"; + hash = "sha256-Ir3a6mr9OmBiiHRJktrv6HirHcVzKhc730aq6lynTmg="; }; dependencies = [ @@ -36,7 +36,7 @@ buildHomeAssistantComponent { meta = { description = "Home Assistant custom integration for LEDnetWF devices"; homepage = "https://github.com/8none1/lednetwf_ble"; - changelog = "https://github.com/8none1/lednetwf_ble/releases/tag/v.${version}"; + changelog = "https://github.com/8none1/lednetwf_ble/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ blenderfreaky ]; }; diff --git a/pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix b/pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix index a6ea83f2a3dc..373923e17a3d 100644 --- a/pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix +++ b/pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix @@ -36,7 +36,7 @@ buildHomeAssistantComponent { paho-mqtt ]; - pytestFlagsArray = [ + pytestFlags = [ # Fixes `AttributeError: 'async_generator' object has no attribute 'data'` # See https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/issues/158 "--asyncio-mode=auto" diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix index 84f605d84536..dd657405cd99 100644 --- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "waste_collection_schedule"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { inherit owner; repo = "hacs_waste_collection_schedule"; tag = version; - hash = "sha256-2dsuDVk2vFZPKLuFdNISg3b3z7PI+Ag3c2IZRbQnrgg="; + hash = "sha256-qH880z04TKNwO+PoH4INcOjwLrts1lzg9NMwKoum2zg="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index 4f71a69943a0..4f834e41bbdb 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.14.1"; + version = "7.14.2"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-SBUDM4+uayW5MJFs7arHXs1WzBmlHntVlE2hDBtGlAI="; + hash = "sha256-I4ZrkhrwP+b7IHNWbGpGPmlH9CP7o2mFTfN5J1fOY/E="; }; # TODO: build from source once yarn berry support lands in nixpkgs diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix index 613b7f73b718..5e7304ea9f13 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix @@ -20,6 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-ZWh2R6wr7FH2RfoFAE81Kl+wHnUeNjUbFG3KIk8ZN3g="; + fetcherVersion = 1; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/restriction-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/restriction-card/package.nix new file mode 100644 index 000000000000..3c14c273d465 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/restriction-card/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "restriction-card"; + version = "1.2.19"; + + src = fetchFromGitHub { + owner = "iantrich"; + repo = "restriction-card"; + tag = finalAttrs.version; + hash = "sha256-2scUSEpDPrMoos/QuOqXARAf1IL8P4gJaga7LRQ/67U="; + }; + + npmDepsHash = "sha256-9Hz+7Q4i5baIWxVIo6e8d5isvZWnJW2947q5Uk0Gm9w="; + + installPhase = '' + runHook preInstall + + mkdir $out + install -m0644 dist/restriction-card.js $out + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/iantrich/restriction-card/releases/tag/${finalAttrs.src.tag}"; + description = "Apply restrictions to Lovelace cards"; + homepage = "https://github.com/iantrich/restriction-card"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jfly ]; + }; +}) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 9a094e8579fb..d9292a9aec02 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + enabledTestPaths = [ "intents/tests" ]; diff --git a/pkgs/servers/http/angie/console-light.nix b/pkgs/servers/http/angie/console-light.nix index 1c7be0b681d5..228d7f5e2bf7 100644 --- a/pkgs/servers/http/angie/console-light.nix +++ b/pkgs/servers/http/angie/console-light.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.8.0"; pname = "angie-console-light"; src = fetchurl { url = "https://download.angie.software/files/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-Oz+FdMrIGNmJKHl/wOVZCP1b0AJODcURvDUKz4gCqYU="; + hash = "sha256-8btNEsh8Me/MQyLY0iIJal3UnZHzoHq6QpqyVYJvO84="; }; outputs = [ diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 813dcb1da927..15dd8337a01c 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -2,13 +2,13 @@ rec { pname = "mobilizon"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitLab { domain = "framagit.org"; owner = "kaihuri"; repo = pname; tag = version; - sha256 = "sha256-rtYb9wptP1wAaQrK60apjjSCqtfolXag6QgRYf6pwzQ="; + hash = "sha256-nwEmW43GO0Ta7O7mUSJaEtm4hBfXInPqatBRdaWrhBU="; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index 61dd5c7f8dfa..0d88715bb0f2 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -46,7 +46,7 @@ mixRelease rec { owner = "elixir-cldr"; repo = "cldr"; rev = "v${old.version}"; - sha256 = + hash = assert old.version == "2.37.5"; "sha256-T5Qvuo+xPwpgBsqHNZYnTCA4loToeBn1LKTMsDcCdYs="; }; @@ -67,7 +67,7 @@ mixRelease rec { owner = "danhper"; repo = "elixir-web-push-encryption"; rev = "6e143dcde0a2854c4f0d72816b7ecab696432779"; - sha256 = "sha256-Da+/28SPZuUQBi8fQj31zmMvhMrYUaQIW4U4E+mRtMg="; + hash = "sha256-Da+/28SPZuUQBi8fQj31zmMvhMrYUaQIW4U4E+mRtMg="; }; beamDeps = with final; [ httpoison @@ -81,7 +81,7 @@ mixRelease rec { owner = "tcitworld"; repo = name; rev = "1033d922c82a7223db0ec138e2316557b70ff49f"; - sha256 = "sha256-N3bJZznNazLewHS4c2B7LP1lgxd1wev+EWVlQ7rOwfU="; + hash = "sha256-N3bJZznNazLewHS4c2B7LP1lgxd1wev+EWVlQ7rOwfU="; }; beamDeps = with final; [ mix_test_watch @@ -96,7 +96,7 @@ mixRelease rec { owner = "tcitworld"; repo = name; rev = "0c036448e261e8be6a512581c592fadf48982d84"; - sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE="; + hash = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE="; }; beamDeps = with final; [ ex_doc @@ -114,7 +114,7 @@ mixRelease rec { owner = "tcitworld"; repo = name; rev = "8b5485fde00fafbde20f315bec387a77f7358334"; - sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw="; + hash = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw="; }; beamDeps = with final; [ httpoison diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix index 23b83bc16d7f..8a5ca34f9a1f 100644 --- a/pkgs/servers/mobilizon/frontend.nix +++ b/pkgs/servers/mobilizon/frontend.nix @@ -11,7 +11,7 @@ in buildNpmPackage { inherit (common) pname version src; - npmDepsHash = "sha256-vf8qEXMZ+TGqKjDN7LjUyOm98EQqweW6NKdJuNoMuVc="; + npmDepsHash = "sha256-5ilhuFaIvksXsJmNu20m8MV3hYtyPUz4zp8NIvhR5Nw="; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix new file mode 100644 index 000000000000..3e57035a9946 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin { + pname = "grafana-exploretraces-app"; + version = "1.1.1"; + zipHash = "sha256-vzLZvBxFF9TQBWvuAUrfWROIerOqPPjs/OKUyX1dBac="; + meta = with lib; { + description = "Opinionated traces app."; + license = licenses.agpl3Only; + teams = [ lib.teams.fslabs ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index f4b4f50b874c..2e1416a89369 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-lokiexplore-app"; - version = "1.0.13"; - zipHash = "sha256-oTiwvkKiKpeI7MUxyaRuxXot4UhMeSvuJh0N1VIfA5Q="; + version = "1.0.22"; + zipHash = "sha256-y1WJ1RxUbJSsiSApz3xvrARefNnXdZxDVfzeGfDZbFo="; meta = with lib; { description = "The Grafana Logs Drilldown app offers a queryless experience for browsing Loki logs without the need for writing complex queries."; license = licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix index 5cad9c5e9519..1e90b2574278 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-oncall-app"; - version = "1.15.6"; - zipHash = "sha256-2BlR8dKcfevkajT571f2vSn+YOzfrjUaY+dmN0SSZHE="; + version = "1.16.4"; + zipHash = "sha256-sz8jdUBEUpvfvYo0dZU1KVW/65MI5rcheTCia2m4cjU="; meta = with lib; { description = "Developer-friendly incident response for Grafana"; license = licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix new file mode 100644 index 000000000000..d7d915552a45 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin { + pname = "grafana-pyroscope-app"; + version = "1.5.0"; + zipHash = "sha256-C3TbXJa17ciEmvnKgw/5i6bq/5bzDe2iJebNaFFMxXQ="; + meta = with lib; { + description = "Profiles Drilldown is a native Grafana application designed to integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data."; + license = licenses.agpl3Only; + teams = [ lib.teams.fslabs ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix index 9b7e9c602316..ea6774622e98 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "marcusolsson-calendar-panel"; - version = "3.9.1"; - zipHash = "sha256-52MhkjsTke256cId6BtgjdRiU4w9cA6MTWA79/UfHQw="; + version = "4.0.1"; + zipHash = "sha256-xyqu9e6PImQmwN/p05TrSYx5uOmghbTVfoy4JT7hyqA="; meta = with lib; { description = "Calendar Panel is a Grafana plugin that displays events from various data sources."; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 3b20f29f2be9..bc22c3443e98 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -12,6 +12,7 @@ grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; grafana-discourse-datasource = callPackage ./grafana-discourse-datasource { }; + grafana-exploretraces-app = callPackage ./grafana-exploretraces-app { }; grafana-github-datasource = callPackage ./grafana-github-datasource { }; grafana-googlesheets-datasource = callPackage ./grafana-googlesheets-datasource { }; grafana-lokiexplore-app = callPackage ./grafana-lokiexplore-app { }; @@ -21,6 +22,7 @@ grafana-opensearch-datasource = callPackage ./grafana-opensearch-datasource { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; + grafana-pyroscope-app = callPackage ./grafana-pyroscope-app { }; grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; marcusolsson-calendar-panel = callPackage ./marcusolsson-calendar-panel { }; marcusolsson-csv-datasource = callPackage ./marcusolsson-csv-datasource { }; diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix index 4e75c01cfe1b..c4031ee69b81 100644 --- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "ventura-psychrometric-panel"; - version = "5.0.0"; - zipHash = "sha256-g14Xosk48dslNROidRDRJGzrDSkeB3cr1PxNrsLMEAA="; + version = "5.0.1"; + zipHash = "sha256-WcMgjgDobexUrfZOBmXRWv0FD3us3GgglxRdpo9BecA="; meta = with lib; { description = "Grafana plugin to display air conditions on a psychrometric chart."; license = licenses.bsd3Lbnl; diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix index bdc9b95b583f..d18f6a0686ce 100644 --- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "victoriametrics-logs-datasource"; - version = "0.16.3"; - zipHash = "sha256-C7xYnhRd6KC+prZwL0vINriMb1mvFxMattLp8N8A8tE="; + version = "0.18.1"; + zipHash = "sha256-iX9CbkXPP8/SCDbdbik2gr0DIZmGFUi2M3Iw3Z7pyNM="; meta = { description = "Grafana datasource for VictoriaLogs"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix index 37ce8cd0df44..5be2cbae1b35 100644 --- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "victoriametrics-metrics-datasource"; - version = "0.16.0"; - zipHash = "sha256-Oy++CDFAdG2wlAkxzDKWUX6PVX+t47tZBImUEw+XUho="; + version = "0.17.0"; + zipHash = "sha256-/DOv90kl1TSJ1NJ9g2LVu8qzudBDO3UfyVox1S73JFg="; meta = { description = "VictoriaMetrics metrics datasource for Grafana"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix index 893c3ed635b0..98b4dd69e7c5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-variable-panel"; - version = "3.9.0"; - zipHash = "sha256-M9upfNMK45dPnouSO6Do3Li833q9NI0H2gc6DaLEsbA="; + version = "4.0.0"; + zipHash = "sha256-fHOo/Au8yPQXIkG/BupNcMpFNgDLRrqpwRpmbq6xYhM="; meta = with lib; { description = "The Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard."; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/omnigres.nix b/pkgs/servers/sql/postgresql/ext/omnigres.nix index 978f82b79a44..ae7f2ccc221d 100644 --- a/pkgs/servers/sql/postgresql/ext/omnigres.nix +++ b/pkgs/servers/sql/postgresql/ext/omnigres.nix @@ -12,6 +12,7 @@ postgresqlBuildExtension, postgresqlTestExtension, python3, + stdenv, unstableGitUpdater, }: @@ -29,6 +30,16 @@ postgresqlBuildExtension (finalAttrs: { hash = "sha256-FiZuXvY+1qyLTnxZ9Y5MP9SxM4wncX4L4rDJEa6O7NE="; }; + # This matches postInstall of PostgreSQL's generic.nix, which does this for the PGXS Makefile. + # Since omnigres uses a CMake file, which tries to replicate the things that PGXS does, we need + # to apply the same fix for darwin. + # The reason we need to do this is, because PG_BINARY will point at the postgres wrapper of + # postgresql.withPackages, which does not contain the same symbols as the original file, ofc. + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace "cmake/PostgreSQLExtension.cmake" \ + --replace-fail '-bundle_loader ''${PG_BINARY}' "-bundle_loader ${postgresql}/bin/postgres" + ''; + strictDeps = true; nativeBuildInputs = [ @@ -48,8 +59,6 @@ postgresqlBuildExtension (finalAttrs: { cmakeFlags = [ "-DOPENSSL_CONFIGURED=1" "-DPG_CONFIG=${pgWithExtensions.pg_config}/bin/pg_config" - "-DPostgreSQL_EXTENSION_DIR=${pgWithExtensions}/share/postgresql/extension/" - "-DPostgreSQL_PACKAGE_LIBRARY_DIR=${pgWithExtensions}/lib/" "-DPostgreSQL_TARGET_EXTENSION_DIR=${builtins.placeholder "out"}/share/postgresql/extension/" "-DPostgreSQL_TARGET_PACKAGE_LIBRARY_DIR=${builtins.placeholder "out"}/lib/" ]; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 105b31c63863..127a346dbf14 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -641,66 +641,86 @@ let f: let installedExtensions = f postgresql.pkgs; - in - buildEnv { - name = "${postgresql.pname}-and-plugins-${postgresql.version}"; - paths = installedExtensions ++ [ - postgresql - postgresql.man # in case user installs this into environment - ]; - - pathsToLink = [ - "/" - "/bin" - ]; - - nativeBuildInputs = [ makeBinaryWrapper ]; - postBuild = - let - args = lib.concatMap (ext: ext.wrapperArgs or [ ]) installedExtensions; - in - '' - wrapProgram "$out/bin/postgres" ${lib.concatStringsSep " " args} - ''; - - passthru = { - inherit installedExtensions; - inherit (postgresql) - pg_config - pkgs - psqlSchema - version - ; - - withJIT = postgresqlWithPackages { - inherit - buildEnv - lib - makeBinaryWrapper + finalPackage = + (buildEnv { + name = "${postgresql.pname}-and-plugins-${postgresql.version}"; + paths = installedExtensions ++ [ + # consider keeping in-sync with `postBuild` below postgresql - ; - } (_: installedExtensions ++ [ postgresql.jit ]); - withoutJIT = postgresqlWithPackages { - inherit - buildEnv - lib - makeBinaryWrapper - postgresql - ; - } (_: lib.remove postgresql.jit installedExtensions); + postgresql.man # in case user installs this into environment + ]; - withPackages = - f': - postgresqlWithPackages { - inherit - buildEnv - lib - makeBinaryWrapper - postgresql + pathsToLink = [ + "/" + "/bin" + "/share/postgresql/extension" + # Unbreaks Omnigres' build system + "/share/postgresql/timezonesets" + "/share/postgresql/tsearch_data" + ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + postBuild = + let + args = lib.concatMap (ext: ext.wrapperArgs or [ ]) installedExtensions; + in + '' + wrapProgram "$out/bin/postgres" ${lib.concatStringsSep " " args} + + mkdir -p "$dev/nix-support" + substitute "${lib.getDev postgresql}/nix-support/pg_config.env" "$dev/nix-support/pg_config.env" \ + --replace-fail "${postgresql}" "$out" \ + --replace-fail "${postgresql.man}" "$out" + ''; + + passthru = { + inherit installedExtensions; + inherit (postgresql) + pkgs + psqlSchema + version ; - } (ps: installedExtensions ++ f' ps); - }; - }; + + pg_config = postgresql.pg_config.override { inherit finalPackage; }; + + withJIT = postgresqlWithPackages { + inherit + buildEnv + lib + makeBinaryWrapper + postgresql + ; + } (_: installedExtensions ++ [ postgresql.jit ]); + withoutJIT = postgresqlWithPackages { + inherit + buildEnv + lib + makeBinaryWrapper + postgresql + ; + } (_: lib.remove postgresql.jit installedExtensions); + + withPackages = + f': + postgresqlWithPackages { + inherit + buildEnv + lib + makeBinaryWrapper + postgresql + ; + } (ps: installedExtensions ++ f' ps); + }; + }).overrideAttrs + { + # buildEnv doesn't support passing `outputs`, so going via overrideAttrs. + outputs = [ + "out" + "dev" + ]; + }; + in + finalPackage; in # passed by .nix diff --git a/pkgs/servers/sql/postgresql/pg_config.env.mk b/pkgs/servers/sql/postgresql/pg_config.env.mk index 48e836049b90..8a4a3cfad97a 100644 --- a/pkgs/servers/sql/postgresql/pg_config.env.mk +++ b/pkgs/servers/sql/postgresql/pg_config.env.mk @@ -9,5 +9,6 @@ pg_config.env: $(top_builddir)/src/port/pg_config_paths.h | $(top_builddir)/src/ echo "LDFLAGS_EX=\"$(LDFLAGS_EX)\"" >>$@ echo "LDFLAGS_SL=\"$(LDFLAGS_SL)\"" >>$@ echo "LIBS=\"$(LIBS)\"" >>$@ + echo "PGXS=\"$(dev)/lib/pgxs/src/makefiles/pgxs.mk\"" >>$@ cat $(top_builddir)/src/port/pg_config_paths.h $(top_builddir)/src/include/pg_config.h \ | sed -nE 's/^#define ([^ ]+) ("?)(.*)\2$$/\1="\3"/p' >>$@ diff --git a/pkgs/servers/sql/postgresql/pg_config.sh b/pkgs/servers/sql/postgresql/pg_config.sh index d56f8ca3dd61..3f0aa08eb70c 100644 --- a/pkgs/servers/sql/postgresql/pg_config.sh +++ b/pkgs/servers/sql/postgresql/pg_config.sh @@ -70,7 +70,7 @@ for opt; do --mandir) show+=("$MANDIR") ;; --sharedir) show+=("$PGSHAREDIR") ;; --sysconfdir) show+=("$SYSCONFDIR") ;; - --pgxs) show+=("@postgresql-dev@/lib/pgxs/src/makefiles/pgxs.mk") ;; + --pgxs) show+=("$PGXS") ;; --configure) show+=("$CONFIGURE_ARGS") ;; --cc) show+=("$CC") ;; --cppflags) show+=("$CPPFLAGS") ;; @@ -108,7 +108,7 @@ LOCALEDIR = $LOCALEDIR MANDIR = $MANDIR SHAREDIR = $PGSHAREDIR SYSCONFDIR = $SYSCONFDIR -PGXS = @postgresql-dev@/lib/pgxs/src/makefiles/pgxs.mk +PGXS = $PGXS CONFIGURE = $CONFIGURE_ARGS CC = $CC CPPFLAGS = $CPPFLAGS diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 9cdc0889e307..20ed0a5ef44f 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -17,7 +17,7 @@ cacert, util-linux, gawk, - nettools, + net-tools, imagemagick, optipng, pngquant, @@ -72,7 +72,7 @@ let procps # For ps and kill util-linux # For renice gawk - nettools # For hostname + net-tools # For hostname # Image optimization imagemagick @@ -234,6 +234,7 @@ let pname = "discourse-assets"; inherit version src; hash = "sha256-WyRBnuKCl5NJLtqy3HK/sJcrpMkh0PjbasGPNDV6+7Y="; + fetcherVersion = 1; }; nativeBuildInputs = runtimeDeps ++ [ diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index b423bcd8748f..eecf875e3728 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -43,6 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = pinData.uiPNPMDepsHash; + fetcherVersion = 1; }; buildPhase = '' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ad5c413764ac..5bcfd73888f9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1842,16 +1842,15 @@ self: with self; { libICE, libuuid, xorgproto, - xtrans, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "libSM"; - version = "1.2.5"; + version = "1.2.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libSM-1.2.5.tar.xz"; - sha256 = "1g10pn1zhcyc1ys8skp6p46gn6qgkif8kqdwlz1hsrzgllny3y9a"; + url = "mirror://xorg/individual/lib/libSM-1.2.6.tar.xz"; + sha256 = "1gimv11iwzd9gqg345dd8x09szw75v4c2wr5qsdd5gswn6yhlz5y"; }; hardeningDisable = [ "bindnow" @@ -1863,7 +1862,6 @@ self: with self; { libICE libuuid xorgproto - xtrans ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -3407,11 +3405,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "oclock"; - version = "1.0.5"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/oclock-1.0.5.tar.xz"; - sha256 = "0p4nqfrhy1srqqzbamp7afa54clbydbhprd1nxbd12g8anb9f2cg"; + url = "mirror://xorg/individual/app/oclock-1.0.6.tar.xz"; + sha256 = "1gi41nmf5glvzasri0glka19h6gkpbiy0bwbvdxwl7i15mg5xs1y"; }; hardeningDisable = [ "bindnow" @@ -3489,11 +3487,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "smproxy"; - version = "1.0.7"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/smproxy-1.0.7.tar.xz"; - sha256 = "01gkz4n2pfxiklzzx3ghnm9shx3626jcriwvrs3pvawxrhvr5aaa"; + url = "mirror://xorg/individual/app/smproxy-1.0.8.tar.xz"; + sha256 = "1j7n5wxbrbzvrrlmg4r7iak1n9r09543nbfpg38y477cwbm89rgy"; }; hardeningDisable = [ "bindnow" @@ -3527,11 +3525,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "transset"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/transset-1.0.3.tar.xz"; - sha256 = "1zp6ldxb3h2zsr4nmkb8aj8ia8v3qvjj3w85by5xh3fxvlq8zqqz"; + url = "mirror://xorg/individual/app/transset-1.0.4.tar.xz"; + sha256 = "0f0bgi1jq9zzq2gqaszhgvz2d1clja17z8xnijm36xqkmxsapac1"; }; hardeningDisable = [ "bindnow" @@ -3569,11 +3567,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "twm"; - version = "1.0.12"; + version = "1.0.13.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/twm-1.0.12.tar.xz"; - sha256 = "1r5gfv1gvcjn39v7n6znpnvifwhlw2zf8gfrxq8vph84vva03wma"; + url = "mirror://xorg/individual/app/twm-1.0.13.1.tar.xz"; + sha256 = "1igj7lr8xw5ap5wld5a18vav8jn8pa4ajbz5hk495d58b9sk89d5"; }; hardeningDisable = [ "bindnow" @@ -3607,17 +3605,18 @@ self: with self; { fetchurl, libXaw, libXmu, + xorgproto, libXt, wrapWithXFileSearchPathHook, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "viewres"; - version = "1.0.7"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/viewres-1.0.7.tar.xz"; - sha256 = "0a66mz27gcsxd1qq1ij0w8dv4wjvszgbf5ygw5dga40sbc464nmi"; + url = "mirror://xorg/individual/app/viewres-1.0.8.tar.xz"; + sha256 = "1lkc5gx7g8zjgjixinq50vlvnv03z2mvj4incdkb341k20miq8jb"; }; hardeningDisable = [ "bindnow" @@ -3631,6 +3630,7 @@ self: with self; { buildInputs = [ libXaw libXmu + xorgproto libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3739,11 +3739,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xbacklight"; - version = "1.2.3"; + version = "1.2.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2"; - sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; + url = "mirror://xorg/individual/app/xbacklight-1.2.4.tar.xz"; + sha256 = "1vp890ic26y4k2l0haw94z4nim3j7gp3g9w5flw2zj0qdw70phyl"; }; hardeningDisable = [ "bindnow" @@ -4219,11 +4219,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xcompmgr"; - version = "1.1.9"; + version = "1.1.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xcompmgr-1.1.9.tar.xz"; - sha256 = "1w564walyqi3bqnnl8l2d949v64smipdw2q8lnrixl3jhrlvcxa8"; + url = "mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz"; + sha256 = "13xrn0ii8widz0pw31fbdy7x8paf729yqhkmxbm3497jqh4zf93q"; }; hardeningDisable = [ "bindnow" @@ -4307,11 +4307,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xcursorgen"; - version = "1.0.8"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xcursorgen-1.0.8.tar.xz"; - sha256 = "16yc82k4vp7icmf9247z4v38r65pdf032mrpzxj5wa2fggi3rcrj"; + url = "mirror://xorg/individual/app/xcursorgen-1.0.9.tar.xz"; + sha256 = "1g1v96yprk5nnkip2w3r2cfsbzzsw0ssy417j3m1djl4mibf3j8c"; }; hardeningDisable = [ "bindnow" @@ -4388,11 +4388,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xdm"; - version = "1.1.16"; + version = "1.1.17"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xdm-1.1.16.tar.xz"; - sha256 = "1737hz8g3wpgdfj6y11q1xwma40wvgz85ckp6wv0hmz9h6c21wmw"; + url = "mirror://xorg/individual/app/xdm-1.1.17.tar.xz"; + sha256 = "0spbxjxxrnfxf8gqncd7bry3z7dvr74ba987cx9iq0qsj7qax54l"; }; hardeningDisable = [ "bindnow" @@ -4697,11 +4697,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-keyboard"; - version = "2.0.0"; + version = "2.1.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-keyboard-2.0.0.tar.xz"; - sha256 = "1fgya6a0pzsb8ynp2qhx3bqg6nfc4y2sw9wmk7zd8pqplbqzsrij"; + url = "mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz"; + sha256 = "0mvwxrnkq0lzhjr894p420zxffdn34nc2scinmp7qd1hikr51kkp"; }; hardeningDisable = [ "bindnow" @@ -4811,11 +4811,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-synaptics"; - version = "1.9.2"; + version = "1.10.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.9.2.tar.xz"; - sha256 = "0f1cjs9haxhjybfh2lh579s15i2q0q19whynpda3giizj6mlmymq"; + url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.10.0.tar.xz"; + sha256 = "1hmm3g6ab4bs4hm6kmv508fdc8kr2blzb1vsz1lhipcf0vdnmhp0"; }; hardeningDisable = [ "bindnow" @@ -5046,11 +5046,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-ast"; - version = "1.1.6"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-ast-1.1.6.tar.xz"; - sha256 = "1bqdjcxi8fj48821322djdqnrla2i48wqckdf364zagrqyllyxbm"; + url = "mirror://xorg/individual/driver/xf86-video-ast-1.2.0.tar.xz"; + sha256 = "14sx6dm0nmbf1fs8cazmak0aqjpjpv9wv7v09w86ff04m7f4gal6"; }; hardeningDisable = [ "bindnow" @@ -5242,11 +5242,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-fbdev"; - version = "0.5.0"; + version = "0.5.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2"; - sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; + url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz"; + sha256 = "11zk8whari4m99ad3w30xwcjkgya4xbcpmg8710q14phkbxw0aww"; }; hardeningDisable = [ "bindnow" @@ -5280,11 +5280,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-geode"; - version = "2.11.21"; + version = "2.18.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-geode-2.11.21.tar.xz"; - sha256 = "07lzbyxss0m5i4j58z43zri2baawci9q1ykv1g828wqi2hzsqml2"; + url = "mirror://xorg/individual/driver/xf86-video-geode-2.18.1.tar.xz"; + sha256 = "0a8c6g3ndzf76rrrm3dwzmndcdy4y2qfai4324sdkmi8k9szicjr"; }; hardeningDisable = [ "bindnow" @@ -6575,46 +6575,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoxgi = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libdrm, - libpciaccess, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-xgi"; - version = "1.6.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2"; - sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libdrm - libpciaccess - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xfd = callPackage ( { @@ -6884,11 +6844,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xhost"; - version = "1.0.9"; + version = "1.0.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xhost-1.0.9.tar.xz"; - sha256 = "0ib66h78ykc4zki4arh8hkcsgk1mk8yyy0ay5sdb2d908qqvb1pa"; + url = "mirror://xorg/individual/app/xhost-1.0.10.tar.xz"; + sha256 = "1qavfaxqpj2mp2jdb8ivvv7bza546lff95dq90lp3727b40dgbx8"; }; hardeningDisable = [ "bindnow" @@ -6925,11 +6885,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xinit"; - version = "1.4.2"; + version = "1.4.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xinit-1.4.2.tar.xz"; - sha256 = "08qz6f6yhis6jdcp6hzspql6ib9a9zp0ddhhbac1b7zg4a6xrn5p"; + url = "mirror://xorg/individual/app/xinit-1.4.4.tar.xz"; + sha256 = "1ygymifhg500sx1ybk8x4d1zn4g4ywvlnyvqwcf9hzsc2rx7r920"; }; hardeningDisable = [ "bindnow" @@ -7043,11 +7003,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xkbevd"; - version = "1.1.5"; + version = "1.1.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbevd-1.1.5.tar.xz"; - sha256 = "0swjhk33fp15060hhzycmk288ys51wwm6l7p9xy4blz95mq7nd9q"; + url = "mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz"; + sha256 = "0gh73dsf4ic683k9zn2nj9bpff6dmv3gzcb3zx186mpq9kw03d6r"; }; hardeningDisable = [ "bindnow" @@ -7518,11 +7478,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.16"; + version = "21.1.18"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.16.tar.xz"; - sha256 = "b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz"; + sha256 = "0lk3268gzpll547zvaa64rdhs4z89d7w567lbd55swl71n9x2y68"; }; hardeningDisable = [ "bindnow" @@ -7603,11 +7563,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xprop"; - version = "1.2.7"; + version = "1.2.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xprop-1.2.7.tar.xz"; - sha256 = "0pw2iv7dcy2xq5fh3427nx88pjj9d9rry3930qj1c6mricaf6dj4"; + url = "mirror://xorg/individual/app/xprop-1.2.8.tar.xz"; + sha256 = "1vk7kl10ykgqp2iw4m1q4j1zrbkxibd1rdb9cjgl6yzgnyny52fn"; }; hardeningDisable = [ "bindnow" @@ -7641,11 +7601,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xrandr"; - version = "1.5.2"; + version = "1.5.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xrandr-1.5.2.tar.xz"; - sha256 = "0h7jy4c5zgrr06fimnnxhy5ba782b1n4aik29g6bln4h1mwy9gn8"; + url = "mirror://xorg/individual/app/xrandr-1.5.3.tar.xz"; + sha256 = "0744kfafd98q2zswyzva837qgvmdpfv80ilnp7x4fhdpmmk7bpgq"; }; hardeningDisable = [ "bindnow" diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9554c2342c43..49f4838a058b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -480,7 +480,10 @@ self: super: "dev" "doc" ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libICE ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ + xorg.libICE + xorg.xtrans + ]; }); libXrender = super.libXrender.overrideAttrs (attrs: { @@ -1304,27 +1307,6 @@ self: super: ]; }); - xf86videoxgi = super.xf86videoxgi.overrideAttrs (attrs: { - patches = [ - # fixes invalid open mode - # https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/commit/?id=bd94c475035739b42294477cff108e0c5f15ef67 - (fetchpatch { - url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=bd94c475035739b42294477cff108e0c5f15ef67"; - sha256 = "0myfry07655adhrpypa9rqigd6rfx57pqagcwibxw7ab3wjay9f6"; - }) - (fetchpatch { - url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=78d1138dd6e214a200ca66fa9e439ee3c9270ec8"; - sha256 = "0z3643afgrync280zrp531ija0hqxc5mrwjif9nh9lcnzgnz2d6d"; - }) - # Pull upstream fix for -fno-common toolchains. - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/freedesktop/xorg-xf86-video-xgi/commit/3143bdee580c4d397e21adb0fa35502d4dc8e888.patch"; - sha256 = "0by6k26rj1xmljnbfd08v90s1f9bkmnf17aclhv50081m83lmm07"; - }) - ]; - }); - xfd = addMainProgram super.xfd { }; xfontsel = addMainProgram super.xfontsel { }; xfs = addMainProgram super.xfs { }; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index afbf7c57568b..af52d9252054 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -12,22 +12,22 @@ mirror://xorg/individual/app/iceauth-1.0.10.tar.xz mirror://xorg/individual/app/ico-1.0.6.tar.xz mirror://xorg/individual/app/listres-1.0.6.tar.xz mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz -mirror://xorg/individual/app/oclock-1.0.5.tar.xz +mirror://xorg/individual/app/oclock-1.0.6.tar.xz mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz -mirror://xorg/individual/app/smproxy-1.0.7.tar.xz -mirror://xorg/individual/app/transset-1.0.3.tar.xz -mirror://xorg/individual/app/twm-1.0.12.tar.xz -mirror://xorg/individual/app/viewres-1.0.7.tar.xz +mirror://xorg/individual/app/smproxy-1.0.8.tar.xz +mirror://xorg/individual/app/transset-1.0.4.tar.xz +mirror://xorg/individual/app/twm-1.0.13.1.tar.xz +mirror://xorg/individual/app/viewres-1.0.8.tar.xz mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 mirror://xorg/individual/app/xauth-1.1.4.tar.xz -mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2 +mirror://xorg/individual/app/xbacklight-1.2.4.tar.xz mirror://xorg/individual/app/xcalc-1.1.2.tar.xz mirror://xorg/individual/app/xclock-1.1.1.tar.xz mirror://xorg/individual/app/xcmsdb-1.0.7.tar.xz -mirror://xorg/individual/app/xcompmgr-1.1.9.tar.xz +mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz mirror://xorg/individual/app/xconsole-1.1.0.tar.xz -mirror://xorg/individual/app/xcursorgen-1.0.8.tar.xz -mirror://xorg/individual/app/xdm-1.1.16.tar.xz +mirror://xorg/individual/app/xcursorgen-1.0.9.tar.xz +mirror://xorg/individual/app/xdm-1.1.17.tar.xz mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz mirror://xorg/individual/app/xdriinfo-1.0.7.tar.xz mirror://xorg/individual/app/xev-1.2.6.tar.xz @@ -38,11 +38,11 @@ mirror://xorg/individual/app/xfs-1.2.2.tar.xz mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz mirror://xorg/individual/app/xgamma-1.0.7.tar.xz mirror://xorg/individual/app/xgc-1.0.6.tar.xz -mirror://xorg/individual/app/xhost-1.0.9.tar.xz -mirror://xorg/individual/app/xinit-1.4.2.tar.xz +mirror://xorg/individual/app/xhost-1.0.10.tar.xz +mirror://xorg/individual/app/xinit-1.4.4.tar.xz mirror://xorg/individual/app/xinput-1.6.4.tar.xz mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz -mirror://xorg/individual/app/xkbevd-1.1.5.tar.xz +mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz mirror://xorg/individual/app/xkill-1.0.6.tar.xz @@ -55,8 +55,8 @@ mirror://xorg/individual/app/xmessage-1.0.7.tar.xz mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz mirror://xorg/individual/app/xmore-1.0.4.tar.xz mirror://xorg/individual/app/xpr-1.2.0.tar.xz -mirror://xorg/individual/app/xprop-1.2.7.tar.xz -mirror://xorg/individual/app/xrandr-1.5.2.tar.xz +mirror://xorg/individual/app/xprop-1.2.8.tar.xz +mirror://xorg/individual/app/xrandr-1.5.3.tar.xz mirror://xorg/individual/app/xrdb-1.2.2.tar.xz mirror://xorg/individual/app/xrefresh-1.1.0.tar.xz mirror://xorg/individual/app/xset-1.2.5.tar.xz @@ -71,22 +71,22 @@ mirror://xorg/individual/app/xwud-1.0.7.tar.xz mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz -mirror://xorg/individual/driver/xf86-input-keyboard-2.0.0.tar.xz +mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz -mirror://xorg/individual/driver/xf86-input-synaptics-1.9.2.tar.xz +mirror://xorg/individual/driver/xf86-input-synaptics-1.10.0.tar.xz mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz -mirror://xorg/individual/driver/xf86-video-ast-1.1.6.tar.xz +mirror://xorg/individual/driver/xf86-video-ast-1.2.0.tar.xz mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz -mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-geode-2.11.21.tar.xz +mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz +mirror://xorg/individual/driver/xf86-video-geode-2.18.1.tar.xz mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz @@ -119,7 +119,6 @@ mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2 mirror://xorg/individual/font/encodings-1.1.0.tar.xz mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz @@ -161,7 +160,7 @@ mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz mirror://xorg/individual/lib/libFS-1.0.10.tar.xz mirror://xorg/individual/lib/libICE-1.1.2.tar.xz -mirror://xorg/individual/lib/libSM-1.2.5.tar.xz +mirror://xorg/individual/lib/libSM-1.2.6.tar.xz mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.8.12.tar.xz mirror://xorg/individual/lib/libXau-1.0.12.tar.xz @@ -197,4 +196,4 @@ mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.16.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 0a0a40121f39..5c359014ba26 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -295,6 +295,7 @@ rec { dontStrip = true; env = (args.env or { }) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; + NIX_RUSTFLAGS = toString (args.env.NIX_RUSTFLAGS or "") + " -g -C opt-level=0 -C strip=none"; }; }); }); diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index a8aba74321b0..4d9bb81fbbce 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -78,7 +78,6 @@ let ../../build-support/setup-hooks/move-sbin.sh ../../build-support/setup-hooks/move-systemd-user-units.sh ../../build-support/setup-hooks/multiple-outputs.sh - ../../build-support/setup-hooks/parallel.sh ../../build-support/setup-hooks/patch-shebangs.sh ../../build-support/setup-hooks/prune-libtool-files.sh ../../build-support/setup-hooks/reproducible-builds.sh diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index bc58907fbe5b..457f24e664b0 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -324,7 +324,21 @@ let doCheck' = doCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform; doInstallCheck' = doInstallCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform; - separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux; + separateDebugInfo' = + let + actualValue = separateDebugInfo && stdenv.hostPlatform.isLinux; + conflictingOption = + attrs ? "disallowedReferences" + || attrs ? "disallowedRequisites" + || attrs ? "allowedRequisites" + || attrs ? "allowedReferences"; + in + if actualValue && conflictingOption && !__structuredAttrs then + throw "separateDebugInfo = true in ${ + attrs.pname or "mkDerivation argument" + } requires __structuredAttrs if {dis,}allowedRequisites or {dis,}allowedReferences is set" + else + actualValue; outputs' = outputs ++ optional separateDebugInfo' "debug"; noNonNativeDeps = @@ -646,10 +660,26 @@ let outputChecks = builtins.listToAttrs ( map (name: { inherit name; - value = zipAttrsWith (_: builtins.concatLists) [ - (makeOutputChecks attrs) - (makeOutputChecks attrs.outputChecks.${name} or { }) - ]; + value = + let + raw = zipAttrsWith (_: builtins.concatLists) [ + (makeOutputChecks attrs) + (makeOutputChecks attrs.outputChecks.${name} or { }) + ]; + in + # separateDebugInfo = true will put all sorts of files in + # the debug output which could carry references, but + # that's "normal". Notably it symlinks to the source. + # So disable reference checking for the debug output + if separateDebugInfo' && name == "debug" then + removeAttrs raw [ + "allowedReferences" + "allowedRequisites" + "disallowedReferences" + "disallowedRequisites" + ] + else + raw; }) outputs ); } @@ -716,7 +746,9 @@ let ); let - envIsExportable = isAttrs env && !isDerivation env; + mainProgram = meta.mainProgram or null; + env' = env // lib.optionalAttrs (mainProgram != null) { NIX_MAIN_PROGRAM = mainProgram; }; + envIsExportable = isAttrs env' && !isDerivation env'; derivationArg = makeDerivationArgument ( removeAttrs attrs ( @@ -746,11 +778,11 @@ let checkedEnv = let - overlappingNames = attrNames (builtins.intersectAttrs env derivationArg); + overlappingNames = attrNames (builtins.intersectAttrs env' derivationArg); prettyPrint = lib.generators.toPretty { }; makeError = name: - " - ${name}: in `env`: ${prettyPrint env.${name}}; in derivation arguments: ${ + " - ${name}: in `env`: ${prettyPrint env'.${name}}; in derivation arguments: ${ prettyPrint derivationArg.${name} }"; errors = lib.concatMapStringsSep "\n" makeError overlappingNames; @@ -764,7 +796,7 @@ let assert assertMsg (isString v || isBool v || isInt v || isDerivation v) "The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `${n}` attribute is of type ${builtins.typeOf v}."; v - ) env; + ) env'; # Fixed-output derivations may not reference other paths, which means that # for a fixed-output derivation, the corresponding inputDerivation should diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4be15d11356d..8941c134f6fc 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1181,13 +1181,18 @@ substituteAllInPlace() { # the environment used for building. dumpVars() { if [ "${noDumpEnvVars:-0}" != 1 ]; then - # On darwin, install(1) cannot be called with /dev/stdin or fd from process substitution - # so first we create the file and then write to it - # See https://github.com/NixOS/nixpkgs/issues/335016 - { - install -m 0600 /dev/null "$NIX_BUILD_TOP/env-vars" && - export 2>/dev/null >| "$NIX_BUILD_TOP/env-vars" - } || true + # Don't use `install` here to prevent executing a process each time. + + # Set umask to create env-vars file with 0600 permissions (owner read/write only) + local old_umask + old_umask=$(umask) + umask 0077 + + # Dump all environment variables to the env-vars file + export 2>/dev/null > "$NIX_BUILD_TOP/env-vars" + + # Restore original umask + umask "$old_umask" fi } diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index a743d2277f9b..fe6f9eb43852 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -224,6 +224,4 @@ with pkgs; build-environment-info = callPackage ./build-environment-info { }; rust-hooks = recurseIntoAttrs (callPackages ../build-support/rust/hooks/test { }); - - setup-hooks = recurseIntoAttrs (callPackages ../build-support/setup-hooks/tests { }); } diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index c961d37f409d..98fd7ebd61ef 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -404,6 +404,50 @@ in stdenv' = bootStdenv; }; + ensure-no-execve-in-setup-sh = + derivation { + name = "ensure-no-execve-in-setup-sh"; + system = stdenv.system; + builder = "${stdenv.bootstrapTools}/bin/bash"; + PATH = "${pkgs.strace}/bin:${stdenv.bootstrapTools}/bin"; + initialPath = [ + stdenv.bootstrapTools + pkgs.strace + ]; + args = [ + "-c" + '' + countCall() { + echo "$stats" | tr -s ' ' | grep "$1" | cut -d ' ' -f5 + } + + # prevent setup.sh from running `nproc` when cores=0 + # (this would mess up the syscall stats) + export NIX_BUILD_CORES=1 + + echo "Analyzing setup.sh with strace" + stats=$(strace -fc bash -c ". ${../../stdenv/generic/setup.sh}" 2>&1) + echo "$stats" | head -n15 + + # fail if execve calls is > 1 + stats=$(strace -fc bash -c ". ${../../stdenv/generic/setup.sh}" 2>&1) + execveCalls=$(countCall execve) + if [ "$execveCalls" -gt 1 ]; then + echo "execve calls: $execveCalls; expected: 1" + echo "ERROR: setup.sh should not launch additional processes when being sourced" + exit 1 + else + echo "setup.sh doesn't launch extra processes when sourcing, as expected" + fi + + touch $out + '' + ]; + } + // { + meta = { }; + }; + structuredAttrsByDefault = lib.recurseIntoAttrs { hooks = lib.recurseIntoAttrs ( @@ -570,6 +614,5 @@ in diff $out/json $goldenJson ''; }; - }; } diff --git a/pkgs/test/stdenv/patch-shebangs.nix b/pkgs/test/stdenv/patch-shebangs.nix index 78b177593e86..392f9630a1d1 100644 --- a/pkgs/test/stdenv/patch-shebangs.nix +++ b/pkgs/test/stdenv/patch-shebangs.nix @@ -105,6 +105,105 @@ let assertion = "grep '^#!/usr/bin/builtin' $out/bin/test > /dev/null"; }; }; + + read-only-script = + (derivation { + name = "read-only-script"; + system = stdenv.buildPlatform.system; + builder = "${stdenv.__bootPackages.stdenv.__bootPackages.bashNonInteractive}/bin/bash"; + initialPath = [ + stdenv.__bootPackages.stdenv.__bootPackages.coreutils + ]; + strictDeps = false; + args = [ + "-c" + '' + set -euo pipefail + . ${../../stdenv/generic/setup.sh} + . ${../../build-support/setup-hooks/patch-shebangs.sh} + mkdir -p $out/bin + echo "#!/bin/bash" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod 555 $out/bin/test + patchShebangs $out/bin/test + '' + ]; + assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null"; + }) + // { + meta = { }; + }; + + preserves-read-only = + (derivation { + name = "preserves-read-only"; + system = stdenv.buildPlatform.system; + builder = "${stdenv.__bootPackages.stdenv.__bootPackages.bashNonInteractive}/bin/bash"; + initialPath = [ + stdenv.__bootPackages.stdenv.__bootPackages.coreutils + ]; + strictDeps = false; + args = [ + "-c" + '' + set -euo pipefail + . ${../../stdenv/generic/setup.sh} + . ${../../build-support/setup-hooks/patch-shebangs.sh} + mkdir -p $out/bin + echo "#!/bin/bash" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod 555 $out/bin/test + original_perms=$(stat -c %a $out/bin/test) + patchShebangs $out/bin/test + new_perms=$(stat -c %a $out/bin/test) + if ! [ "$original_perms" = "$new_perms" ]; then + echo "Permissions changed from $original_perms to $new_perms" + exit 1 + fi + '' + ]; + assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null"; + }) + // { + meta = { }; + }; + + # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281 + preserves-timestamp = + (derivation { + name = "preserves-timestamp"; + system = stdenv.buildPlatform.system; + builder = "${stdenv.__bootPackages.stdenv.__bootPackages.bashNonInteractive}/bin/bash"; + initialPath = [ + stdenv.__bootPackages.stdenv.__bootPackages.coreutils + ]; + strictDeps = false; + args = [ + "-c" + '' + set -euo pipefail + . ${../../stdenv/generic/setup.sh} + . ${../../build-support/setup-hooks/patch-shebangs.sh} + mkdir -p $out/bin + echo "#!/bin/bash" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + # Set a specific timestamp (2000-01-01 00:00:00) + touch -t 200001010000 $out/bin/test + original_timestamp=$(stat -c %Y $out/bin/test) + patchShebangs $out/bin/test + new_timestamp=$(stat -c %Y $out/bin/test) + if ! [ "$original_timestamp" = "$new_timestamp" ]; then + echo "Timestamp changed from $original_timestamp to $new_timestamp" + exit 1 + fi + '' + ]; + assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null"; + }) + // { + meta = { }; + }; }; in stdenv.mkDerivation { @@ -116,6 +215,10 @@ stdenv.mkDerivation { updates-nix-store split-string without-trailing-newline + dont-patch-builtins + read-only-script + preserves-read-only + preserves-timestamp ; }; buildCommand = '' diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index 449e8e05c0ea..717d8624eb94 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -44,7 +44,11 @@ python3Packages.buildPythonApplication rec { writableTmpDirAsHomeHook ]; - pytestFlagsArray = [ "-r fEs" ]; + pytestFlags = [ + # This is the same as: + # -r fEs + "-rfEs" + ]; meta = { description = "Beets plugin to move non-music files during the import process"; diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix index 5d82beffd690..92b69827d4e3 100644 --- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { pytz ]; - pytestFlagsArray = [ "--disable-pytest-warnings" ]; + pytestFlags = [ "--disable-pytest-warnings" ]; disabledTestPaths = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 3056f7eb9dd1..51b7a04a9fa7 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.27.67"; + version = "2.27.68"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-DIezuI8pexIzqiGWFrgQQER1wx0jCwTZgcluFCBvpCw="; + hash = "sha256-jDBm6fo/dwE41aNH8CmpqJo8ZyPblMd4DQqxo5C0J8w="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 6c47a6b6e441..7f9e29b7e915 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -187,6 +187,7 @@ stdenv.mkDerivation (finalAttrs: { isocodes json-glib libX11 + vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN) ] ++ lib.optionals (!libOnly) [ gtk3 @@ -194,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf libdbusmenu-gtk3 libnotify - vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN) ] ++ lib.optionals withWayland [ libxkbcommon diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 5bb9af4aafb3..55c9deff20d3 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { # switch to pep517 build tools ./pep517.patch + + # FIXME: remove when gettext is fixed + ./gettext-0.25.patch ]; buildInputs = [ diff --git a/pkgs/tools/misc/system-config-printer/gettext-0.25.patch b/pkgs/tools/misc/system-config-printer/gettext-0.25.patch new file mode 100644 index 000000000000..fbb1508e4b41 --- /dev/null +++ b/pkgs/tools/misc/system-config-printer/gettext-0.25.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile.am b/Makefile.am +index 9993ca0d..678fa629 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,7 @@ + SUBDIRS=. po + ++ACLOCAL_AMFLAGS = -I m4 ++ + EXPORT_MODULES= \ + cupshelpers/__init__.py \ + cupshelpers/cupshelpers.py \ diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index b5611fcbdfcc..5f55e49c2b2c 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -13,6 +13,7 @@ coreutils, installShellFiles, xterm, + bashNonInteractive, }: stdenvNoCC.mkDerivation { pname = "xvfb-run"; @@ -30,6 +31,12 @@ stdenvNoCC.mkDerivation { installShellFiles ]; + buildInputs = [ + bashNonInteractive + ]; + + strictDeps = true; + dontUnpack = true; dontBuild = true; dontConfigure = true; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 083a0e9cf831..2bc4f17978ee 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.27.0"; + version = "0.27.1"; rev = "v${version}"; - vendorHash = "sha256-vwv7B3G9v9FNDS/RWTZwA5uqW2/GQLtUgylFsi0Dldo="; + vendorHash = "sha256-FR9jeHVZS87Tlv1jtO4h5ZDqKIRLfa4xGlpCj1IWoXU="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-GVbDmRXyZjWXHi9eHiQ28RDi1N//ro3AnKb0txvA8yA="; + sha256 = "sha256-xmKXemr/qSLsBOwLhJIewF7Iu/ERpZX8kUFgotz4Yyw="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index d963d43c13b7..fac0da41d2cf 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -163,7 +163,9 @@ stdenv.mkDerivation (finalAttrs: { # invoked directly and those invoked by the "remote" session cat > ~/.ssh/environment.base < !enableMinimal; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.4.7"; + version = "2.4.8"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - hash = "sha256-eyRwbk2n4OOwbKBoIxAnQB8jgQLEHJCWMTSdzDuF60Y="; + hash = "sha256-tYyA15sE0yQ/9JwcP8a1+DE46zeEaJVjvN0GBZUxhhY="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -80,14 +80,13 @@ stdenv.mkDerivation rec { domain = "gitlab.com"; owner = "freepg"; repo = "gnupg"; - rev = "541772915dc4ec832c37f85bc629a22051f0e8f7"; - hash = "sha256-QOUY6EfJbTTN242BtzLojDgECGjUwbLfPJgzn/mj5L8="; + rev = "361c223eb00ca372fbf9506f5150ddbec193936f"; + hash = "sha256-hRuwrB6G2vjp7Md6m+cwoi7g4GtW0sazAEN5RC+AKdg="; }; patches = [ ./fix-libusb-include-path.patch - ./CVE-2022-3219.patch ./static.patch ] ++ lib.map (v: "${freepgPatches}/STABLE-BRANCH-2-4-freepg/" + v) [ @@ -95,11 +94,25 @@ stdenv.mkDerivation rec { "0003-gpg-allow-import-of-previously-known-keys-even-witho.patch" "0004-tests-add-test-cases-for-import-without-uid.patch" "0005-gpg-drop-import-clean-from-default-keyserver-import-.patch" - "0006-Do-not-use-OCB-mode-even-if-AEAD-OCB-key-preference-.patch" - "0007-Revert-the-introduction-of-the-RFC4880bis-draft-into.patch" "0008-avoid-systemd-deprecation-warning.patch" "0009-Add-systemd-support-for-keyboxd.patch" - "0010-doc-Remove-profile-and-systemd-example-files.patch" + "0010-Ship-sample-systemd-unit-files.patch" + "0011-el-gamal-default-to-3072-bits.patch" + "0012-gpg-default-digest-algorithm-SHA512.patch" + "0013-gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch" + "0018-Avoid-simple-memory-dumps-via-ptrace.patch" + "0019-Disallow-compressed-signatures-and-certificates.patch" + "0020-ssh-agent-emulation-under-systemd-inject-SSH_AUTH_SO.patch" + "0021-gpg-Sync-compliance-mode-cleanup-with-master.patch" + "0022-gpg-emit-RSA-pubkey-algorithm-when-in-compatibility-.patch" + "0023-gpg-Reintroduce-openpgp-as-distinct-from-rfc4880.patch" + "0024-gpg-Emit-LibrePGP-material-only-in-compliance-gnupg.patch" + "0025-gpg-gpgconf-list-report-actual-compliance-mode.patch" + "0026-gpg-Default-to-compliance-openpgp.patch" + "0027-gpg-Fix-newlines-in-Cleartext-Signature-Framework-CS.patch" + "0029-Add-keyboxd-systemd-support.patch" + "0033-Support-large-RSA-keygen-in-non-batch-mode.patch" + "0034-gpg-Verify-Text-mode-Signatures-over-binary-Literal-.patch" ]; postPatch = diff --git a/pkgs/tools/security/gnupg/CVE-2022-3219.patch b/pkgs/tools/security/gnupg/CVE-2022-3219.patch deleted file mode 100644 index 267085dff4c8..000000000000 --- a/pkgs/tools/security/gnupg/CVE-2022-3219.patch +++ /dev/null @@ -1,216 +0,0 @@ -From 459b61fa21db755d6c879c3ef9ab85b3d1786c9f Mon Sep 17 00:00:00 2001 -From: Demi Marie Obenour -Date: Fri, 27 May 2022 19:51:19 -0400 -Subject: [PATCH GnuPG v3] Disallow compressed signatures and certificates - -Compressed packets have significant attack surface, due to the potential -for both denial of service (zip bombs and the like) and for code -execution via memory corruption vulnerabilities in the decompressor. -Furthermore, I am not aware of any implementation that uses them in keys -or detached signatures. Therefore, disallow their use in such contexts -entirely. This includes signatures that are part of a cleartext-signed -message. - -When parsing detached signatures, forbid any packet that is not a -signature or marker packet. When parsing keys, return an error when -encountering a compressed packet, instead of decompressing the packet. - -Furthermore, certificates, keys, and signatures are not allowed to -contain partial-length or indeterminate-length packets. Reject those in -parse_packet, rather than activating the partial-length filter code. -This is not (yet) implemented for cleartext-signed messages, as these -messages are internally represented as inline-signed messages. - -GnuPG-bug-id: T5993 -Signed-off-by: Demi Marie Obenour ---- - g10/import.c | 18 ++---------------- - g10/mainproc.c | 24 +++++++++++++++++++++--- - g10/packet.h | 2 ++ - g10/parse-packet.c | 44 +++++++++++++++++++++++++++++++++++++++++++- - 4 files changed, 68 insertions(+), 20 deletions(-) - -diff --git a/g10/import.c b/g10/import.c -index bb0bf67934a8316130cde182cd43d56353e0171d..a8136351f6f7dae8c65634ed8e1c242d323e2009 100644 ---- a/g10/import.c -+++ b/g10/import.c -@@ -1042,22 +1042,8 @@ read_block( IOBUF a, unsigned int options, - switch (pkt->pkttype) - { - case PKT_COMPRESSED: -- if (check_compress_algo (pkt->pkt.compressed->algorithm)) -- { -- rc = GPG_ERR_COMPR_ALGO; -- goto ready; -- } -- else -- { -- compress_filter_context_t *cfx = xmalloc_clear( sizeof *cfx ); -- pkt->pkt.compressed->buf = NULL; -- if (push_compress_filter2 (a, cfx, -- pkt->pkt.compressed->algorithm, 1)) -- xfree (cfx); /* e.g. in case of compression_algo NONE. */ -- } -- free_packet (pkt, &parsectx); -- init_packet(pkt); -- break; -+ rc = GPG_ERR_UNEXPECTED; -+ goto ready; - - case PKT_RING_TRUST: - /* Skip those packets unless we are in restore mode. */ -diff --git a/g10/mainproc.c b/g10/mainproc.c -index af11877aa257e46662c42b6ff573ee01c3ad1547..3629fc921b742afd131e8d8e2664b201095990f0 100644 ---- a/g10/mainproc.c -+++ b/g10/mainproc.c -@@ -152,6 +152,7 @@ add_onepass_sig (CTX c, PACKET *pkt) - { - kbnode_t node; - -+ log_assert(!(c->sigs_only && c->signed_data.used)); - if (c->list) /* Add another packet. */ - add_kbnode (c->list, new_kbnode (pkt)); - else /* Insert the first one. */ -@@ -1076,8 +1077,16 @@ proc_compressed (CTX c, PACKET *pkt) - int rc; - - /*printf("zip: compressed data packet\n");*/ -- if (c->sigs_only) -- rc = handle_compressed (c->ctrl, c, zd, proc_compressed_cb, c); -+ if ( literals_seen ) -+ { -+ log_error ("Compressed packet follows literal data packet\n"); -+ rc = GPG_ERR_UNEXPECTED; -+ } -+ else if ( c->sigs_only ) -+ { -+ log_assert(!c->signed_data.used); -+ rc = handle_compressed (c->ctrl, c, zd, proc_compressed_cb, c); -+ } - else if( c->encrypt_only ) - rc = handle_compressed (c->ctrl, c, zd, proc_encrypt_cb, c); - else -@@ -1596,6 +1605,7 @@ do_proc_packets (CTX c, iobuf_t a) - c->iobuf = a; - init_packet(pkt); - init_parse_packet (&parsectx, a); -+ parsectx.sigs_only = c->sigs_only && c->signed_data.used; - while ((rc=parse_packet (&parsectx, pkt)) != -1) - { - any_data = 1; -@@ -1607,6 +1617,12 @@ do_proc_packets (CTX c, iobuf_t a) - if (gpg_err_code (rc) == GPG_ERR_INV_PACKET - && opt.list_packets == 0) - break; -+ -+ if (gpg_err_code (rc) == GPG_ERR_UNEXPECTED) -+ { -+ write_status_text( STATUS_UNEXPECTED, "0" ); -+ goto leave; -+ } - continue; - } - newpkt = -1; -@@ -1644,7 +1660,9 @@ do_proc_packets (CTX c, iobuf_t a) - case PKT_COMPRESSED: rc = proc_compressed (c, pkt); break; - case PKT_ONEPASS_SIG: newpkt = add_onepass_sig (c, pkt); break; - case PKT_GPG_CONTROL: newpkt = add_gpg_control (c, pkt); break; -- default: newpkt = 0; break; -+ default: -+ log_assert(!c->signed_data.used); -+ newpkt = 0; break; - } - } - else if (c->encrypt_only) -diff --git a/g10/packet.h b/g10/packet.h -index 5a14015a16c872fe7b0b15468598daf7a05ffc02..82dfe786b46051491e7015e64441678140defa9e 100644 ---- a/g10/packet.h -+++ b/g10/packet.h -@@ -657,6 +657,7 @@ struct parse_packet_ctx_s - int free_last_pkt; /* Indicates that LAST_PKT must be freed. */ - int skip_meta; /* Skip ring trust packets. */ - unsigned int n_parsed_packets; /* Number of parsed packets. */ -+ int sigs_only; /* Only accept detached signature packets */ - }; - typedef struct parse_packet_ctx_s *parse_packet_ctx_t; - -@@ -667,6 +668,7 @@ typedef struct parse_packet_ctx_s *parse_packet_ctx_t; - (a)->free_last_pkt = 0; \ - (a)->skip_meta = 0; \ - (a)->n_parsed_packets = 0; \ -+ (a)->sigs_only = 0; \ - } while (0) - - #define deinit_parse_packet(a) do { \ -diff --git a/g10/parse-packet.c b/g10/parse-packet.c -index cea1f7ebc5daec3863ae963c1ab25500f86796fe..dca66ff427ea6778e536782ec6bda83584877342 100644 ---- a/g10/parse-packet.c -+++ b/g10/parse-packet.c -@@ -738,6 +738,20 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos, - case PKT_ENCRYPTED_MDC: - case PKT_ENCRYPTED_AEAD: - case PKT_COMPRESSED: -+ if (ctx->sigs_only) -+ { -+ log_error (_("partial length packet of type %d in detached" -+ " signature\n"), pkttype); -+ rc = gpg_error (GPG_ERR_UNEXPECTED); -+ goto leave; -+ } -+ if (onlykeypkts) -+ { -+ log_error (_("partial length packet of type %d in keyring\n"), -+ pkttype); -+ rc = gpg_error (GPG_ERR_UNEXPECTED); -+ goto leave; -+ } - iobuf_set_partial_body_length_mode (inp, c & 0xff); - pktlen = 0; /* To indicate partial length. */ - partial = 1; -@@ -775,6 +789,20 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos, - rc = gpg_error (GPG_ERR_INV_PACKET); - goto leave; - } -+ else if (ctx->sigs_only) -+ { -+ log_error (_("indeterminate length packet of type %d in detached" -+ " signature\n"), pkttype); -+ rc = gpg_error (GPG_ERR_UNEXPECTED); -+ goto leave; -+ } -+ else if (onlykeypkts) -+ { -+ log_error (_("indeterminate length packet of type %d in" -+ " keyring\n"), pkttype); -+ rc = gpg_error (GPG_ERR_UNEXPECTED); -+ goto leave; -+ } - } - else - { -@@ -828,7 +856,21 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos, - goto leave; - } - -- if (with_uid && pkttype == PKT_USER_ID) -+ if (ctx->sigs_only) -+ switch (pkttype) -+ { -+ case PKT_SIGNATURE: -+ case PKT_MARKER: -+ break; -+ default: -+ log_error(_("Packet type %d not allowed in detached signature\n"), -+ pkttype); -+ iobuf_skip_rest (inp, pktlen, partial); -+ *skip = 1; -+ rc = GPG_ERR_UNEXPECTED; -+ goto leave; -+ } -+ else if (with_uid && pkttype == PKT_USER_ID) - /* If ONLYKEYPKTS is set to 2, then we never skip user id packets, - even if DO_SKIP is set. */ - ; --- -2.36.1 - diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 6845cb59c785..b8eaca0fe86c 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -91,7 +91,10 @@ let dontWrapQtApps = true; patches = - [ ./autoconf-ar.patch ] + [ + ./autoconf-ar.patch + ./gettext-0.25.patch + ] ++ lib.optionals (lib.elem "gtk2" buildFlavors) [ (fetchpatch { url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch"; diff --git a/pkgs/tools/security/pinentry/gettext-0.25.patch b/pkgs/tools/security/pinentry/gettext-0.25.patch new file mode 100644 index 000000000000..d38289950b2f --- /dev/null +++ b/pkgs/tools/security/pinentry/gettext-0.25.patch @@ -0,0 +1,29 @@ +diff --git a/configure.ac b/configure.ac +index 2a9f5d2..a3d9b79 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,6 +45,7 @@ m4_esyscmd([echo ]mym4_version[>VERSION]) + + AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org]) + ++AC_CONFIG_MACRO_DIRS([m4]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_SRCDIR(pinentry/pinentry.h) +@@ -329,13 +330,15 @@ if test "$pinentry_tty" = "yes"; then + [The TTY version of Pinentry is to be build]) + fi + ++AM_GNU_GETTEXT_VERSION([0.21]) ++AM_GNU_GETTEXT([external]) ++AM_ICONV + + dnl + dnl Additional checks pinentry Curses. + dnl + if test "$pinentry_curses" = "yes" \ + -o "$fallback_curses" = "yes" ; then +- AM_ICONV + if test "$am_cv_func_iconv" != "yes"; then + AC_MSG_ERROR([[ + *** diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index faef0c0c08ba..59e5f1cad613 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-QnDuqFrI/U7aZ5WcOCp5vLE+w59LVvDGOFNQy9fSy70="; }; + patches = [ + ./gettext-0.25.patch + ]; + # use pregenerated nib files because generating them requires XCode postPatch = '' cp -r ${./mac/Main.nib} macosx/Main.nib @@ -97,7 +101,7 @@ stdenv.mkDerivation rec { meta = { description = "Pinentry for GPG on Mac"; license = lib.licenses.gpl2Plus; - homepage = "https://github.com/GPGTools/pinentry-mac"; + homepage = "https://github.com/GPGTools/pinentry"; platforms = lib.platforms.darwin; mainProgram = "pinentry-mac"; }; diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 3796d0bd86b5..509e56c50654 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.1.6"; + version = "2.2.0"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; tag = version; - hash = "sha256-XFoTwBtufkT/Ja0a3MEytPHx37eg3ZZ7x15EXHjZey4="; + hash = "sha256-i8nrGni7mClJQIlkDt20JXyhlJALKCR0MZk51ACtev0="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix index e0f2b28c4dee..5dd06cf7fbb8 100644 --- a/pkgs/tools/system/hw-probe/default.nix +++ b/pkgs/tools/system/hw-probe/default.nix @@ -17,7 +17,6 @@ coreutils, curl, # Preferred to using the Perl HTTP libs - according to hw-probe. dmidecode, - edid-decode, gnugrep, gnutar, hwinfo, @@ -27,6 +26,7 @@ perl, smartmontools, usbutils, + v4l-utils, xz, # Conditionally recommended @@ -83,12 +83,12 @@ stdenv.mkDerivation rec { smartmontools pciutils usbutils - edid-decode iproute2 # (ip) coreutils # (sort) gnugrep curl gnutar + v4l-utils xz kmod # (lsmod) ]; diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix index 136f62758439..c4f820679aff 100644 --- a/pkgs/tools/system/minijail/default.nix +++ b/pkgs/tools/system/minijail/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "minijail"; - version = "2024.05.22"; + version = "2025.07.02"; src = fetchFromGitiles { url = "https://chromium.googlesource.com/chromiumos/platform/minijail"; rev = "linux-v${version}"; - sha256 = "sha256-1NNjNEC0pNb0WW0PG5smltT1/dGYNRfhNxJtW0hngI8="; + sha256 = "sha256-GRnr2O6ZpWtRDGJ6Am0XPT426Xh7wxTJsoEqyTUECYY="; }; buildInputs = [ libcap ]; diff --git a/pkgs/tools/virtualization/cloud-init/0002-fix-test-logs-on-nixos.patch b/pkgs/tools/virtualization/cloud-init/0002-fix-test-logs-on-nixos.patch new file mode 100644 index 000000000000..ca023e58c330 --- /dev/null +++ b/pkgs/tools/virtualization/cloud-init/0002-fix-test-logs-on-nixos.patch @@ -0,0 +1,22 @@ +diff --git a/tests/unittests/cmd/devel/test_logs.py b/tests/unittests/cmd/devel/test_logs.py +index 78466e8d0..cc2b7246d 100644 +--- a/tests/unittests/cmd/devel/test_logs.py ++++ b/tests/unittests/cmd/devel/test_logs.py +@@ -179,7 +179,7 @@ class TestCollectLogs: + + for to_write in to_collect: + write_file( +- tmp_path / to_write, pathlib.Path(to_write).name, mode=0x700 ++ tmp_path / to_write, pathlib.Path(to_write).name + ) + + collect_dir = tmp_path / "collect" +@@ -225,7 +225,7 @@ class TestCollectLogs: + + for to_write in to_collect: + write_file( +- tmp_path / to_write, pathlib.Path(to_write).name, mode=0x700 ++ tmp_path / to_write, pathlib.Path(to_write).name + ) + + collect_dir = tmp_path / "collect" diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 64c3090acb41..7c77372609da 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "24.2"; + version = "25.1.4"; pyproject = true; namePrefix = ""; @@ -26,11 +26,12 @@ python3.pkgs.buildPythonApplication rec { owner = "canonical"; repo = "cloud-init"; tag = version; - hash = "sha256-BhTcOeSKZ1XRIx+xJQkqkSw9M8ilr+BRKXDy5MUXB6E="; + hash = "sha256-Ubu0uhpRrr4eV4ztOq/l004/+B2kjBWjRNwYcuHCfbU="; }; patches = [ ./0001-add-nixos-support.patch + ./0002-fix-test-logs-on-nixos.patch ]; prePatch = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 07867d079924..67263043db84 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -544,6 +544,7 @@ mapAliases { dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 + dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2024-10-17 directvnc = throw "'directvnc' has been removed as it was unmaintained upstream since 2015 and failed to build with gcc 14"; # Added 2025-05-17 diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25 dispad = throw "dispad has been remove because it doesn't compile and has been unmaintained since 2014"; # Added 2025-04-25 @@ -552,6 +553,7 @@ mapAliases { dleyna-renderer = dleyna; # Added 2025-04-19 dleyna-server = dleyna; # Added 2025-04-19 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 + dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 docker_24 = throw "'docker_24' has been removed because it has been unmaintained since June 2024. Use docker_25 or newer instead."; # Added 2024-12-21 @@ -593,6 +595,7 @@ mapAliases { edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24 edge-runtime = throw "'edge-runtime' was removed as it was unused, unmaintained, likely insecure and failed to build"; # Added 2025-05-18 + edid-decode = v4l-utils; # Added 2025-06-20 eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28 eintopf = lauti; # Project was renamed, added 2025-05-01 elasticsearch7Plugins = elasticsearchPlugins; @@ -1335,6 +1338,7 @@ mapAliases { netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23 + nettools = net-tools; # Added 2025-06-11 newt-go = fosrl-newt; # Added 2025-06-24 nextcloud29 = throw '' Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped @@ -1445,6 +1449,7 @@ mapAliases { oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22 oneDNN_2 = throw "oneDNN_2 has been removed as it was only used by rocmPackages.migraphx"; # added 2025-07-18 onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 + openai-triton-llvm = triton-llvm; # added 2024-07-18 openai-whisper-cpp = whisper-cpp; # Added 2024-12-13 opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 @@ -1574,6 +1579,7 @@ mapAliases { ''; # Added 2025-03-07 polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25 poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 + posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 powerdns = pdns; # Added 2022-03-28 presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24 projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10 @@ -1647,6 +1653,7 @@ mapAliases { prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10 prometheus-tor-exporter = throw "'prometheus-tor-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-10-30 protobuf_23 = throw "'protobuf_23' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-04-20 + protobuf_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14 protobuf_26 = throw "'protobuf_26' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-29 protobuf_28 = throw "'protobuf_28' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-14 protobuf3_24 = protobuf_24; @@ -2005,8 +2012,9 @@ mapAliases { transifex-client = transifex-cli; # Added 2023-12-29 trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25 trezor_agent = trezor-agent; # Added 2024-01-07 - openai-triton-llvm = triton-llvm; # added 2024-07-18 trust-dns = hickory-dns; # Added 2024-08-07 + ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17 + tuic = throw "`tuic` has been removed due to lack of upstream maintenance, consider using other tuic implementations"; # Added 2025-02-08 tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15 turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25 tvbrowser-bin = tvbrowser; # Added 2023-03-02 @@ -2014,7 +2022,6 @@ mapAliases { typst-fmt = typstfmt; # Added 2023-07-15 typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25 typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 - tuic = throw "`tuic` has been removed due to lack of upstream maintenance, consider using other tuic implementations"; # Added 2025-02-08 ### U ### @@ -2215,6 +2222,8 @@ mapAliases { zig_0_11 = throw "zig 0.11 has been removed, upgrade to a newer version instead"; # Added 2025-04-09 zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07 zinc = zincsearch; # Added 2023-05-28 + zint = zint-qt; # Added 2025-05-15 + zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17 zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10 zkg = throw "'zkg' has been replaced by 'zeek'"; zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17 @@ -2223,18 +2232,11 @@ mapAliases { mainProgram = "zq"; }; }); # Added 2023-02-06 + zyn-fusion = zynaddsubfx; # Added 2022-08-05 zz = throw "'zz' has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10 ### UNSORTED ### - dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2024-10-17 - dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02 - - posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 - ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17 - zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17 - zyn-fusion = zynaddsubfx; # Added 2022-08-05 - inherit (stdenv.hostPlatform) system; # Added 2021-10-22 inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3af1a776ea53..1f6cde488533 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -395,8 +395,6 @@ with pkgs; } ); - djhtml = python3Packages.callPackage ../development/tools/djhtml { }; - dnf-plugins-core = with python3Packages; toPythonApplication dnf-plugins-core; dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { }; @@ -570,7 +568,7 @@ with pkgs; mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix { antlr = antlr4_10; icu = icu73; - protobuf = protobuf_24; + protobuf = protobuf_25; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; }; }) @@ -580,7 +578,7 @@ with pkgs; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { antlr = antlr4_10; icu = icu73; - protobuf = protobuf_24; + protobuf = protobuf_25; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; }; @@ -3344,9 +3342,18 @@ with pkgs; # ipscan is commonly known under the name angryipscanner angryipscanner = ipscan; - isl = isl_0_20; - isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { }; - isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { }; + inherit + (rec { + isl = isl_0_20; + isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { }; + isl_0_23 = callPackage ../development/libraries/isl/0.23.0.nix { }; + isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { }; + }) + isl + isl_0_20 + isl_0_23 + isl_0_24 + ; jackett = callPackage ../servers/jackett { }; @@ -4981,7 +4988,13 @@ with pkgs; flutter327 = flutterPackages.v3_27; flutter324 = flutterPackages.v3_24; - fpc = callPackage ../development/compilers/fpc { }; + fpc = callPackage ../development/compilers/fpc { + # https://github.com/NixOS/nixpkgs/issues/416485 + # TODO: remove when upstream issue is fixed: + # https://gitlab.com/freepascal.org/fpc/source/-/issues/41045 + stdenv = + if stdenv.cc.isClang && stdenv.hostPlatform.isx86_64 then llvmPackages_17.stdenv else stdenv; + }; gambit = callPackage ../development/compilers/gambit { }; gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; @@ -5929,10 +5942,10 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... }@args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_87 = callPackage ../development/compilers/rust/1_87.nix { + rust_1_88 = callPackage ../development/compilers/rust/1_88.nix { llvm_20 = llvmPackages_20.libllvm; }; - rust = rust_1_87; + rust = rust_1_88; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -5940,8 +5953,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_87 = rust_1_87.packages.stable; - rustPackages = rustPackages_1_87; + rustPackages_1_88 = rust_1_88.packages.stable; + rustPackages = rustPackages_1_88; inherit (rustPackages) cargo @@ -8632,9 +8645,6 @@ with pkgs; libffiReal = callPackage ../development/libraries/libffi { }; libffi = if stdenv.hostPlatform.isDarwin then darwin.libffi else libffiReal; libffi_3_3 = callPackage ../development/libraries/libffi/3.3.nix { }; - libffiBoot = libffi.override { - doCheck = false; - }; # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118 libgpg-error-gen-posix-lock-obj = libgpg-error.override { @@ -9152,7 +9162,7 @@ with pkgs; libressl = libressl_4_1; - openssl = openssl_3_4; + openssl = openssl_3_5; openssl_legacy = openssl.override { conf = ../development/libraries/openssl/3.0/legacy.cnf; @@ -9161,7 +9171,7 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_4 + openssl_3_5 ; openwebrx = callPackage ../applications/radio/openwebrx { @@ -9231,10 +9241,12 @@ with pkgs; ({ protobuf_31 = callPackage ../development/libraries/protobuf/31.nix { }; protobuf_30 = callPackage ../development/libraries/protobuf/30.nix { }; - protobuf_29 = callPackage ../development/libraries/protobuf/29.nix { }; + protobuf_29 = callPackage ../development/libraries/protobuf/29.nix { + # More recent versions of abseil seem to be missing absl::if_constexpr + abseil-cpp = abseil-cpp_202407; + }; protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { }; protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { }; - protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { abseil-cpp = abseil-cpp_202103; }; @@ -9244,7 +9256,6 @@ with pkgs; protobuf_29 protobuf_27 protobuf_25 - protobuf_24 protobuf_21 ; @@ -9389,10 +9400,7 @@ with pkgs; reposilitePlugins = recurseIntoAttrs (callPackage ../by-name/re/reposilite/plugins.nix { }); - rhino = callPackage ../development/libraries/java/rhino { - javac = jdk8; - jvm = jre8; - }; + rhino = callPackage ../development/libraries/java/rhino { }; rocksdb_9_10 = rocksdb.overrideAttrs rec { pname = "rocksdb"; @@ -9687,13 +9695,6 @@ with pkgs; gtk3 = gtk4; }; - webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { }; - webrtc-audio-processing_0_3 = - callPackage ../development/libraries/webrtc-audio-processing/0.3.nix - { }; - # bump when majoring of packages have updated - webrtc-audio-processing = webrtc-audio-processing_0_3; - wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { }; wt = wt4; @@ -9742,6 +9743,8 @@ with pkgs; zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv; + libzint = zint-qt.override { withGUI = false; }; + aroccPackages = recurseIntoAttrs (callPackage ../development/compilers/arocc { }); arocc = aroccPackages.latest; @@ -9945,14 +9948,6 @@ with pkgs; "3000" ]; }; - sbcl_2_5_2 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.5.2"; }; - faslExt = "fasl"; - flags = [ - "--dynamic-space-size" - "3000" - ]; - }; sbcl_2_5_4 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.5.4"; }; faslExt = "fasl"; @@ -9961,7 +9956,15 @@ with pkgs; "3000" ]; }; - sbcl = sbcl_2_5_4; + sbcl_2_5_5 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.5"; }; + faslExt = "fasl"; + flags = [ + "--dynamic-space-size" + "3000" + ]; + }; + sbcl = sbcl_2_5_5; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -10235,7 +10238,7 @@ with pkgs; freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { }); grafana = callPackage ../servers/monitoring/grafana { }; - grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; + grafanaPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/grafana/plugins { }); hasura-cli = callPackage ../servers/hasura/cli.nix { }; @@ -11175,11 +11178,11 @@ with pkgs; } ); - nettools = + net-tools = if stdenv.hostPlatform.isLinux then callPackage ../os-specific/linux/net-tools { } else - unixtools.nettools; + unixtools.net-tools; nftables = callPackage ../os-specific/linux/nftables { }; @@ -11415,7 +11418,7 @@ with pkgs; translateManpages = false; }; - v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; + v4l-utils = qt6.callPackage ../os-specific/linux/v4l-utils { }; windows = callPackages ../os-specific/windows { }; @@ -11732,8 +11735,6 @@ with pkgs; qgis = callPackage ../applications/gis/qgis { }; - qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; - spatialite-gui = callPackage ../by-name/sp/spatialite-gui/package.nix { wxGTK = wxGTK32; }; @@ -12176,7 +12177,7 @@ with pkgs; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio { - python = python311; + python = python3; }; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; @@ -13197,8 +13198,6 @@ with pkgs; # a somewhat more maintained fork of ympd memento = qt6Packages.callPackage ../applications/video/memento { }; - mpc-qt = qt6Packages.callPackage ../applications/video/mpc-qt { }; - mplayer = callPackage ../applications/video/mplayer ( { libdvdnav = libdvdnav_4_2_1; @@ -13717,8 +13716,7 @@ with pkgs; scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { }; - scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { }; - scribus = scribus_1_5; + scribus = callPackage ../applications/office/scribus/default.nix { }; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; @@ -15956,9 +15954,7 @@ with pkgs; # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; - jack2 = callPackage ../misc/jackaudio { - libopus = libopus.override { withCustomModes = true; }; - }; + jack2 = callPackage ../misc/jackaudio { }; libjack2 = jack2.override { prefix = "lib"; }; diff --git a/pkgs/top-level/impure-overlays.nix b/pkgs/top-level/impure-overlays.nix new file mode 100644 index 000000000000..522bb3267429 --- /dev/null +++ b/pkgs/top-level/impure-overlays.nix @@ -0,0 +1,61 @@ +/** + This file has as its value the list of overlays, as determined from the environment. + If Nix evaluation is [pure](https://nix.dev/manual/nix/latest/command-ref/conf-file.html?highlight=pure-eval#conf-pure-eval), then the list is empty. +*/ +let + # Return ‘x’ if it evaluates, or ‘def’ if it throws an exception. + try = + x: def: + let + res = builtins.tryEval x; + in + if res.success then res.value else def; + homeDir = builtins.getEnv "HOME"; + + isDir = path: builtins.pathExists (path + "/."); + pathOverlays = try (toString ) ""; + homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix"; + homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays"; + overlays = + path: + # check if the path is a directory or a file + if isDir path then + # it's a directory, so the set of overlays from the directory, ordered lexicographically + let + content = builtins.readDir path; + in + map (n: import (path + ("/" + n))) ( + builtins.filter ( + n: + ( + builtins.match ".*\\.nix" n != null + && + # ignore Emacs lock files (.#foo.nix) + builtins.match "\\.#.*" n == null + ) + || builtins.pathExists (path + ("/" + n + "/default.nix")) + ) (builtins.attrNames content) + ) + else + # it's a file, so the result is the contents of the file itself + import path; +in +if pathOverlays != "" && builtins.pathExists pathOverlays then + overlays pathOverlays +else if builtins.pathExists homeOverlaysFile && builtins.pathExists homeOverlaysDir then + throw '' + Nixpkgs overlays can be specified with ${homeOverlaysFile} or ${homeOverlaysDir}, but not both. + Please remove one of them and try again. + '' +else if builtins.pathExists homeOverlaysFile then + if isDir homeOverlaysFile then + throw (homeOverlaysFile + " should be a file") + else + overlays homeOverlaysFile +else if builtins.pathExists homeOverlaysDir then + if !(isDir homeOverlaysDir) then + throw (homeOverlaysDir + " should be a directory") + else + overlays homeOverlaysDir +else + [ ] diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 88a92d7755e5..db79a1588a7c 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -7,14 +7,6 @@ let homeDir = builtins.getEnv "HOME"; - # Return ‘x’ if it evaluates, or ‘def’ if it throws an exception. - try = - x: def: - let - res = builtins.tryEval x; - in - if res.success then res.value else def; - in { @@ -50,55 +42,7 @@ in # Overlays are used to extend Nixpkgs collection with additional # collections of packages. These collection of packages are part of the # fix-point made by Nixpkgs. - overlays ? - let - isDir = path: builtins.pathExists (path + "/."); - pathOverlays = try (toString ) ""; - homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix"; - homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays"; - overlays = - path: - # check if the path is a directory or a file - if isDir path then - # it's a directory, so the set of overlays from the directory, ordered lexicographically - let - content = builtins.readDir path; - in - map (n: import (path + ("/" + n))) ( - builtins.filter ( - n: - ( - builtins.match ".*\\.nix" n != null - && - # ignore Emacs lock files (.#foo.nix) - builtins.match "\\.#.*" n == null - ) - || builtins.pathExists (path + ("/" + n + "/default.nix")) - ) (builtins.attrNames content) - ) - else - # it's a file, so the result is the contents of the file itself - import path; - in - if pathOverlays != "" && builtins.pathExists pathOverlays then - overlays pathOverlays - else if builtins.pathExists homeOverlaysFile && builtins.pathExists homeOverlaysDir then - throw '' - Nixpkgs overlays can be specified with ${homeOverlaysFile} or ${homeOverlaysDir}, but not both. - Please remove one of them and try again. - '' - else if builtins.pathExists homeOverlaysFile then - if isDir homeOverlaysFile then - throw (homeOverlaysFile + " should be a file") - else - overlays homeOverlaysFile - else if builtins.pathExists homeOverlaysDir then - if !(isDir homeOverlaysDir) then - throw (homeOverlaysDir + " should be a directory") - else - overlays homeOverlaysDir - else - [ ], + overlays ? import ./impure-overlays.nix, crossOverlays ? [ ], diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index be8b0a94aa05..b12f50e790f2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -38660,8 +38660,9 @@ with self; XMLNamespaceSupport XMLSAXBase ]; - postInstall = '' - perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()" + postPatch = '' + substituteInPlace Makefile.PL \ + --replace-fail "\$(PERL)" "${lib.getExe buildPackages.perl}" ''; meta = { description = "Simple API for XML"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0a0858c3d26..a5613fb2c2f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3207,12 +3207,12 @@ self: super: with self; { cython_0 = callPackage ../development/python-modules/cython/0.nix { }; cython_3_1 = cython.overridePythonAttrs rec { - version = "3.1.1"; + version = "3.1.2"; src = pkgs.fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-KdRYPH3Do3KntgqLGIUSeD6DjmXNdFjI2ZSszzMjF6k="; + hash = "sha256-lP8ILCzAZuoPzFhCqGXwIpifN8XoWz93SJ7c3XVe69Y="; }; }; @@ -5052,6 +5052,8 @@ self: super: with self; { fido2 = callPackage ../development/python-modules/fido2 { }; + fido2_2 = callPackage ../development/python-modules/fido2/2.nix { }; + fields = callPackage ../development/python-modules/fields { }; file-read-backwards = callPackage ../development/python-modules/file-read-backwards { }; @@ -7394,10 +7396,7 @@ self: super: with self; { jsonmerge = callPackage ../development/python-modules/jsonmerge { }; - jsonnet = buildPythonPackage { - inherit (pkgs.jsonnet) name src; - format = "setuptools"; - }; + jsonnet = callPackage ../development/python-modules/jsonnet { }; jsonpatch = callPackage ../development/python-modules/jsonpatch { }; @@ -14946,6 +14945,8 @@ self: super: with self; { pyverilog = callPackage ../development/python-modules/pyverilog { }; + pyvers = callPackage ../development/python-modules/pyvers { }; + pyversasense = callPackage ../development/python-modules/pyversasense { }; pyvesync = callPackage ../development/python-modules/pyvesync { }; @@ -17370,10 +17371,14 @@ self: super: with self; { svg2tikz = callPackage ../development/python-modules/svg2tikz { }; + svgdigitizer = callPackage ../development/python-modules/svgdigitizer { }; + svgelements = callPackage ../development/python-modules/svgelements { }; svglib = callPackage ../development/python-modules/svglib { }; + svgpathtools = callPackage ../development/python-modules/svgpathtools { }; + svgutils = callPackage ../development/python-modules/svgutils { }; svgwrite = callPackage ../development/python-modules/svgwrite { }; @@ -19060,6 +19065,8 @@ self: super: with self; { urwid-readline = callPackage ../development/python-modules/urwid-readline { }; + urwid-satext = callPackage ../development/python-modules/urwid-satext { }; + urwidgets = callPackage ../development/python-modules/urwidgets { }; urwidtrees = callPackage ../development/python-modules/urwidtrees { }; @@ -19681,7 +19688,9 @@ self: super: with self; { xen = toPythonModule (pkgs.xen.override { python3Packages = self; }); - xformers = callPackage ../development/python-modules/xformers { }; + xformers = callPackage ../development/python-modules/xformers { + inherit (pkgs.llvmPackages) openmp; + }; xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; }; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index ba613a51ca07..f4f8e6e3df62 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -79,7 +79,7 @@ let bins = mapAttrs singleBinary { # singular binaries arp = { - linux = pkgs.nettools; + linux = pkgs.net-tools; darwin = pkgs.darwin.network_cmds; freebsd = pkgs.freebsd.arp; }; @@ -132,7 +132,7 @@ let openbsd = pkgs.openbsd.hostname; }; ifconfig = { - linux = pkgs.nettools; + linux = pkgs.net-tools; darwin = pkgs.darwin.network_cmds; freebsd = pkgs.freebsd.ifconfig; openbsd = pkgs.openbsd.ifconfig; @@ -172,7 +172,7 @@ let ''; }; netstat = { - linux = pkgs.nettools; + linux = pkgs.net-tools; darwin = pkgs.darwin.network_cmds; freebsd = pkgs.freebsd.netstat; }; @@ -198,7 +198,7 @@ let darwin = pkgs.darwin.diskdev_cmds; }; route = { - linux = pkgs.nettools; + linux = pkgs.net-tools; darwin = pkgs.darwin.network_cmds; freebsd = pkgs.freebsd.route; openbsd = pkgs.openbsd.route; @@ -288,7 +288,7 @@ let col column ]; - nettools = [ + net-tools = [ arp hostname ifconfig