diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 1948d8fdc7ce6..21b1a014d9330 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -264,6 +264,9 @@ a4f7e161b380b35b2f7bc432659a95fd71254ad8 # haskellPackages.hercules-ci-agent (cabal2nix -> nixfmt-rfc-style) 9314da7ee8d2aedfb15193b8c489da51efe52bb5 +# haskell-updates: nixfmt-rfc-style +9e296dcf846294e0aa94af7d3235e82eee7fe055 + # nix-builder-vm: nixfmt-rfc-style a034fb50f79816c6738fb48b48503b09ea3b0132 diff --git a/README.md b/README.md index 76c1c456d4ece..6714aa90e1cbc 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ When successful build and test criteria are met, the Nixpkgs expressions are dis # Contributing Nixpkgs is among the most active projects on GitHub. -While thousands of open issues and pull requests might seem a lot at first, it helps consider it in the context of the scope of the project. +While thousands of open issues and pull requests might seem like a lot at first, it helps to consider it in the context of the scope of the project. Nixpkgs describes how to build tens of thousands of pieces of software and implements a Linux distribution. The [GitHub Insights](https://github.com/NixOS/nixpkgs/pulse) page gives a sense of the project activity. diff --git a/ci/eval/README.md b/ci/eval/README.md index d3eb252dab59a..1cbb400552c75 100644 --- a/ci/eval/README.md +++ b/ci/eval/README.md @@ -8,7 +8,7 @@ Furthermore it also allows local evaluation using: nix-build ci -A eval.baseline ``` -The most important two arguments are: +The two most important arguments are: - `--arg evalSystems`: The set of systems for which `nixpkgs` should be evaluated. Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`). Example: `--arg evalSystems '["x86_64-linux" "aarch64-darwin"]'` diff --git a/doc/README.md b/doc/README.md index 23f59e580d057..889198bc9e352 100644 --- a/doc/README.md +++ b/doc/README.md @@ -408,7 +408,7 @@ Though this is not shown in the rendered documentation on nixos.org. #### Footnotes -To add a foonote explanation, use the following syntax: +To add a footnote explanation, use the following syntax: ```markdown Sometimes it's better to add context [^context] in a footnote. @@ -443,7 +443,7 @@ This syntax is taken from [CommonMark](https://spec.commonmark.org/0.30/#link-re #### Typographic replacements Typographic replacements are enabled. -Check the [list of possible replacement patterns check](https://github.com/executablebooks/markdown-it-py/blob/3613e8016ecafe21709471ee0032a90a4157c2d1/markdown_it/rules_core/replacements.py#L1-L15). +Check the [list of possible replacement patterns](https://github.com/executablebooks/markdown-it-py/blob/3613e8016ecafe21709471ee0032a90a4157c2d1/markdown_it/rules_core/replacements.py#L1-L15). ## Getting help diff --git a/doc/build-helpers.md b/doc/build-helpers.md index a9df144bacbf1..f11deafdc24de 100644 --- a/doc/build-helpers.md +++ b/doc/build-helpers.md @@ -3,13 +3,13 @@ A build helper is a function that produces derivations. :::{.warning} -This is not to be confused with the [`builder` argument of the Nix `derivation` primitive](https://nixos.org/manual/nix/unstable/language/derivations.html), which refers to the executable that produces the build result, or [remote builder](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html), which refers to a remote machine that could run such an executable. +This is not to be confused with the [`builder` argument of the Nix `derivation` primitive](https://nixos.org/manual/nix/unstable/language/derivations.html), which refers to the executable that produces the build result, or [remote builder](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html), which refers to a remote machine that could run such an executable. ::: Such a function is usually designed to abstract over a typical workflow for a given programming language or framework. This allows declaring a build recipe by setting a limited number of options relevant to the particular use case instead of using the `derivation` function directly. -[`stdenv.mkDerivation`](#part-stdenv) is the most widely used build helper, and serves as a basis for many others. +[`stdenv.mkDerivation`](#part-stdenv) is the most widely used build helper and serves as a basis for many others. In addition, it offers various options to customize parts of the builds. There is no uniform interface for build helpers. diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index e70617de5611d..c665a5fa8436d 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -416,7 +416,7 @@ fetchurl { } ``` -After building the package, the file will be downloaded and place into the Nix store: +After building the package, the file will be downloaded and placed into the Nix store: ```shell $ nix-build diff --git a/doc/build-helpers/fixed-point-arguments.chapter.md b/doc/build-helpers/fixed-point-arguments.chapter.md index 4506d716b4c11..78fc2ac65a89a 100644 --- a/doc/build-helpers/fixed-point-arguments.chapter.md +++ b/doc/build-helpers/fixed-point-arguments.chapter.md @@ -1,7 +1,6 @@ # Fixed-point arguments of build helpers {#chap-build-helpers-finalAttrs} -As mentioned in the beginning of this part, `stdenv.mkDerivation` could alternatively accept a fixed-point function. The input of such function, typically named `finalAttrs`, is expected to be the final state of the attribute set. -A build helper like this is said to accept **fixed-point arguments**. +As mentioned in the beginning of this part, `stdenv.mkDerivation` could alternatively accept a fixed-point function. The input of this function, typically named `finalAttrs`, is expected to be the final state of the attribute set. A build helper like this is said to accept **fixed-point arguments**. Build helpers don't always support fixed-point arguments yet, as support in [`stdenv.mkDerivation`](#mkderivation-recursive-attributes) was first included in Nixpkgs 22.05. @@ -9,7 +8,7 @@ Build helpers don't always support fixed-point arguments yet, as support in [`st Developers can use the Nixpkgs library function [`lib.customisation.extendMkDerivation`](#function-library-lib.customisation.extendMkDerivation) to define a build helper supporting fixed-point arguments from an existing one with such support, with an attribute overlay similar to the one taken by [`.overrideAttrs`](#sec-pkg-overrideAttrs). -Beside overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point arguments from passing down the base build helper (specified as `constructDrv`). +Besides overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point arguments from passing down the base build helper (specified as `constructDrv`). :::{.example #ex-build-helpers-extendMkDerivation} @@ -41,7 +40,7 @@ stdenv.mkDerivation ( ) ``` -we could define with `lib.extendMkDerivation` an attribute overlay to make the result build helper also accepts the the attribute set's fixed point passing to the underlying `stdenv.mkDerivation`, named `finalAttrs` here: +we could define with `lib.extendMkDerivation` an attribute overlay to make the result build helper also accept the attribute set's fixed point passing to the underlying `stdenv.mkDerivation`, named `finalAttrs` here: ```nix lib.extendMkDerivation { diff --git a/doc/build-helpers/special/fhs-environments.section.md b/doc/build-helpers/special/fhs-environments.section.md index e81dbdfdc6419..91c0931e0e4e4 100644 --- a/doc/build-helpers/special/fhs-environments.section.md +++ b/doc/build-helpers/special/fhs-environments.section.md @@ -1,6 +1,6 @@ # buildFHSEnv {#sec-fhs-environments} -`buildFHSEnv` provides a way to build and run FHS-compatible lightweight sandboxes. It creates an isolated root filesystem with the host's `/nix/store`, so its footprint in terms of disk space is quite small. This allows you to run software which is hard or unfeasible to patch for NixOS; 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries for instance. +`buildFHSEnv` provides a way to build and run an FHS-compatible, lightweight sandbox. It creates an isolated root filesystem with the host's `/nix/store`, so its footprint in terms of disk space is quite small. This allows you to run software which is hard or unfeasible to patch for NixOS; 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries for instance. It uses Linux' namespaces feature to create temporary lightweight environments which are destroyed after all child processes exit, without requiring elevated privileges. It works similar to containerisation technology such as Docker or FlatPak but provides no security-relevant separation from the host system. Accepted arguments are: diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md index 4805cb3efe756..e4e8ddbb2c17d 100644 --- a/doc/build-helpers/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md @@ -98,7 +98,7 @@ It has two modes: : The path to the files to check. -`remap` (attribe set, optional) {#tester-lycheeLinkCheck-param-remap} +`remap` (attribute set, optional) {#tester-lycheeLinkCheck-param-remap} : An attribute set where the attribute names are regular expressions. The values should be strings, derivations, or path values. diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index 6f1c4dfba278a..25c49a79ee6b0 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -651,7 +651,7 @@ Write a Bash script to a "bin" subdirectory of a directory in the Nix store. : The contents of the file. The file's contents will be put into `/nix/store//bin/`. -The store path will include the the name, and it will be a directory. +The store path will include the name, and it will be a directory. This function is a combination of [](#trivial-builder-writeShellScript) and [](#trivial-builder-writeScriptBin). diff --git a/doc/development.md b/doc/development.md index 0c092befca245..651150420aeed 100644 --- a/doc/development.md +++ b/doc/development.md @@ -1,6 +1,6 @@ # Development of Nixpkgs {#part-development} -This section shows you how Nixpkgs is being developed and how you can interact with the contributors and the latest updates. +This section shows you how Nixpkgs is developed and how you can interact with the contributors and the latest updates. If you are interested in contributing yourself, see [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). diff --git a/doc/functions.md b/doc/functions.md index 09033c9e3c199..5d4a58d50be21 100644 --- a/doc/functions.md +++ b/doc/functions.md @@ -1,6 +1,6 @@ # Functions reference {#chap-functions} -The nixpkgs repository has several utility functions to manipulate Nix expressions. +The Nixpkgs repository has several utility functions to manipulate Nix expressions. ```{=include=} sections functions/library.md diff --git a/doc/functions/debug.section.md b/doc/functions/debug.section.md index b2d8589431ab5..9bf7c7efc6c9d 100644 --- a/doc/functions/debug.section.md +++ b/doc/functions/debug.section.md @@ -1,5 +1,5 @@ # Debugging Nix Expressions {#sec-debug} -Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions. +Nix is a unityped, dynamic language, this means any value can potentially appear anywhere. Since it is also non-strict, evaluation order and what is ultimately evaluated might surprise you. Therefore, it is important to be able to debug Nix expressions. In the `lib/debug.nix` file you will find a number of functions that help (pretty-)printing values while evaluation is running. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in `lib/debug.nix` for usage information. diff --git a/doc/functions/generators.section.md b/doc/functions/generators.section.md index f636d00cc2580..3113d19230f3a 100644 --- a/doc/functions/generators.section.md +++ b/doc/functions/generators.section.md @@ -1,9 +1,9 @@ # Generators {#sec-generators} -Generators are functions that create file formats from nix data structures, e. g. for configuration files. There are generators available for: `INI`, `JSON` and `YAML` +Generators are functions that create file formats from Nix data structures, e.g. for configuration files. There are generators available for: `INI`, `JSON` and `YAML`. -All generators follow a similar call interface: `generatorName configFunctions data`, where `configFunctions` is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is `mkSectionName ? (name: libStr.escape [ "[" "]" ] name)` from the `INI` generator. It receives the name of a section and sanitizes it. The default `mkSectionName` escapes `[` and `]` with a backslash. +All generators follow a similar call interface: `generatorName configFunctions data`, where `configFunctions` is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is `mkSectionName` from the `INI` generator, which defaults to `(name: libStr.escape [ "[" "]" ] name)`. It receives the name of a section and sanitizes it. The default `mkSectionName` escapes `[` and `]` with a backslash. -Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses `: ` as separator, the strings `"yes"`/`"no"` as boolean values and requires all string values to be quoted: +Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI file format that uses `: ` as a separator, the strings `"yes"` and `"no"` as boolean values, and requires all string values to be quoted: ```nix let @@ -42,7 +42,7 @@ customToINI { } ``` -This will produce the following INI file as nix string: +This will produce the following INI file as a Nix string: ```INI [main] diff --git a/doc/interoperability/cyclonedx.md b/doc/interoperability/cyclonedx.md index e49b77c2f92b3..2614aa623fac8 100644 --- a/doc/interoperability/cyclonedx.md +++ b/doc/interoperability/cyclonedx.md @@ -3,10 +3,10 @@ [OWASP](https://owasp.org/) [CycloneDX](https://cyclonedx.org/) is a Software [Bill of Materials](https://en.wikipedia.org/wiki/Bill_of_materials) (SBOM) standard. The standards described here are for including Nix specific information within SBOMs in a way that is interoperable with external SBOM tooling. -## `nix` Namespace Property Taxonomy {#sec-interop.cylonedx-nix} +## `nix` Namespace Property Taxonomy {#sec-interop.cylonedx-nix} -The following tables describe namespaces for [properties](https://cyclonedx.org/docs/1.6/json/#components_items_properties) that may be attached to components within SBOMs. -Component properties are lists of name-value-pairs where values must be strings. +The following tables describe namespaces for [properties](https://cyclonedx.org/docs/1.6/json/#components_items_properties) that can be attached to components within SBOMs. +Component properties are lists of name-value-pairs where the values must be strings. Properties with the same name may appear more than once. Names and values are case-sensitive. diff --git a/doc/languages-frameworks/chicken.section.md b/doc/languages-frameworks/chicken.section.md index dd7aa83603db2..450760979a38c 100644 --- a/doc/languages-frameworks/chicken.section.md +++ b/doc/languages-frameworks/chicken.section.md @@ -6,7 +6,7 @@ compiler. It includes an interactive mode and a custom package format, "eggs". ## Using Eggs {#sec-chicken-using} -Eggs described in nixpkgs are available inside the +Eggs described in Nixpkgs are available inside the `chickenPackages.chickenEggs` attrset. Including an egg as a build input is done in the typical Nix fashion. For example, to include support for [SRFI 189](https://srfi.schemers.org/srfi-189/srfi-189.html) in a derivation, one @@ -26,7 +26,7 @@ variables `CHICKEN_INCLUDE_PATH` and `CHICKEN_REPOSITORY_PATH`. ## Updating Eggs {#sec-chicken-updating-eggs} -nixpkgs only knows about a subset of all published eggs. It uses +Nixpkgs only knows about a subset of all published eggs. It uses [egg2nix](https://github.com/the-kenny/egg2nix) to generate a package set from a list of eggs to include. diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 0b4d66a430f45..252f7ea3dea79 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -111,7 +111,7 @@ Fortunately, we have a [family of hooks]{#ssec-gnome-hooks-wrapgappshook} that a - [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4} for GTK 4 apps. Same as `wrapGAppsHook3` but replaces `gtk3` with `gtk4`. - [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook} for programs without a graphical interface. Same as the above but does not bring `gtk3` and `librsvg` into the closure. -The hooks do the the following: +The hooks do the following: - `wrapGApps*` hook itself will add the package’s `share` directory to `XDG_DATA_DIRS`. diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 84312c8d81856..d9246994676d5 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -58,7 +58,7 @@ Each of those compiler versions has a corresponding attribute set `packages` bui it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC 9.4.8 is `haskell.packages.ghc948`. In fact, `haskellPackages` (at the time of writing) is just an alias -for `haskell.packages.ghc984`: +for `haskell.packages.ghc9103`. Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 12507a5e5d5f6..d198841544385 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -542,7 +542,7 @@ set `prePnpmInstall` to the right commands to run. For example: ```nix { prePnpmInstall = '' - pnpm config set dedupe-peer-dependants false + pnpm config set dedupe-peer-dependents false ''; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) prePnpmInstall; diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 9b20a8ab32f52..1f5aa96739e5f 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -52,7 +52,7 @@ Here is a simple package example. - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is - complete, but only if the OCaml version is at at least `"4.05"`. + complete, but only if the OCaml version is at least `"4.05"`. - It uses the package `ocaml-syntax-shims` as a build input, `alcotest` and `ppx_let` as check inputs (because they are needed to run the tests), and diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 3a1d1d2e914b6..487b7d4b3401f 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1018,7 +1018,7 @@ that we introduced with the `let` expression. #### Handling dependencies {#handling-dependencies} Our example, `toolz`, does not have any dependencies on other Python packages or system libraries. -[`buildPythonPackage`](#buildpythonpackage-function) uses the the following arguments in the following circumstances: +[`buildPythonPackage`](#buildpythonpackage-function) uses the following arguments in the following circumstances: - `dependencies` - For Python runtime dependencies. - `build-system` - For Python build-time requirements. diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md index 8e95580522b23..703d832c7931d 100644 --- a/doc/module-system/module-system.chapter.md +++ b/doc/module-system/module-system.chapter.md @@ -162,7 +162,7 @@ the last category is only available after the `imports` have been resolved. It is exposed as a module argument due to how the module system is implemented, which cannot be avoided without breaking compatibility. It is a good practice not to rely on `_prefix`. A module should not make assumptions about its location in the configuration tree. - For example, the root of a NixOS configuration may have a non-empty prefix, for example when it is a specialisation, or when it is part of a larger, multi-host configuration such as a [NixOS test](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests). + For example, the root of a NixOS configuration may have a non-empty prefix, for example when it is a specialisation, or when it is part of a larger, multi-host configuration, such as a [NixOS test](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests). Instead of depending on `_prefix` use explicit options, whose default definitions can be provided by the module that imports them. diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index c68ab09c7f6cb..5b4c54ef4cd6c 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -19,7 +19,7 @@ To discover other kinds of documentation: ## Overview of Nixpkgs {#overview-of-nixpkgs} Nix expressions describe how to build packages from source and are collected in -the [nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the +the [Nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the collection are Nix expressions for [NixOS modules](https://nixos.org/nixos/manual/index.html#sec-writing-modules). With these expressions the Nix package manager can build binary packages. @@ -34,7 +34,7 @@ security updates. More up-to-date packages and modules are available via the `nixos-unstable` channel. Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the -nixpkgs repository, although both do lag the `master` branch by generally +Nixpkgs repository, although both do lag the `master` branch by generally [a couple of days](https://status.nixos.org/). Updates to a channel are distributed as soon as all tests for that channel pass, e.g. [this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) @@ -46,5 +46,5 @@ which also builds binary packages from the Nix expressions in Nixpkgs for The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the -[nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches +[Nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches that correspond to the channel names (e.g. `nixos-22.11-small`). diff --git a/doc/redirects.json b/doc/redirects.json index b2aa1b321d5c0..375ab08e9384a 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -216,6 +216,12 @@ "sec-building-packages-with-llvm-using-clang-stdenv": [ "index.html#sec-building-packages-with-llvm-using-clang-stdenv" ], + "sec-darwin-libcxx-deployment-targets": [ + "index.html#sec-darwin-libcxx-deployment-targets" + ], + "sec-darwin-libcxx-versions": [ + "index.html#sec-darwin-libcxx-versions" + ], "sec-functions-library-treefmt": [ "index.html#sec-functions-library-treefmt" ], diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index fb7cfb164e4f7..7147091f7fa41 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -230,7 +230,7 @@ - `buildGoModule` now supports a `goSum` attribute (`null` by default) to optionally provide a path to `go.sum` and correctly enabling rebuilds when the file changes. -- The newly added aliases `go_latest` and `buildGoLatestModule` are now available and can be use to prevent packages like `gopls` from breaking whenever the default toolchain minor version is lagging behind. +- The newly added aliases `go_latest` and `buildGoLatestModule` are now available and can be used to prevent packages like `gopls` from breaking whenever the default toolchain minor version is lagging behind. It can also be used _outside of Nixpkgs_ to get fast access to new Go minor versions without having to wait for a staging cycle that will update the default builder/toolchain. - A [policy documenting the details of Go toolchain and builder upgrades](https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/go/README.md#go-toolchainbuilder-upgrade-policy) in Nixpkgs, as well as rules related to using non-default builders like `buildGo1xxModule` and `buildGoLatestModule` has been added in-tree. @@ -257,7 +257,7 @@ and `withGstreamer`/`withVlc` override options have been removed due to this. - `nexusmods-app` has been upgraded from version 0.6.3. If you were running a version older than 0.7.0, then before upgrading, you **must reset all app state** (mods, games, settings, etc). Otherwise, NexusMods.App will crash due to app state files incompatibility. - - Typically, you can can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods. + - Typically, you can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods. - This should not be necessary going forward, because loading app state from 0.7.0 or newer is now supported. This is documented in the [0.7.1 changelog](https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.7.1). - `nezha` and its agent `nezha-agent` have been updated to v1, which contains breaking changes. See the [official wiki](https://nezha.wiki/en_US/) for more details. @@ -369,7 +369,7 @@ - `nodePackages.expo-cli` has been removed, as it was deprecated by upstream. The suggested replacement is the `npx expo` command. -- `open-policy-agent` has has been updated to 1.0.0+. +- `open-policy-agent` has been updated to 1.0.0+. This major release makes the `rego.v1` syntax the default. This is a breaking change for those using v0 Rego. See the [upgrade documentation](https://www.openpolicyagent.org/docs/v1.0.1/v0-upgrade/) for more details. @@ -514,7 +514,7 @@ Note that all provided plugins must have versions/tags (string after `@`), even if upstream repo does not tag each release. For untagged plugins, you can either create an empty Go project and run `go get ` and see changes in `go.mod` to get the pseudo-version number, or provide a commit hash in place of version/tag for the first run, and update the plugin string based on the error output. -- The `godot-export-templates` package now has its content at `share/godot/export_templates/$version` instead of the output root. This makes it more convenient for for symlinking into `~/.local`, but scripts expecting the old layout will need to be changed. +- The `godot-export-templates` package now has its content at `share/godot/export_templates/$version` instead of the output root. This makes it more convenient for symlinking into `~/.local`, but scripts expecting the old layout will need to be changed. - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details. @@ -549,7 +549,7 @@ - `gerbera` now has wavpack support. -- `signal-desktop` has been migrated to a from source build. No state migration is necessary. In case there's no working source build available (like on Darwin), the the binary build is still available at `signal-desktop-bin`. +- `signal-desktop` has been migrated to a from source build. No state migration is necessary. In case there's no working source build available (like on Darwin), the binary build is still available at `signal-desktop-bin`. - `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index df1f2a4e5e926..081daf8cbdb72 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -9,6 +9,14 @@ and newer series. However, embedded chips without LSX (Loongson SIMD eXtension), such as 2K0300 SoC, are not supported. `pkgsCross.loongarch64-linux-embedded` can be used to build software and systems for these platforms. - The official Nix formatter `nixfmt` is now stable and available as `pkgs.nixfmt`, deprecating the temporary `pkgs.nixfmt-rfc-style` attribute. The classic `nixfmt` will stay available for some more time as `pkgs.nixfmt-classic`. +- The default GHC version has been updated from 9.8 to 9.10. + `haskellPackages` correspondingly uses Stackage LTS 24 (instead of LTS 23) as a baseline. + +- Darwin has switched to using the system libc++. This was done for improved compatibility and to avoid ODR violations. + If a newer C++ library feature is not available on the default deployment target, you will need to increase the deployment target. + See the Darwin platform documentation for more details. + +- LLVM has been updated from 19 to 21. ## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities} @@ -58,7 +66,7 @@ - `buildGoModule` now warns if `.passthru.overrideModAttrs` is lost during the overriding of its result packages. -- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier. +- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by SIL](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier. - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011. @@ -136,7 +144,7 @@ - `tooling-language-server` has been renamed to `deputy` (both the package and binary), following the rename of the upstream project. -- `fetchtorrent`, when using the "rqbit" backend, erroneously started fetching files into a subdirectory in Nixpkgs 24.11. The original behaviour – which matches the behaviour using the "transmission" backend – has now been restored. Users reliant on the erroneous behaviour can temporarily maintain it by adding `flatten = false` to the `fetchtorrent` arguments; Nix will produce an evaluation warning for anyone using `backend = "rqbit"` without `flatten = true`. +- `fetchtorrent`, when using the "rqbit" backend, erroneously started fetching files into a subdirectory in Nixpkgs 24.11. The original behaviour -- which matches the behaviour using the "transmission" backend -- has now been restored. Users reliant on the erroneous behaviour can temporarily maintain it by adding `flatten = false` to the `fetchtorrent` arguments; Nix will produce an evaluation warning for anyone using `backend = "rqbit"` without `flatten = true`. - `steamcontroller` has been removed due to lack of upstream maintenance. Consider using `sc-controller` instead. diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md index f7e9b4fcc3517..06662bbc76fa5 100644 --- a/doc/stdenv/platform-notes.chapter.md +++ b/doc/stdenv/platform-notes.chapter.md @@ -12,6 +12,9 @@ If it does, you’re done; skip the rest of this. - Darwin uses Clang by default instead of GCC. Packages that refer to `$CC` or `cc` should just work in most cases. Some packages may hardcode `gcc` or `g++`. You can usually fix that by setting `makeFlags = [ "CC=cc" "CXX=C++" ]`. If that does not work, you will have to patch the build scripts yourself to use the correct compiler for Darwin. +- Darwin uses the system libc++ by default to avoid ODR violations and potential compatibility issues from mixing LLVM libc++ with the system libc++. + While mixing the two usually worked, the two implementations are not guaranteed to be ABI compatible and are considered distinct by upstream. + See the troubleshooting guide below if you need to use newer C++ library features than those supported by the default deployment target. - Darwin needs an SDK to build software. The SDK provides a default set of frameworks and libraries to build software, most of which are specific to Darwin. There are multiple versions of the SDK packages in Nixpkgs, but one is included by default in the `stdenv`. @@ -30,6 +33,20 @@ If you run into issues or failures, continue reading below for how to deal with ### Darwin Issue Troubleshooting {#sec-darwin-troubleshooting} +#### Building a C++ package or library says that certain APIs are unavailable {#sec-darwin-libcxx-versions} + +While some newer APIs may be available via headers only, some require using a system libc++ with the required API support. +When that happens, your build will fail because libc++ makes failure to use the correct deployment target an error. +To make the newer API available, increase the deployment target to the required version. +Note that it is possible to use libc++ from LLVM instead of increasing the deployment target, but it is not recommended. +Doing so can cause problems when multiple libc++ implementations are linked into a binary (e.g., from dependencies). + +##### Using a newer deployment target {#sec-darwin-libcxx-deployment-targets} + +See below for how to use a newer deployment target. +For example, `std::print` depends on features that are only available on macOS 13.3 or newer. +To make them available, set the deployment target to 13.3 using `darwinMinVersionHook`. + #### Package requires a non-default SDK or fails to build due to missing frameworks or symbols {#sec-darwin-troubleshooting-using-sdks} In some cases, you may have to use a non-default SDK. diff --git a/lib/licenses.nix b/lib/licenses.nix index 3b2c368b9ba58..09d708b570d23 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -481,6 +481,11 @@ lib.mapAttrs mkLicense ( fullName = "Common Public License 1.0"; }; + cnri-python = { + spdxId = "CNRI-Python"; + fullName = "CNRI Python License"; + }; + cronyx = { spdxId = "Cronyx"; fullName = "Cronyx License"; diff --git a/maintainers/README.md b/maintainers/README.md index 2cc71698939fc..1bcaaea1a5c32 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -8,7 +8,7 @@ This more fluid approach is one reason why we scale to so many packages. The main responsibility of a maintainer is to keep the packages they maintain in a functioning state, and keep up with updates. In order to do that, they are empowered to make decisions over the packages they maintain. -That being said, the maintainer is not alone proposing changes to the packages. +That being said, the maintainer is not alone in proposing changes to the packages. Anybody (both bots and humans) can send PRs to bump or tweak the package. We also allow other non-maintainer committers to merge changes to the package, provided enough time and priority has been given to the maintainer. @@ -143,7 +143,7 @@ When adding users to [`maintainer-list.nix`](./maintainer-list.nix), the followi ### Maintainer teams Feel free to create a new maintainer team in [`team-list.nix`](./team-list.nix) when a group is collectively responsible for a collection of packages. -Use taste and personal judgement when deciding if a team is warranted. +Use taste and personal judgment when deciding if a team is warranted. Teams are allowed to define their own rules about membership. diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md index 81b2873788a41..6ae6cb851bc4a 100644 --- a/maintainers/scripts/README.md +++ b/maintainers/scripts/README.md @@ -1,7 +1,7 @@ # Maintainer scripts This folder contains various executable scripts for nixpkgs maintainers, and supporting data or nixlang files as needed. -These scripts generally aren't a stable interface and may changed or be removed. +These scripts generally aren't a stable interface and may be changed or be removed. What follows is a (very incomplete) overview of available scripts. diff --git a/maintainers/scripts/bootstrap-files/README.md b/maintainers/scripts/bootstrap-files/README.md index af8181c2c3aca..9abc4402a414d 100644 --- a/maintainers/scripts/bootstrap-files/README.md +++ b/maintainers/scripts/bootstrap-files/README.md @@ -1,6 +1,6 @@ # Bootstrap files -Currently `nixpkgs` builds most of it's packages using bootstrap seed binaries (without the reliance on external inputs): +Currently `nixpkgs` builds most of its packages using bootstrap seed binaries (without the reliance on external inputs): - `bootstrap-tools`: an archive with the compiler toolchain and other helper tools enough to build the rest of the `nixpkgs`. - initial binaries needed to unpack `bootstrap-tools.*`. diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index ebcb576d5521e..263d0aa50e6ea 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -1,6 +1,7 @@ #! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=. #! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])" -#! nix-shell -p hydra +#! nix-shell -p nix-eval-jobs #! nix-shell -i runhaskell {- @@ -33,19 +34,23 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca import Control.Monad (forM_, forM, (<=<)) import Control.Monad.Trans (MonadIO (liftIO)) import Data.Aeson ( - FromJSON, + FromJSON (..), + withObject, + (.:), FromJSONKey, ToJSON, decodeFileStrict', - eitherDecodeStrict', encodeFile, ) -import Data.Foldable (Foldable (toList), foldl') +import Data.Aeson.Decoding (eitherDecodeStrictText) +import Data.Foldable (Foldable (toList)) +import Data.Either (rights) +import Data.Functor ((<&>)) import Data.List.NonEmpty (NonEmpty, nonEmpty) import qualified Data.List.NonEmpty as NonEmpty import Data.Map.Strict (Map) import qualified Data.Map.Strict as Map -import Data.Maybe (fromMaybe, mapMaybe, isNothing) +import Data.Maybe (fromMaybe, mapMaybe, isNothing, catMaybes) import Data.Monoid (Sum (Sum, getSum)) import Data.Sequence (Seq) import qualified Data.Sequence as Seq @@ -53,7 +58,6 @@ import Data.Set (Set) import qualified Data.Set as Set import Data.Text (Text) import qualified Data.Text as Text -import Data.Text.Encoding (encodeUtf8) import qualified Data.Text.IO as Text import Data.Time (defaultTimeLocale, formatTime, getCurrentTime) import Data.Time.Clock (UTCTime) @@ -206,7 +210,7 @@ hydraQuery responseType option query = do let customHeaderOpt = header "User-Agent" - "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" + "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell)" customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes opts = customHeaderOpt <> customTimeoutOpt <> option url = foldl' (/:) (https "hydra.nixos.org") query @@ -218,11 +222,22 @@ hydraJSONQuery = hydraQuery jsonResponse hydraPlainQuery :: [Text] -> Req ByteString hydraPlainQuery = hydraQuery bsResponse mempty -hydraEvalCommand :: FilePath -hydraEvalCommand = "hydra-eval-jobs" +nixEvalJobsCommand :: FilePath +nixEvalJobsCommand = "nix-eval-jobs" -hydraEvalParams :: [String] -hydraEvalParams = ["-I", ".", "pkgs/top-level/release-haskell.nix"] +nixEvalJobsParams :: [String] +nixEvalJobsParams = + [ + -- options necessary to make nix-eval-jobs behave like hydra-eval-jobs used to + -- https://github.com/NixOS/hydra/commit/d84ff32ce600204c6473889a3ff16cd6053533c9 + "--meta", + "--force-recurse", + "--no-instantiate", + "--workers", "3", + + "-I", ".", + "pkgs/top-level/release-haskell.nix" + ] nixExprCommand :: FilePath nixExprCommand = "nix-instantiate" @@ -230,47 +245,27 @@ nixExprCommand = "nix-instantiate" nixExprParams :: [String] nixExprParams = ["--eval", "--strict", "--json"] --- | This newtype is used to parse a Hydra job output from @hydra-eval-jobs@. --- The only field we are interested in is @maintainers@, which is why this --- is just a newtype. +-- | Holds a list of the GitHub handles of the maintainers of a given 'JobName'. -- --- Note that there are occasionally jobs that don't have a maintainers --- field, which is why this has to be @Maybe Text@. -newtype Maintainers = Maintainers { maintainers :: Maybe Text } +-- @ +-- JobMaintainers (JobName "haskellPackages.cabal-install.x86_64-linux") ["sternenseemann"] +-- @ +data JobMaintainers = JobMaintainers JobName [Text] deriving stock (Generic, Show) - deriving anyclass (FromJSON, ToJSON) - --- | This is a 'Map' from Hydra job name to maintainer email addresses. --- --- It has values similar to the following: --- --- @@ --- fromList --- [ ("arion.aarch64-linux", Maintainers (Just "robert@example.com")) --- , ("bench.x86_64-linux", Maintainers (Just "")) --- , ("conduit.x86_64-linux", Maintainers (Just "snoy@man.com, web@ber.com")) --- , ("lens.x86_64-darwin", Maintainers (Just "ek@category.com")) --- ] --- @@ --- --- Note that Hydra jobs without maintainers will have an empty string for the --- maintainer list. -type HydraJobs = Map JobName Maintainers --- | Map of email addresses to GitHub handles. --- This is built from the file @../../maintainer-list.nix@. --- --- It has values similar to the following: --- --- @@ --- fromList --- [ ("robert@example.com", "rob22") --- , ("ek@category.com", "edkm") --- ] --- @@ -type EmailToGitHubHandles = Map Text Text - --- | Map of Hydra jobs to maintainer GitHub handles. +-- | Parse the entries produced by @nix-eval-jobs@, discarding all information +-- except the name of the job (@attr@) and the @github@ attributes of the +-- maintainer objects in @meta.maintainers@. +instance FromJSON JobMaintainers where + parseJSON = withObject "HydraJob" $ \h -> do + jobName <- h .: "attr" + maintainers <- (h .: "meta") + >>= (withObject "Meta" $ \meta -> + meta .: "maintainers" + >>= mapM (withObject "Maintainer" $ \mt -> mt .: "github")) + pure $ JobMaintainers jobName maintainers + +-- | Map of maintained Hydra jobs to maintainer GitHub handles. -- -- It has values similar to the following: -- @@ -331,22 +326,16 @@ calculateReverseDependencies depMap = go pkg = IntSet.unions (oneStep:((resultList IntMap.!) <$> IntSet.toList oneStep)) where oneStep = IntMap.findWithDefault mempty pkg oneStepMap --- | Generate a mapping of Hydra job names to maintainer GitHub handles. Calls --- hydra-eval-jobs and the nix script ./maintainer-handles.nix. +-- | Generate a mapping of Hydra job names to maintainer GitHub handles. getMaintainerMap :: IO MaintainerMap -getMaintainerMap = do - hydraJobs :: HydraJobs <- - readJSONProcess hydraEvalCommand hydraEvalParams "Failed to decode hydra-eval-jobs output: " - handlesMap :: EmailToGitHubHandles <- - readJSONProcess nixExprCommand ("maintainers/scripts/haskell/maintainer-handles.nix":nixExprParams) "Failed to decode nix output for lookup of github handles: " - pure $ Map.mapMaybe (splitMaintainersToGitHubHandles handlesMap) hydraJobs - where - -- Split a comma-spearated string of Maintainers into a NonEmpty list of - -- GitHub handles. - splitMaintainersToGitHubHandles - :: EmailToGitHubHandles -> Maintainers -> Maybe (NonEmpty Text) - splitMaintainersToGitHubHandles handlesMap (Maintainers maint) = - nonEmpty . mapMaybe (`Map.lookup` handlesMap) . Text.splitOn ", " $ fromMaybe "" maint +getMaintainerMap = + readJSONLinesProcess nixEvalJobsCommand nixEvalJobsParams + -- we ignore unparseable lines since fromJSON will fail on { "attr": …, "error": … } + -- entries since they don't have a @meta@ attribute. + <&> rights + <&> map (\(JobMaintainers name maintainers) -> (,) name <$> nonEmpty maintainers) + <&> catMaybes + <&> Map.fromList -- | Get the a map of all dependencies of every package by calling the nix -- script ./dependencies.nix. @@ -369,11 +358,23 @@ readJSONProcess -> IO a readJSONProcess exe args err = do output <- readProcess exe args "" - let eitherDecodedOutput = eitherDecodeStrict' . encodeUtf8 . Text.pack $ output + let eitherDecodedOutput = eitherDecodeStrictText . Text.pack $ output case eitherDecodedOutput of Left decodeErr -> error $ err <> decodeErr <> "\nRaw: '" <> take 1000 output <> "'" Right decodedOutput -> pure decodedOutput +-- | Run a process that produces many JSON values, one per line. +-- Error and success is reported per line via a list of 'Either's. +readJSONLinesProcess + :: FromJSON a + => FilePath -- ^ Filename of executable. + -> [String] -- ^ Arguments + -> IO [Either String a] +readJSONLinesProcess exe args = do + output <- readProcess exe args "" + -- TODO: slow, doesn't stream at all + pure . map (eitherDecodeStrictText . Text.pack) . lines $ output + -- BuildStates are sorted by subjective importance/concerningness data BuildState = Failed diff --git a/maintainers/scripts/haskell/maintainer-handles.nix b/maintainers/scripts/haskell/maintainer-handles.nix deleted file mode 100644 index ced93a1233be1..0000000000000 --- a/maintainers/scripts/haskell/maintainer-handles.nix +++ /dev/null @@ -1,23 +0,0 @@ -# Nix script to lookup maintainer github handles from their email address. Used by ./hydra-report.hs. -# -# This script produces an attr set mapping of email addresses to GitHub handles: -# -# ```nix -# > import ./maintainer-handles.nix -# { "cdep.illabout@gmail.com" = "cdepillabout"; "john@smith.com" = "johnsmith"; ... } -# ``` -# -# This mapping contains all maintainers in ../../mainatainer-list.nix, but it -# ignores maintainers who don't have a GitHub account or an email address. -let - pkgs = import ../../.. { }; - maintainers = import ../../maintainer-list.nix; - inherit (pkgs) lib; - mkMailGithubPair = - _: maintainer: - if (maintainer ? email) && (maintainer ? github) then - { "${maintainer.email}" = maintainer.github; } - else - { }; -in -lib.zipAttrsWith (_: builtins.head) (lib.mapAttrsToList mkMailGithubPair maintainers) diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 585847094f94f..d2c5c25c65f80 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git -I nixpkgs=. +#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable.bin git -I nixpkgs=. set -euo pipefail diff --git a/maintainers/scripts/haskell/update-cabal2nix-unstable.sh b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh index b1061d17e2304..a9f3dc588383a 100755 --- a/maintainers/scripts/haskell/update-cabal2nix-unstable.sh +++ b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=. +#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable.bin nix-prefetch-scripts -I nixpkgs=. # Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository. # See regenerate-hackage-packages.sh for details on the purpose of this script. diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 5a91d3dc9cbc7..0889f7e1d9ed1 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -98,6 +98,7 @@ sed -r \ -e '/ ShellCheck /d' \ -e '/ Agda /d' \ -e '/ stack /d' \ + -e '/ git-annex /d' \ < "${tmpfile_new}" >> $stackage_config # Explanations: # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing. diff --git a/nixos/doc/manual/development/freeform-modules.section.md b/nixos/doc/manual/development/freeform-modules.section.md index 17c37dae7e51d..2df444b3e2bdf 100644 --- a/nixos/doc/manual/development/freeform-modules.section.md +++ b/nixos/doc/manual/development/freeform-modules.section.md @@ -50,7 +50,7 @@ And the following shows what such a module then allows # Not a declared option, but the freeform type allows this settings.logLevel = "debug"; - # Not allowed because the the freeform type only allows strings + # Not allowed because the freeform type only allows strings # settings.enable = true; # Allowed because there is a port option declared diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index 4ae8bf4948487..402c285d44563 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -254,7 +254,7 @@ update /etc/fstab. # parted /dev/sda -- mklabel msdos ``` -2. Add the *root* partition. This will fill the the disk except for the +2. Add the *root* partition. This will fill the disk except for the end part, where the swap will live. ```ShellSession diff --git a/nixos/doc/manual/manual.md b/nixos/doc/manual/manual.md index 8cb766eeccf64..4fc39ffc785b6 100644 --- a/nixos/doc/manual/manual.md +++ b/nixos/doc/manual/manual.md @@ -7,11 +7,11 @@ the manual structure extends the nixpkgs commonmark further with include blocks to allow better organization of input text. there are six types of include blocks: preface, parts, chapters, sections, appendix, and options. - each type except `options`` corresponds to the docbook elements of (roughly) + each type except `options` corresponds to the docbook elements of (roughly) the same name, and can itself can further include blocks to denote its substructure. - non-`options`` include blocks are fenced code blocks that list a number of + non-`options` include blocks are fenced code blocks that list a number of files to include, in the form ```{=include=} diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index e2303ad270a76..3ddfa1b1c3859 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -1,4 +1,28 @@ { + "module-security-tpm2": [ + "index.html#module-security-tpm2" + ], + "module-security-tpm2-introduction": [ + "index.html#module-security-tpm2-introduction" + ], + "module-security-tpm2-introduction-hli": [ + "index.html#module-security-tpm2-introduction-hli" + ], + "module-security-tpm2-introduction-resourcemanagers": [ + "index.html#module-security-tpm2-introduction-resourcemanagers" + ], + "module-security-tpm2-introduction-softwarearchitecture": [ + "index.html#module-security-tpm2-introduction-softwarearchitecture" + ], + "module-security-tpm2-introduction-softwarearchitecture-tcti": [ + "index.html#module-security-tpm2-introduction-softwarearchitecture-tcti" + ], + "module-security-tpm2-nixosmodule": [ + "index.html#module-security-tpm2-nixosmodule" + ], + "module-security-tpm2-nixosmodule-fapiconfiguration": [ + "index.html#module-security-tpm2-nixosmodule-fapiconfiguration" + ], "module-boot-plymouth-tpm2-totp": [ "index.html#module-boot-plymouth-tpm2-totp" ], diff --git a/nixos/doc/manual/release-notes/rl-1603.section.md b/nixos/doc/manual/release-notes/rl-1603.section.md index ffc08fc962417..cb0da1f8aec98 100644 --- a/nixos/doc/manual/release-notes/rl-1603.section.md +++ b/nixos/doc/manual/release-notes/rl-1603.section.md @@ -217,7 +217,7 @@ When upgrading from a previous release, please be aware of the following incompa - `services.udev.extraRules` option now writes rules to `99-local.rules` instead of `10-local.rules`. This makes all the user rules apply after others, so their results wouldn't be overridden by anything else. -- Large parts of the `services.gitlab` module has been been rewritten. There are new configuration options available. The `stateDir` option was renamned to `statePath` and the `satellitesDir` option was removed. Please review the currently available options. +- Large parts of the `services.gitlab` module have been rewritten. There are new configuration options available. The `stateDir` option was renamed to `statePath` and the `satellitesDir` option was removed. Please review the currently available options. - The option `services.nsd.zones..data` no longer interpret the dollar sign (\$) as a shell variable, as such it should not be escaped anymore. Thus the following zone data: diff --git a/nixos/doc/manual/release-notes/rl-1709.section.md b/nixos/doc/manual/release-notes/rl-1709.section.md index 5895af018982c..bbbb675a8e5af 100644 --- a/nixos/doc/manual/release-notes/rl-1709.section.md +++ b/nixos/doc/manual/release-notes/rl-1709.section.md @@ -33,7 +33,7 @@ In addition to numerous new and upgraded packages, this release has the followin Options to configure `resolver` options and `upstream` blocks have been introduced. See their information for further details. - The `port` option has been replaced by a more generic `listen` option which makes it possible to specify multiple addresses, ports and SSL configs dependant on the new SSL handling mentioned above. + The `port` option has been replaced by a more generic `listen` option which makes it possible to specify multiple addresses, ports and SSL configs dependent on the new SSL handling mentioned above. ## New Services {#sec-release-17.09-new-services} diff --git a/nixos/doc/manual/release-notes/rl-2003.section.md b/nixos/doc/manual/release-notes/rl-2003.section.md index f9dee1b50f101..65d03c39f21ea 100644 --- a/nixos/doc/manual/release-notes/rl-2003.section.md +++ b/nixos/doc/manual/release-notes/rl-2003.section.md @@ -59,7 +59,7 @@ In addition to numerous new and upgraded packages, this release has the followin { services.xserver.displayManager.defaultSession = "xfce+icewm"; } ``` -- The testing driver implementation in NixOS is now in Python `make-test-python.nix`. This was done by Jacek Galowicz ([\@tfc](https://github.com/tfc)), and with the collaboration of Julian Stecklina ([\@blitz](https://github.com/blitz)) and Jana Traue ([\@jtraue](https://github.com/jtraue)). All documentation has been updated to use this testing driver, and a vast majority of the 286 tests in NixOS were ported to python driver. In 20.09 the Perl driver implementation, `make-test.nix`, is slated for removal. This should give users of the NixOS integration framework a transitory period to rewrite their tests to use the Python implementation. Users of the Perl driver will see this warning everytime they use it: +- The testing driver implementation in NixOS is now in Python `make-test-python.nix`. This was done by Jacek Galowicz ([\@tfc](https://github.com/tfc)), and with the collaboration of Julian Stecklina ([\@blitz](https://github.com/blitz)) and Jana Traue ([\@jtraue](https://github.com/jtraue)). All documentation has been updated to use this testing driver, and a vast majority of the 286 tests in NixOS were ported to python driver. In 20.09 the Perl driver implementation, `make-test.nix`, is slated for removal. This should give users of the NixOS integration framework a transitory period to rewrite their tests to use the Python implementation. Users of the Perl driver will see this warning every time they use it: ```ShellSession $ warning: Perl VM tests are deprecated and will be removed for 20.09. diff --git a/nixos/doc/manual/release-notes/rl-2009.section.md b/nixos/doc/manual/release-notes/rl-2009.section.md index cfcaaed390c0e..1515c313258b6 100644 --- a/nixos/doc/manual/release-notes/rl-2009.section.md +++ b/nixos/doc/manual/release-notes/rl-2009.section.md @@ -580,7 +580,7 @@ When upgrading from a previous release, please be aware of the following incompa Please note that Rust packages utilizing a custom build/install procedure (e.g. by using a `Makefile`) or test suites that rely on the structure of the `target/` directory may break due to those assumptions. For further information, please read the Rust section in the Nixpkgs manual. -- The cc- and binutils-wrapper's "infix salt" and `_BUILD_` and `_TARGET_` user infixes have been replaced with with a "suffix salt" and suffixes and `_FOR_BUILD` and `_FOR_TARGET`. This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier. +- The cc- and binutils-wrapper's "infix salt" and `_BUILD_` and `_TARGET_` user infixes have been replaced with a "suffix salt" and suffixes and `_FOR_BUILD` and `_FOR_TARGET`. This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier. - Additional Git documentation (HTML and text files) is now available via the `git-doc` package. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 52f05ce454031..0cecbad5a4af4 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -754,7 +754,7 @@ In addition to numerous new and upgraded packages, this release has the followin Similarly [virtualisation.vmVariantWithBootloader](#opt-virtualisation.vmVariantWithBootLoader) was added. - The configuration portion of the `nix-daemon` module has been reworked and exposed as [nix.settings](options.html#opt-nix-settings): - * Legacy options have been mapped to the corresponding options under under [nix.settings](options.html#opt-nix.settings) and will be deprecated when NixOS 21.11 reaches end of life. + * Legacy options have been mapped to the corresponding options under [nix.settings](options.html#opt-nix.settings) and will be deprecated when NixOS 21.11 reaches end of life. * [nix.buildMachines.publicHostKey](options.html#opt-nix.buildMachines.publicHostKey) has been added. - [`kops`](https://kops.sigs.k8s.io) defaults to 1.23.2, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes >= 1.22. This will increase security by default, but may break some types of workloads. The default behaviour for `spec.kubeDNS.nodeLocalDNS.forwardToKubeDNS` has changed from `true` to `false`. Cilium now has `disable-cnp-status-updates: true` by default. Set this to false if you rely on the CiliumNetworkPolicy status fields. Support for Kubernetes 1.17, the Lyft CNI, Weave CNI on Kubernetes >= 1.23, CentOS 7 and 8, Debian 9, RHEL 7, and Ubuntu 16.05 (Xenial) has been removed. See the [1.22 release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) and [1.23 release notes](https://kops.sigs.k8s.io/releases/1.23-notes/) for more details, including other significant changes. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index db63fd1ce2bff..4e7004dd0155d 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -106,7 +106,7 @@ In addition to numerous new and upgraded packages, this release includes the fol been removed. Please convert any uses to [services.logrotate.settings](#opt-services.logrotate.settings) instead. -- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. +- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. - The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice. diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 006170c2ee530..b88399ba8da43 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -248,7 +248,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2 attribute values of `phpOptions` are still defaults, these can be overridden as shown here. - To override all of the options (including including `upload_max_filesize`, + To override all of the options (including `upload_max_filesize`, `post_max_size` and `memory_limit` which all point to [`services.nextcloud.maxUploadSize`](#opt-services.nextcloud.maxUploadSize) by default) can be done like this: diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index cf835d34fba96..bd4e2a4dfc6f1 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -140,6 +140,8 @@ - [Sshwifty](https://github.com/nirui/sshwifty), a Telnet and SSH client for your browser. Available as [services.sshwifty](#opt-services.sshwifty.enable). +- Added `nixos-init`, a Rust-based bashless initialization system for systemd initrd. This allows to build NixOS systems without any interpreter. Enable via `system.nixos-init.enable = true;`. + - [nvme-rs](https://github.com/liberodark/nvme-rs), NVMe monitoring [services.nvme-rs](#opt-services.nvme-rs.enable). - [ringboard](https://github.com/SUPERCILEX/clipboard-history), a fast, efficient, and composable clipboard manager for Linux. Available for x11 as [services.ringboard](#opt-services.ringboard.x11.enable) and for wayland as [services.ringboard](#opt-services.ringboard.wayland.enable). diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 63b965f21d696..2d5dbdfcbf36e 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -349,6 +349,15 @@ rec { ) ); + settingsToSections = + settings: + concatStringsSep "\n" ( + mapAttrsToList (section_name: section_attrs: '' + [${section_name}] + ${attrsToSection section_attrs} + '') settings + ); + generateUnits = { allowCollisions ? true, @@ -724,10 +733,7 @@ rec { commonUnitText = def: lines: - '' - [Unit] - ${attrsToSection def.unitConfig} - '' + (settingsToSections { Unit = def.unitConfig; }) + lines + optionalString (def.wantedBy != [ ]) '' @@ -745,10 +751,7 @@ rec { enable overrideStrategy ; - text = '' - [Unit] - ${attrsToSection def.unitConfig} - ''; + text = (settingsToSections { Unit = def.unitConfig; }); }; serviceToUnit = def: { @@ -832,10 +835,9 @@ rec { enable overrideStrategy ; - text = commonUnitText def '' - [Timer] - ${attrsToSection def.timerConfig} - ''; + text = commonUnitText def (settingsToSections { + Timer = def.timerConfig; + }); }; pathToUnit = def: { @@ -848,10 +850,9 @@ rec { enable overrideStrategy ; - text = commonUnitText def '' - [Path] - ${attrsToSection def.pathConfig} - ''; + text = commonUnitText def (settingsToSections { + Path = def.pathConfig; + }); }; mountToUnit = def: { @@ -864,10 +865,9 @@ rec { enable overrideStrategy ; - text = commonUnitText def '' - [Mount] - ${attrsToSection def.mountConfig} - ''; + text = commonUnitText def (settingsToSections { + Mount = def.mountConfig; + }); }; automountToUnit = def: { @@ -880,10 +880,9 @@ rec { enable overrideStrategy ; - text = commonUnitText def '' - [Automount] - ${attrsToSection def.automountConfig} - ''; + text = commonUnitText def (settingsToSections { + Automount = def.automountConfig; + }); }; sliceToUnit = def: { @@ -896,10 +895,9 @@ rec { enable overrideStrategy ; - text = commonUnitText def '' - [Slice] - ${attrsToSection def.sliceConfig} - ''; + text = commonUnitText def (settingsToSections { + Slice = def.sliceConfig; + }); }; # Create a directory that contains systemd definition files from an attrset diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py index 6f09854798033..5f17006f90dab 100644 --- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py @@ -822,9 +822,8 @@ def shell_ready(timeout_secs: int) -> bool: while True: chunk = self.shell.recv(1024) - # No need to print empty strings, it means we are waiting. if len(chunk) == 0: - continue + raise RuntimeError("Shell disconnected") self.log(f"Guest shell says: {chunk!r}") # NOTE: for this to work, nothing must be printed after this line! if b"Spawning backdoor root shell..." in chunk: diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix index bc02fa5010d3f..8959a99f7b7b0 100644 --- a/nixos/modules/config/malloc.nix +++ b/nixos/modules/config/malloc.nix @@ -52,7 +52,7 @@ let or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}"); in { - libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so"; + libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo_standalone-${systemPlatform}.so"; description = '' A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator, which aims at providing additional mitigations against heap based diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index d4caef1a09abc..f6f99b6218d28 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/0bvxg6fr61zrlhi93azhp8yfhb5rcrs9-nix-2.28.5"; - i686-linux = "/nix/store/m5na49mxl4xpcs3xh086s5v08jqjhbmb-nix-2.28.5"; - aarch64-linux = "/nix/store/95rhdhjfwbi7ilwy5j0knj1852p7x6c6-nix-2.28.5"; - riscv64-linux = "/nix/store/cqiiv36c773023p6lp9h4ff57fjlzisk-nix-riscv64-unknown-linux-gnu-2.28.5"; - x86_64-darwin = "/nix/store/xiw5636h616yi3balx96pmdk6b052rhk-nix-2.28.5"; - aarch64-darwin = "/nix/store/sax8chv80d9fy4s0y3ahsr9y4kc2f0ib-nix-2.28.5"; + x86_64-linux = "/nix/store/x30lnlgk1s16rynrfslbf8phr6h6rqf2-nix-2.31.2"; + i686-linux = "/nix/store/ix94q6rrdg6cr4893cjpzdbmibhlm0dv-nix-2.31.2"; + aarch64-linux = "/nix/store/xnybj9lk0kwvmr2va253avanq7m3cpyg-nix-2.31.2"; + riscv64-linux = "/nix/store/33as1vqp8mq36nr5bb5gr7ziw1nf4q1v-nix-riscv64-unknown-linux-gnu-2.31.2"; + x86_64-darwin = "/nix/store/b9dvary8rcljj7ajv1x64hwwch4cvyvp-nix-2.31.2"; + aarch64-darwin = "/nix/store/lvv1j8qbrvlnl3aagcjrhf42d458zgb5-nix-2.31.2"; } diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 06e5644f76e97..e12eb19b13d81 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -39,7 +39,7 @@ in nix.settings.allowed-users = mkDefault [ "@users" ]; environment.memoryAllocator.provider = mkDefault "scudo"; - environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1"; + environment.variables.SCUDO_OPTIONS = mkDefault "zero_contents=true"; security.lockKernelModules = mkDefault true; diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix index f50c465fde5b8..849ff57c662c5 100644 --- a/nixos/modules/security/audit.nix +++ b/nixos/modules/security/audit.nix @@ -95,7 +95,10 @@ in environment.systemPackages = [ pkgs.audit ]; - systemd.services.audit-rules = { + # upstream contains a audit-rules.service, which uses augenrules. + # That script does not handle cleanup correctly and insists on loading from /etc/audit. + # So, instead we have our own service for loading rules. + systemd.services.audit-rules-nixos = { description = "Load Audit Rules"; wantedBy = [ "sysinit.target" ]; before = [ diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index 036ce9c01cae2..bbe22fa6a5bcf 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -229,7 +229,7 @@ in path = lib.getExe' pkgs.audit "audisp-af_unix"; args = [ "0640" - "/var/run/audispd_events" + "/run/audit/audispd_events" "string" ]; format = "binary"; @@ -256,41 +256,23 @@ in }; }; - systemd.services.auditd = { - description = "Security Audit Logging Service"; - documentation = [ "man:auditd(8)" ]; - wantedBy = [ "sysinit.target" ]; - after = [ - "local-fs.target" - "systemd-tmpfiles-setup.service" - ]; - before = [ - "sysinit.target" - "shutdown.target" - ]; - conflicts = [ "shutdown.target" ]; + systemd.packages = [ pkgs.audit.out ]; - unitConfig = { - DefaultDependencies = false; - RefuseManualStop = true; - ConditionVirtualization = "!container"; - ConditionKernelCommandLine = [ - "!audit=0" - "!audit=off" - ]; - }; + systemd.services.auditd = { + wantedBy = [ "multi-user.target" ]; serviceConfig = { + # https://github.com/linux-audit/audit-userspace/pull/501 + # set up audit directories using systemd service instead of tmpfiles LogsDirectory = "audit"; - ExecStart = "${pkgs.audit}/bin/auditd -l -n -s nochange"; - Restart = "on-failure"; - # Do not restart for intentional exits. See EXIT CODES section in auditd(8). - RestartPreventExitStatus = "2 4 6"; - - # Upstream hardening settings - MemoryDenyWriteExecute = true; - LockPersonality = true; - RestrictRealtime = true; + LogsDirectoryMode = "0700"; + RuntimeDirectory = "audit"; + RuntimeDirectoryMode = "0755"; + ExecStart = [ + # the upstream unit does not allow symlinks, so clear and rewrite the ExecStart + "" + "${lib.getExe' pkgs.audit "auditd"} -l -s nochange" + ]; }; }; }; diff --git a/nixos/modules/security/tpm2.md b/nixos/modules/security/tpm2.md new file mode 100644 index 0000000000000..4fff715ab039f --- /dev/null +++ b/nixos/modules/security/tpm2.md @@ -0,0 +1,116 @@ +# TPM2 {#module-security-tpm2} + +## Introduction {#module-security-tpm2-introduction} + +The `tpm2` module allows configuration of a number of programs and services associated with the use of a Trusted Platform Module (TPM). +A TPM is a hardware or firmware device that can be useful for security purposes. +One thing you can do with a TPM is to instruct it to create cryptographic keys which reside inside the TPM hardware, and which cannot be exported, not even to the computer hosting the TPM. +To make those keys useful, the TPM also exposes operations that you can perform using the keys. +So for instance, you can instruct the TPM to encrypt a piece of data using a cryptographic key protected by the TPM, or cryptographically sign a piece of data using a cryptographic key protected by the TPM. + +A key stored directly on the TPM is called a resident key. +Because the TPM has very limited storage, it's common to work with another kind of key, called a wrapped key. +When you instruct the TPM to create a wrapped key, it creates a new key, encrypts the secret material using a key stored directly on the TPM, and returns the encrypted secret material along with some metadata to the user, in a file called the key context. +The TPM also supports operations where you provide it with the key context along with whatever you want to encrypt or sign, and it will unwrap the key and do the operation. + +Another important concept is attestation. +The idea is that the user of a TPM may want to prove to a third party that a particular key is protected by the TPM hardware. +This is typically done by the manufacturer or distributor of the TPM hardware prior to distribution to the end user, and involves creating a resident key on the TPM, along with a certificate for that key signed by the manufacturer's or distributor's key. +The user can then provide the certificate to the third party along with the public portion of the resident key to prove that the key is protected by the TPM. + +Most physical TPMs come with one resident key that also has a certificate. +This key is known as the Endorsement Key, or EK, and the certificate is known as the EK Certificate. +For applications where you want to be able to prove properties of a key to third parties, you will want a key that is wrapped by the EK. +Such keys are described as residing in the Endorsement Hierarchy. +If you do not require attestation, you will generally wrap your keys with the storage root key (SRK). +Such keys are described as residing in the Storage Hierarchy, or the Owners Hierarchy. + +### Software Architecture {#module-security-tpm2-introduction-softwarearchitecture} + +#### TCTI {#module-security-tpm2-introduction-softwarearchitecture-tcti} + +TPM hardware uses a binary protocol called the TPM Command Transmission Interface, or TCTI, to communicate with the host computer. +The TPM kernel driver exposes a character device, typically `/dev/tpm0`, and one way of interacting with the TPM is to read and write the TCTI protocol to that device. +Of course doing that directly in your own code would be quite laborious, and there are a number of software libraries and programs that can help you do it. +The lowest level of these is C library called ESAPI, located inside the `tpm2-tss` package. + +#### Resource Managers {#module-security-tpm2-introduction-resourcemanagers} + +Another thing you need to know is that the TPM is a stateful device: operations can affect its state, and it's common to perform a sequence of operations where early operations modify the state, and later operations depend on that state to do other operations. +For instance, you may load a wrapped key to a particular storage location, then do an encryption operation using that loaded key. +This makes multi-user access challenging, as two users may modify the state in incompatible ways. +The solution to this is to use a resource manager. +The resource manager can handle multiple different sessions, keep track of the accumulated state of each session, and load and unload state as necessary to interleave multiple different sessions. +There are two resource managers available in the software stack surrounding the TPM: a kernel-space resource manager, and a user-space resource manager. + +The kernel-space resource manager is exposed via the tpmrm subsystem. +You can see more info about that subsystem in the sysfs at `/sys/class/tpmrm`. +In a typical system you will also see a `/dev/tpmrm0` device, but it is possible to give it a different name. + +The user-space resource manager is contained in the `tpm2-abrmd` package. +It is also frequently referred to as `tabrmd`. + +Both resource managers are designed so that they use the same TCTI protocol as a raw tpm device. +For the kernel RM, you access it via a character device (typically `/dev/tpmrm0`). +For the userspace RM, you access it over DBUS. +It is common to refer to a component that is on the "receiving" or "server" side of the TCTI protocol as "a TCTI". +So the raw tpm character device, the kernel RM, and `tabrmd` are all "TCTIs". + +The ESAPI library speaks the client side of the TCTI protocol, and can be connected to any server TCTI. +All of the other libraries or programs that work with TPM all use ESAPI under the hood, and so a common characteristic among all these libraries is that you will find you need to configure them in some way as to which TCTI they should be talking to. + +#### Higher Level Interfaces {#module-security-tpm2-introduction-hli} + +As alluded to previously, there are a number of ways of speaking the client side TCTI that all amount to wrappers around ESAPI. They include: +* FAPI - a C library with an easier API for managing cryptographic algorithms and keys, contained in the `tpm2-tss` package. +* pytss - a python library that wraps ESAPI and FAPI. Contained in the `tpm2-pytss` package. +* tpm2 tools - a command line interface exposed through the programs `tpm2`, which roughly corresponds to the ESAPI, and `tss2` which roughly corresponds to FAPI. Contained in the `tpm2-tools` package. +* pkcs11 - libraries that wrap TPM functionality into a pkcs11 interface. There are variants for the ESAPI, and the FAPI. See the `tpm2-pkcs11`, `tpm2-pkcs11-esapi` and `tpm2-pkcs11-fapi` packages. +* TPM2 OpenSSL - an OpenSSL provider allowing openssl to use the TPM as its cryptographic engine. + + +## Using the tpm2 NixOS module {#module-security-tpm2-nixosmodule} + +A typical configuration is: +``` +security.tpm2 = { + enable = true; + abrmd.enable = true; + pkcs11.enable = true; + + tctiEnvironment.enable = true; + tctiEnvironment.interface = "tabrmd"; +} +``` +`enable = true;` is required for any tpm functionality other than the raw character device and kernel resource manager to be available. + +`abrmd.enable = true;` causes the tpm2-abrmd program (the user-space resource manager) to run as a systemd service. +Generally you want this because the user-space resource manager gets more frequent updates than the kernel-space RM, and there aren't any kernel RM features that are unavailable in the user-space RM. + +`pkcs11.enable = true;` makes the PKCS11 tool and libraries available in the system path. +Generally you want this because it's unlikely to cause problems and it's required by one of the more common TPM use cases, which is protecting an ssh key using the TPM. + +`tctiEnvironment.enable = true;` and `tctiEnvironment.interface = "tabrmd";` causes the TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI environment variables to be set properly to use the user-space resource manager. +In other words, it configures all users to use the user-space resource manager for tpm2 tools and tpm2 pkcs11 by default. + +### FAPI Configuration {#module-security-tpm2-nixosmodule-fapiconfiguration} + +A reasonable FAPI config file is shipped by default and available in `/etc/tpm2-tss/fapi-config.json`. +The `tss2` command line utility in `tpm2-tools` will use this file by default. +If you wish to customize it, you can do so like this: + +``` +security.tpm2.fapi = { + profileName = "P_RSA2048SHA256"; +}; +``` + +This example changes the cryptographic profile from the default P_ECCP256SHA256 to P_RSA2048SHA256. +The profiles specify a number of algorithmic details, but the short version is that P_ECCP256SHA256 uses elliptic curve cryptography over the NIST P256 curve and SHA256 for hashes, while P_RSA2048SHA256 uses RSA 2048 bit keys and SHA256 for hashes. + +Probably the most likely option you may want to use in the FAPI config would be `ekCertLess`. +If set to `null` (the default) or `false`, then FAPI calls will fail if the TPM does not have an EK certificate. +Most TPMs that come with physical computers will have an EK cert, so the default setting would not be a problem. +However, virtual TPMs may not have an EK certificate. +For instance, the Nitro TPM provided on some Amazon Web Services virtual machines does not come with an EK Cert. +In such cases, you may wish to set `ekCertLess = true;` so that FAPI is usable without an EK cert. diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix index dba46dbd1cf48..1fefc8f38adce 100644 --- a/nixos/modules/security/tpm2.nix +++ b/nixos/modules/security/tpm2.nix @@ -12,14 +12,39 @@ let # the tssGroup is only allowed to access the kernel resource manager # Therefore, if either of the two are null, the respective part isn't generated udevRules = tssUser: tssGroup: '' - ${lib.optionalString (tssUser != null) ''KERNEL=="tpm[0-9]*", MODE="0660", OWNER="${tssUser}"''} + ${lib.optionalString ( + tssUser != null + ) ''KERNEL=="tpm[0-9]*", TAG+="systemd", MODE="0660", OWNER="${tssUser}"''} ${ - lib.optionalString (tssUser != null || tssGroup != null) ''KERNEL=="tpmrm[0-9]*", MODE="0660"'' + lib.optionalString ( + tssUser != null || tssGroup != null + ) ''KERNEL=="tpmrm[0-9]*", TAG+="systemd", MODE="0660"'' + lib.optionalString (tssUser != null) '', OWNER="${tssUser}"'' + lib.optionalString (tssGroup != null) '', GROUP="${tssGroup}"'' } ''; + fapiConfig = ( + pkgs.writeText "fapi-config.json" ( + builtins.toJSON ( + { + profile_name = cfg.fapi.profileName; + profile_dir = cfg.fapi.profileDir; + user_dir = cfg.fapi.userDir; + system_dir = cfg.fapi.systemDir; + tcti = cfg.fapi.tcti; + system_pcrs = cfg.fapi.systemPcrs; + log_dir = cfg.fapi.logDir; + firmware_log_file = cfg.fapi.firmwareLogFile; + ima_log_file = cfg.fapi.imaLogFile; + } + // lib.optionalAttrs (cfg.fapi.ekCertLess != null) { + ek_cert_less = if cfg.fapi.ekCertLess then "yes" else "no"; + } + // lib.optionalAttrs (cfg.fapi.ekFingerprint != null) { ek_fingerprint = cfg.fapi.ekFingerprint; } + ) + ) + ); in { options.security.tpm2 = { @@ -123,6 +148,120 @@ in default = "bus_name=com.intel.tss2.Tabrmd"; }; }; + + fapi = { + profileName = lib.mkOption { + description = '' + Name of the default cryptographic profile chosen from the profile_dir directory. + ''; + type = lib.types.str; + default = "P_ECCP256SHA256"; + }; + + profileDir = lib.mkOption { + description = '' + Directory that contains all cryptographic profiles known to FAPI. + ''; + type = lib.types.str; + default = "${pkgs.tpm2-tss}/etc/tpm2-tss/fapi-profiles/"; + defaultText = lib.literalExpression "\${pkgs.tpm2-tss}/etc/fapi-profiles/"; + }; + + userDir = lib.mkOption { + description = '' + The directory where user objects are stored. + ''; + type = lib.types.str; + default = "~/.local/share/tpm2-tss/user/keystore/"; + }; + + systemDir = lib.mkOption { + description = '' + The directory where system objects, policies, and imported objects are stored. + ''; + type = lib.types.str; + default = "/var/lib/tpm2-tss/keystore"; + }; + + tcti = lib.mkOption { + description = '' + The TCTI which will be used. + + An empty string indicates no TCTI is specified by the FAPI config. + + If not specified in the FAPI config it can be specified by environment + variable (TPM2TOOLS_TCTI, TPM2_PKCS11_TCTI, etc) or a TCTI will be chosen + by the FAPI library by searching for tabrmd, device, and mssim TCTIs in + that order. + ''; + type = lib.types.str; + default = ""; + example = "device:/dev/tpmrm0"; + }; + + systemPcrs = lib.mkOption { + description = '' + The PCR registers which are used by the system. + ''; + type = lib.types.listOf lib.types.int; + default = [ ]; + }; + + logDir = lib.mkOption { + description = '' + The directory for the event log. + ''; + type = lib.types.str; + default = "/var/log/tpm2-tss/eventlog/"; + }; + + ekCertLess = lib.mkOption { + description = '' + A switch to disable Endorsement Key (EK) certificate verification. + + A value of null indicates that the generated fapi config file does not + contain a ek_cert_less key. The effect of not having that key at all is + the same as setting its value to false. + + A value of false means that the tss2 cli will not work if there is no + EK Cert installed, or if the installed EK Cert can't be validated. + + A value of true means that the tss2 cli will work even if there's no EK + cert installed. + ''; + type = lib.types.nullOr lib.types.bool; + default = null; + }; + + ekFingerprint = lib.mkOption { + description = '' + The fingerprint of the endorsement key. + + A value of null means that you have chosen not to specify the expected + fingerprint of the EK. You can still have an endorsement key, it just + won't get checked to see if it's fingerprint matches a particular value + before being used. + ''; + type = lib.types.nullOr lib.types.str; + default = null; + }; + + firmwareLogFile = lib.mkOption { + description = '' + The binary bios measurements. + ''; + type = lib.types.str; + default = "/sys/kernel/security/tpm0/binary_bios_measurements"; + }; + + imaLogFile = lib.mkOption { + description = '' + The binary IMA measurements (Integrity Measurement Architecture). + ''; + type = lib.types.str; + default = "/sys/kernel/security/ima/binary_runtime_measurements"; + }; + }; }; config = lib.mkIf cfg.enable ( @@ -161,8 +300,68 @@ in ); } + { + # This script has the hash of the udev rules in it, + # and also writes that hash to + # /var/lib/tpm2-udev-trigger/hash.txt at the end. + # On each run, it checks to see if the hash embedded in the script + # matches the hash on disk. If they are different, that + # indicates that the udev rules created by this module + # have changed. In that case, a udev change is triggered + # for tpm and tpmrm devices so that the new rules are + # applied at the end of a nixos-rebuild switch or activate + systemd.services."tpm2-udev-trigger" = + let + udevHash = + if cfg.applyUdevRules then (builtins.hashString "md5" (udevRules cfg.tssUser cfg.tssGroup)) else ""; + in + { + description = "Trigger udev change for TPM devices"; + wants = [ "systemd-udevd.service" ]; + after = [ + "tpm2.target" + "systemd-udevd.service" + ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = pkgs.writeShellScript "tpm2-udev-trigger.sh" '' + stateDir=/var/lib/tpm2-udev-trigger + mkdir -p $stateDir + newHash=${udevHash} + hashFile=$stateDir/hash.txt + + # if file exists, read old hash + if [ -f $hashFile ]; then + oldHash="$(< $hashFile)" + else + oldHash="" + fi + + if [ "$oldHash" != "$newHash" ]; then + echo "TPM udev rules changed, triggering udev" + ${config.systemd.package}/bin/udevadm trigger --subsystem-match=tpm --action=change + ${config.systemd.package}/bin/udevadm trigger --subsystem-match=tpmrm --action=change + echo "$newHash" > $hashFile + else + echo "TPM udev rules unchanged, not triggering udev" + fi + ''; + }; + }; + } + (lib.mkIf cfg.abrmd.enable { systemd.services."tpm2-abrmd" = { + wants = [ + "tpm2-udev-trigger.service" + "dev-tpm0.device" + ]; + after = [ + "tpm2-udev-trigger.service" + "dev-tpm0.device" + ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "dbus"; @@ -177,8 +376,17 @@ in services.dbus.packages = lib.singleton cfg.abrmd.package; }) + + { + environment.etc."tpm2-tss/fapi-config.json".source = fapiConfig; + systemd.tmpfiles.rules = [ + "d ${cfg.fapi.logDir} 2750 tss ${cfg.tssGroup} -" + "d ${cfg.fapi.systemDir} 2750 root ${cfg.tssGroup} -" + ]; + } ] ); + meta.doc = ./tpm2.md; meta.maintainers = with lib.maintainers; [ lschuermann ]; } diff --git a/nixos/modules/services/matrix/maubot.md b/nixos/modules/services/matrix/maubot.md index d7c02a0ca19ca..b2633f793e230 100644 --- a/nixos/modules/services/matrix/maubot.md +++ b/nixos/modules/services/matrix/maubot.md @@ -100,7 +100,7 @@ framework for Matrix. url: https://matrix.example.org secret: your-very-secret-key ``` -10. Restart Maubot after editing `/var/lib/maubot/config.yaml`,and +10. Restart Maubot after editing `/var/lib/maubot/config.yaml`, and Maubot will be available at `https://matrix.example.org/_matrix/maubot`. If you want to use the `mbc` CLI, it's available using the `maubot` package (`nix-shell -p diff --git a/nixos/modules/services/matrix/mautrix-whatsapp.md b/nixos/modules/services/matrix/mautrix-whatsapp.md index a2ef973f4e609..7a589a3729964 100644 --- a/nixos/modules/services/matrix/mautrix-whatsapp.md +++ b/nixos/modules/services/matrix/mautrix-whatsapp.md @@ -13,7 +13,7 @@ ::: {.warning} Mautrix-Whatsapp allows for some options like `encryption.pickle_key`, -`provisioning.shared_secret`, allow the value `generate` to be set. +`provisioning.shared_secret`, to allow the value `generate` to be set. Since the configuration file is regenerated on every start of the service, the generated values would be discarded and might break your installation. Instead, set those values via diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 12643b20bd6ad..d8c4d53b78c50 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -161,6 +161,15 @@ in ''; }; + Audit.AudispSocketPath = lib.mkOption { + type = lib.types.path; + default = "/run/audit/audispd_events"; + description = '' + Configure audit socket path. Used when + `settings.ProcMonitorMethod` is set to `audit`. + ''; + }; + Rules.Path = lib.mkOption { type = lib.types.path; default = "/var/lib/opensnitch/rules"; diff --git a/nixos/modules/services/web-apps/glance.md b/nixos/modules/services/web-apps/glance.md index f65b32b3ba914..c42cd833bef39 100644 --- a/nixos/modules/services/web-apps/glance.md +++ b/nixos/modules/services/web-apps/glance.md @@ -7,7 +7,7 @@ more about it. ## Quickstart {#module-services-glance-quickstart} -Checkout the [configuration docs](https://github.com/glanceapp/glance/blob/main/docs/configuration.md) to learn more. +Check out the [configuration docs](https://github.com/glanceapp/glance/blob/main/docs/configuration.md) to learn more. Use the following configuration to start a public instance of Glance locally: ```nix diff --git a/nixos/modules/services/web-apps/hatsu.md b/nixos/modules/services/web-apps/hatsu.md index e2c61d00f121e..776b80dddc11d 100644 --- a/nixos/modules/services/web-apps/hatsu.md +++ b/nixos/modules/services/web-apps/hatsu.md @@ -4,7 +4,7 @@ ## Quickstart {#module-services-hatsu-quickstart} -the minimum configuration to start hatsu server would look like this: +The minimum configuration to start hatsu server would look like this: ```nix { diff --git a/nixos/modules/services/web-apps/lemmy.md b/nixos/modules/services/web-apps/lemmy.md index 0ed23607d00b9..a3924448ceb53 100644 --- a/nixos/modules/services/web-apps/lemmy.md +++ b/nixos/modules/services/web-apps/lemmy.md @@ -4,7 +4,7 @@ Lemmy is a federated alternative to reddit in rust. ## Quickstart {#module-services-lemmy-quickstart} -the minimum to start lemmy is +The minimum to start lemmy is ```nix { @@ -19,7 +19,7 @@ the minimum to start lemmy is } ``` -this will start the backend on port 8536 and the frontend on port 1234. +This will start the backend on port 8536 and the frontend on port 1234. It will expose your instance with a caddy reverse proxy to the hostname you've provided. Postgres will be initialized on that same instance automatically. diff --git a/nixos/modules/services/web-apps/ocis.md b/nixos/modules/services/web-apps/ocis.md index 43ddd3175c7d4..9414567604b03 100644 --- a/nixos/modules/services/web-apps/ocis.md +++ b/nixos/modules/services/web-apps/ocis.md @@ -33,7 +33,7 @@ A very basic configuration may look like this: This will start the oCIS server and make it available at `https://localhost:9200` -However to make this configuration work you will need generate a configuration. +However, to make this configuration work, you will need to generate a configuration. You can do this with: ```console diff --git a/nixos/modules/services/web-apps/szurubooru.md b/nixos/modules/services/web-apps/szurubooru.md index 29c5caf428953..c27dd2b0e1699 100644 --- a/nixos/modules/services/web-apps/szurubooru.md +++ b/nixos/modules/services/web-apps/szurubooru.md @@ -31,7 +31,7 @@ Here is a basic configuration: ## Reverse proxy configuration {#module-services-szurubooru-reverse-proxy-configuration} -The prefered method to run this service is behind a reverse proxy not to expose an open port. For example, here is a minimal Nginx configuration: +The preferred method to run this service is behind a reverse proxy not to expose an open port. For example, here is a minimal Nginx configuration: ```nix { diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 9c12a21b3f258..c7e81bb44335d 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -24,7 +24,7 @@ let mountToUnit automountToUnit sliceToUnit - attrsToSection + settingsToSections ; upstreamSystemUnits = [ @@ -603,10 +603,7 @@ in upstreamWants = upstreamSystemWants; }; - "systemd/system.conf".text = '' - [Manager] - ${attrsToSection cfg.settings.Manager} - ''; + "systemd/system.conf".text = settingsToSections cfg.settings; "systemd/sleep.conf".text = '' [Sleep] diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index e378dcf830bb8..761d05fc873e4 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -22,7 +22,7 @@ let timerToUnit mountToUnit automountToUnit - attrsToSection + settingsToSections ; cfg = config.boot.initrd.systemd; @@ -484,10 +484,7 @@ in "/init".source = "${cfg.package}/lib/systemd/systemd"; "/etc/systemd/system".source = stage1Units; - "/etc/systemd/system.conf".text = '' - [Manager] - ${attrsToSection cfg.settings.Manager} - ''; + "/etc/systemd/system.conf".text = settingsToSections cfg.settings; # We can use either ! or * to lock the root account in the # console, but some software like OpenSSH won't even allow you diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix index 2eff86008e655..d0878542514d9 100644 --- a/nixos/modules/system/boot/systemd/logind.nix +++ b/nixos/modules/system/boot/systemd/logind.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, utils, ... }: @@ -62,10 +61,8 @@ "user-runtime-dir@.service" ]; - environment.etc."systemd/logind.conf".text = '' - [Login] - ${utils.systemdUtils.lib.attrsToSection config.services.logind.settings.Login} - ''; + environment.etc."systemd/logind.conf".text = + utils.systemdUtils.lib.settingsToSections config.services.logind.settings; # Restarting systemd-logind breaks X11 # - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101 diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix index 252758c6bcf6b..82a87f00e97bc 100644 --- a/nixos/modules/system/boot/systemd/oomd.nix +++ b/nixos/modules/system/boot/systemd/oomd.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + lib, + utils, + ... +}: let cfg = config.systemd.oomd; @@ -10,6 +15,7 @@ in [ "systemd" "oomd" "enableUserServices" ] [ "systemd" "oomd" "enableUserSlices" ] ) + (lib.mkRenamedOptionModule [ "systemd" "oomd" "extraConfig" ] [ "systemd" "oomd" "settings" "OOM" ]) ]; options.systemd.oomd = { @@ -23,20 +29,18 @@ in enableSystemSlice = lib.mkEnableOption "oomd on the system slice (`system.slice`)"; enableUserSlices = lib.mkEnableOption "oomd on all user slices (`user@.slice`) and all user owned slices"; - extraConfig = lib.mkOption { - type = - with lib.types; - attrsOf (oneOf [ - str - int - bool - ]); - default = { }; - example = lib.literalExpression ''{ DefaultMemoryPressureDurationSec = "20s"; }''; + settings.OOM = lib.mkOption { description = '' - Extra config options for `systemd-oomd`. See {command}`man oomd.conf` - for available options. + Settings option for systemd-oomd. + See {manpage}`oomd.conf(5)` for available options. ''; + type = lib.types.submodule { + freeformType = lib.types.attrsOf utils.systemdUtils.unitOptions.unitOption; + }; + default = { }; + example = { + DefaultMemoryPressureLimit = "60%"; + }; }; }; @@ -52,11 +56,7 @@ in ]; systemd.services.systemd-oomd.wantedBy = [ "multi-user.target" ]; - environment.etc."systemd/oomd.conf".text = lib.generators.toINI { } { - OOM = cfg.extraConfig; - }; - - systemd.oomd.extraConfig.DefaultMemoryPressureDurationSec = lib.mkDefault "20s"; # Fedora default + environment.etc."systemd/oomd.conf".text = utils.systemdUtils.lib.settingsToSections cfg.settings; users.users.systemd-oom = { description = "systemd-oomd service user"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 55d1f2e788e3c..0d35e82c5fa10 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1519,6 +1519,7 @@ in tomcat = runTest ./tomcat.nix; tor = runTest ./tor.nix; tpm-ek = handleTest ./tpm-ek { }; + tpm2 = runTest ./tpm2.nix; # tracee requires bpf tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { }; traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix; diff --git a/nixos/tests/audit.nix b/nixos/tests/audit.nix index 0d732442ef4b3..d3fc558aeec89 100644 --- a/nixos/tests/audit.nix +++ b/nixos/tests/audit.nix @@ -31,7 +31,7 @@ }; testScript = '' - machine.wait_for_unit("audit-rules.service") + machine.wait_for_unit("audit-rules-nixos.service") machine.wait_for_unit("auditd.service") with subtest("Audit subsystem gets enabled"): @@ -40,14 +40,14 @@ t.assertIn("backlog_limit 512", audit_status) with subtest("unix socket plugin activated"): - machine.succeed("stat /var/run/audispd_events") + machine.succeed("stat /run/audit/audispd_events") with subtest("Custom rule produces audit traces"): machine.succeed("hello") print(machine.succeed("ausearch -k nixos-test -sc exit_group")) - with subtest("Stopping audit-rules.service disables the audit subsystem"): - machine.succeed("systemctl stop audit-rules.service") + with subtest("Stopping audit-rules-nixos.service disables the audit subsystem"): + machine.succeed("systemctl stop audit-rules-nixos.service") t.assertIn("enabled 0", machine.succeed("auditctl -s")) ''; diff --git a/nixos/tests/common/acme/server/README.md b/nixos/tests/common/acme/server/README.md index 9de2b2c710292..5be95a9a599c0 100644 --- a/nixos/tests/common/acme/server/README.md +++ b/nixos/tests/common/acme/server/README.md @@ -5,7 +5,7 @@ to serve ACME certificate requests. ## "Snake oil" certs -The snake oil certs are hard coded into the repo for reasons explained [here](https://github.com/NixOS/nixpkgs/pull/91121#discussion_r505410235). +The snake oil certs are hard-coded into the repo for reasons explained [here](https://github.com/NixOS/nixpkgs/pull/91121#discussion_r505410235). The root of the issue is that Nix will hash the derivation based on the arguments to mkDerivation, not the output. [Minica](https://github.com/jsha/minica) will always generate a random certificate even if the arguments are unchanged. As a diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index bd8b9b288a222..4b7f267657524 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -68,7 +68,7 @@ client = { pkgs, ... }: { - environment.systemPackages = [ pkgs.curlHTTP3 ]; + environment.systemPackages = [ pkgs.curl ]; }; }; testScript = '' diff --git a/nixos/tests/nginx-http3.nix b/nixos/tests/nginx-http3.nix index 1c0326d0f0f60..cd321d43d2e15 100644 --- a/nixos/tests/nginx-http3.nix +++ b/nixos/tests/nginx-http3.nix @@ -66,7 +66,7 @@ builtins.listToAttrs ( client = { pkgs, ... }: { - environment.systemPackages = [ pkgs.curlHTTP3 ]; + environment.systemPackages = [ pkgs.curl ]; networking = { interfaces.eth1 = { ipv4.addresses = [ diff --git a/nixos/tests/rustls-libssl.nix b/nixos/tests/rustls-libssl.nix index 165edb76a5d4d..da1c15c8cb278 100644 --- a/nixos/tests/rustls-libssl.nix +++ b/nixos/tests/rustls-libssl.nix @@ -64,7 +64,7 @@ in client = { pkgs, ... }: { - environment.systemPackages = [ pkgs.curlHTTP3 ]; + environment.systemPackages = [ pkgs.curl ]; networking = { interfaces.eth1 = { ipv4.addresses = [ diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix index 0825684e0bed6..239114924537d 100644 --- a/nixos/tests/sing-box.nix +++ b/nixos/tests/sing-box.nix @@ -249,7 +249,7 @@ in ]; environment.systemPackages = [ - pkgs.curlHTTP3 + pkgs.curl pkgs.iproute2 ]; @@ -308,7 +308,7 @@ in ]; environment.systemPackages = [ - pkgs.curlHTTP3 + pkgs.curl pkgs.iproute2 ]; @@ -369,7 +369,7 @@ in (builtins.readFile ./common/acme/server/ca.cert.pem) ]; - environment.systemPackages = [ pkgs.curlHTTP3 ]; + environment.systemPackages = [ pkgs.curl ]; systemd.services.sing-box.serviceConfig.ExecStartPost = [ "+${tproxyPost}/bin/exe" diff --git a/nixos/tests/systemd-initrd-luks-fido2.nix b/nixos/tests/systemd-initrd-luks-fido2.nix index e822c811cec5f..0022815850649 100644 --- a/nixos/tests/systemd-initrd-luks-fido2.nix +++ b/nixos/tests/systemd-initrd-luks-fido2.nix @@ -2,6 +2,11 @@ { name = "systemd-initrd-luks-fido2"; + meta = { + # `canokey-qemu` is marked broken. + broken = true; + }; + nodes.machine = { pkgs, config, ... }: { diff --git a/nixos/tests/tpm2.nix b/nixos/tests/tpm2.nix new file mode 100644 index 0000000000000..e38020f6e5ba0 --- /dev/null +++ b/nixos/tests/tpm2.nix @@ -0,0 +1,74 @@ +{ lib, pkgs, ... }: +{ + name = "tpm2"; + + nodes.machine = + { config, pkgs, ... }: + { + virtualisation = { + mountHostNixStore = true; + useEFIBoot = true; + tpm.enable = true; + }; + + users.users = { + tss-user = { + isNormalUser = true; + extraGroups = [ "tss" ]; + }; + }; + + security.sudo.wheelNeedsPassword = false; + + security.tpm2 = { + enable = true; + pkcs11.enable = true; + abrmd.enable = true; + tctiEnvironment.enable = true; + tctiEnvironment.interface = "tabrmd"; + fapi.ekCertLess = true; + }; + + environment.systemPackages = [ + pkgs.tpm2-tools + pkgs.openssl + ]; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + + with subtest("tabrmd service started properly"): + machine.succeed('[ `systemctl show tpm2-abrmd.service --property=Result` = "Result=success" ]') + machine.succeed('[ `journalctl -b -u tpm2-abrmd.service | grep -c "Starting"` = "1" ]') + + with subtest("tpm2 cli works"): + machine.succeed('tpm2 createprimary --hierarchy=o --key-algorithm=aes256 --attributes="fixedtpm|fixedparent|sensitivedataorigin|userwithauth|restricted|decrypt" --key-context=owner_root_key.ctx') + machine.succeed('tpm2 create --parent-context=owner_root_key.ctx --key-algorithm=ecc256:ecdsa-sha256:null --attributes="fixedtpm|fixedparent|sensitivedataorigin|userwithauth|restricted|sign" --key-context=ecc_sign_key.ctx --creation-ticket=ecc_sign_key-creation_ticket.bin -f pem --output=ecc_sign_key_public.pem') + machine.succeed('echo "A very important message." > message.txt') + machine.succeed('tpm2 sign --key-context=ecc_sign_key.ctx --hash-algorithm=sha256 -f plain --signature message_signature.bin message.txt') + machine.succeed('openssl dgst -verify ecc_sign_key_public.pem -signature message_signature.bin message.txt') + machine.succeed('echo "evil addition!" >> message.txt') + machine.fail('openssl dgst -verify ecc_sign_key_public.pem -signature message_signature.bin message.txt') + + def format_command(command, user): + return f"runuser -u {user} -- bash -c '{command}'" + def succeedu(command,user): + return machine.succeed(format_command(command,user)) + def failu(command,user): + return machine.fail(format_command(command,user)) + + with subtest("tss2 cli works"): + machine.succeed('tss2 provision') + succeedu('tss2 createkey --path=HS/SRK/sign --type=sign --authValue=""',"tss-user") + succeedu('tss2 gettpmblobs --path=HS/SRK/sign --tpm2bPublic=$HOME/sign_key_public.bin',"tss-user") + succeedu('tpm2 print -t TPM2B_PUBLIC -f pem $HOME/sign_key_public.bin > $HOME/sign_key_public.pem',"tss-user") + succeedu('echo "A very important message." > $HOME/message.txt',"tss-user") + succeedu('tpm2 hash --hash-algorithm=sha256 --output=$HOME/message_hash.bin $HOME/message.txt',"tss-user") + succeedu('tss2 sign --keyPath=HS/SRK/sign --digest=$HOME/message_hash.bin --signature=$HOME/message_signature.bin',"tss-user") + succeedu('openssl dgst -verify $HOME/sign_key_public.pem -signature $HOME/message_signature.bin $HOME/message.txt',"tss-user") + succeedu('echo "evil addition!" >> $HOME/message.txt',"tss-user") + failu('openssl dgst -verify $HOME/sign_key_public.pem -signature $HOME/message_signature.bin $HOME/message.txt',"tss-user") + ''; +} diff --git a/nixos/tests/web-servers/h2o/basic.nix b/nixos/tests/web-servers/h2o/basic.nix index 52a4b58429e82..622bb96929bf1 100644 --- a/nixos/tests/web-servers/h2o/basic.nix +++ b/nixos/tests/web-servers/h2o/basic.nix @@ -44,7 +44,7 @@ in { pkgs, ... }: { environment.systemPackages = [ - pkgs.curlHTTP3 + pkgs.curl ]; services.h2o = { diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index 7015d978d3949..6d42712f4c8c4 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { cmake ]; - dontFixCmake = true; - cmakeFlags = [ "-Dmunt_WITH_MT32EMU_SMF2WAV=OFF" "-Dmunt_WITH_MT32EMU_QT=OFF" diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix index eb6e9aabd7d4e..ca2d22cc80713 100644 --- a/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -50,8 +50,6 @@ mkDerivation rec { ] ++ lib.optional withJack libjack2; - dontFixCmake = true; - cmakeFlags = [ "-Dmt32emu-qt_USE_PULSEAUDIO_DYNAMIC_LOADING=OFF" "-Dmunt_WITH_MT32EMU_QT=ON" diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix index 0b1010be1893f..a32c76f77ba20 100644 --- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix +++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt ''; - dontFixCmake = true; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix index 15378ed16949d..e3b2389f2f109 100644 --- a/pkgs/applications/display-managers/sddm/unwrapped.nix +++ b/pkgs/applications/display-managers/sddm/unwrapped.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, qttools, @@ -39,6 +40,12 @@ stdenv.mkDerivation (finalAttrs: { ./greeter-path.patch ./sddm-ignore-config-mtime.patch ./sddm-default-session.patch + + (fetchpatch { + name = "sddm-fix-cmake-4.patch"; + url = "https://github.com/sddm/sddm/commit/228778c2b4b7e26db1e1d69fe484ed75c5791c3a.patch"; + hash = "sha256-Okt9LeZBhTDhP7NKBexWAZhkK6N6j9dFkAEgpidSnzE="; + }) ]; postPatch = '' diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index fdec78c8acd45..11875eaac7e11 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.1623"; + version = "9.1.1765"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-T7epi6ex9AU4iV/ClSeKlK3T0V0WajiVxnDVevkqaw8="; + hash = "sha256-bL6mqnke0uE0Bk7oYjJPiPtl/9Qk8fvCXrQVqAb7pPM="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/applications/emulators/libretro/cores/citra.nix index 420a7bc2c1d45..2b65552f8e2a4 100644 --- a/pkgs/applications/emulators/libretro/cores/citra.nix +++ b/pkgs/applications/emulators/libretro/cores/citra.nix @@ -29,10 +29,6 @@ mkLibretroCore { extraNativeBuildInputs = [ cmake ]; - # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt` - # making the build fail, as that path does not exist - dontFixCmake = true; - # https://github.com/libretro/citra/blob/a31aff7e1a3a66f525b9ea61633d2c5e5b0c8b31/.gitlab-ci.yml#L6 cmakeFlags = [ (lib.cmakeBool "ENABLE_TESTS" false) diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix index a44d4c4f5bee6..b6d37dfc56490 100644 --- a/pkgs/applications/graphics/pymeshlab/default.nix +++ b/pkgs/applications/graphics/pymeshlab/default.nix @@ -19,7 +19,7 @@ boost, mpfr, xercesc, - tbb, + onetbb, embree, vcg, libigl, @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { boost mpfr xercesc - tbb + onetbb embree vcg libigl diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index e0e5a32ab5b93..da9d218a932b3 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -28,7 +28,7 @@ opencascade-occt_7_6_1, openvdb, qhull, - tbb_2022, + onetbb, wxGTK32, xorg, libbgcode, @@ -56,7 +56,6 @@ let hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY="; }; }); - openvdb_tbb_2022 = openvdb.override { tbb = tbb_2022; }; wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override; opencascade-override' = if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override; @@ -124,9 +123,9 @@ stdenv.mkDerivation (finalAttrs: { nanosvg-fltk nlopt opencascade-override' - openvdb_tbb_2022 + openvdb qhull - tbb_2022 + onetbb wxGTK-override' xorg.libX11 libbgcode @@ -188,6 +187,9 @@ stdenv.mkDerivation (finalAttrs: { "-DSLIC3R_FHS=1" "-DSLIC3R_GTK=3" "-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK" + # there is many different min versions set accross different + # Find*.cmake files, substituting them all is not viable + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ]; postInstall = '' diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer-fix-cereal-1.3.1.patch b/pkgs/applications/misc/prusa-slicer/super-slicer-fix-cereal-1.3.1.patch new file mode 100644 index 0000000000000..ce719360cce55 --- /dev/null +++ b/pkgs/applications/misc/prusa-slicer/super-slicer-fix-cereal-1.3.1.patch @@ -0,0 +1,80 @@ +From cbb17366904c97bb5db40644c277be41219261da Mon Sep 17 00:00:00 2001 +From: Emily +Date: Tue, 9 Sep 2025 20:42:11 +0100 +Subject: [PATCH] =?UTF-8?q?Fix=20the=20build=20with=20cereal=20=E2=89=A5?= + =?UTF-8?q?=201.3.1?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Based on . + +Co-authored-by: Yuri D'Elia +Co-authored-by: tamasmeszaros +--- + CMakeLists.txt | 6 ++++++ + src/CMakeLists.txt | 3 +-- + src/libslic3r/CMakeLists.txt | 2 +- + src/slic3r/CMakeLists.txt | 2 +- + 4 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a112949bba..81b0a4244f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -469,6 +469,12 @@ endif () + + # Find the Cereal serialization library + find_package(cereal REQUIRED) ++add_library(libcereal INTERFACE) ++if (NOT TARGET cereal::cereal) ++ target_link_libraries(libcereal INTERFACE cereal) ++else() ++ target_link_libraries(libcereal INTERFACE cereal::cereal) ++endif() + + # l10n + set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index bf721a7635..71a62a9024 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -144,8 +144,7 @@ if (NOT WIN32) + set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}") + endif () + +-target_link_libraries(Slic3r libslic3r cereal) +- ++target_link_libraries(Slic3r libslic3r libcereal) + if (APPLE) + # add_compile_options(-stdlib=libc++) + # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) +diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt +index 84be9c12e5..4940549134 100644 +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -420,7 +420,7 @@ find_package(JPEG REQUIRED) + target_link_libraries(libslic3r + libnest2d + admesh +- cereal ++ libcereal + libigl + miniz + boost_libs +diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt +index c11f860c59..c1eb966de1 100644 +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -302,7 +302,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$:SLIC3 + + encoding_check(libslic3r_gui) + +-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) ++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) + + if (MSVC) + target_link_libraries(libslic3r_gui Setupapi.lib) +-- +2.50.1 + diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 4eb3acc4e5fee..92cadda3e57f6 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -20,6 +20,7 @@ let hash = "sha256-fh31qrqjQiRQL03pQl4KJAEtbKMwG8/nJroqIDOIePw="; }) ./super-slicer-use-boost186.patch + ./super-slicer-fix-cereal-1.3.1.patch ]; wxGTK31-prusa = wxGTK31.overrideAttrs (old: { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/abseil-202508.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/abseil-202508.patch new file mode 100644 index 0000000000000..0f8b5204dd138 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/abseil-202508.patch @@ -0,0 +1,554 @@ +diff --git a/src/api/environment/environment.h b/src/api/environment/environment.h +index d86b7ae78..cc2761f71 100644 +--- a/src/api/environment/environment.h ++++ b/src/api/environment/environment.h +@@ -99,10 +99,10 @@ class RTC_EXPORT Environment final { + private: + friend class EnvironmentFactory; + Environment(scoped_refptr storage, +- absl::Nonnull field_trials, +- absl::Nonnull clock, +- absl::Nonnull task_queue_factory, +- absl::Nonnull event_log) ++ const FieldTrialsView* absl_nonnull field_trials, ++ Clock* absl_nonnull clock, ++ TaskQueueFactory* absl_nonnull task_queue_factory, ++ RtcEventLog* absl_nonnull event_log) + : storage_(std::move(storage)), + field_trials_(field_trials), + clock_(clock), +@@ -117,10 +117,10 @@ class RTC_EXPORT Environment final { + // `storage_` is alive. + scoped_refptr storage_; + +- absl::Nonnull field_trials_; +- absl::Nonnull clock_; +- absl::Nonnull task_queue_factory_; +- absl::Nonnull event_log_; ++ const FieldTrialsView* absl_nonnull field_trials_; ++ Clock* absl_nonnull clock_; ++ TaskQueueFactory* absl_nonnull task_queue_factory_; ++ RtcEventLog* absl_nonnull event_log_; + }; + + //------------------------------------------------------------------------------ +diff --git a/src/api/environment/environment_factory.cc b/src/api/environment/environment_factory.cc +index c0b681aa0..ded3effe8 100644 +--- a/src/api/environment/environment_factory.cc ++++ b/src/api/environment/environment_factory.cc +@@ -25,12 +25,12 @@ namespace webrtc { + namespace { + + template +-void Store(absl::Nonnull> value, ++void Store(std::unique_ptr absl_nonnull value, + scoped_refptr& leaf) { + class StorageNode : public rtc::RefCountedBase { + public: + StorageNode(scoped_refptr parent, +- absl::Nonnull> value) ++ std::unique_ptr absl_nonnull value) + : parent_(std::move(parent)), value_(std::move(value)) {} + + StorageNode(const StorageNode&) = delete; +@@ -40,7 +40,7 @@ void Store(absl::Nonnull> value, + + private: + scoped_refptr parent_; +- absl::Nonnull> value_; ++ std::unique_ptr absl_nonnull value_; + }; + + // Utilities provided with ownership form a tree: +@@ -63,14 +63,14 @@ EnvironmentFactory::EnvironmentFactory(const Environment& env) + event_log_(env.event_log_) {} + + void EnvironmentFactory::Set( +- absl::Nullable> utility) { ++ std::unique_ptr absl_nullable utility) { + if (utility != nullptr) { + field_trials_ = utility.get(); + Store(std::move(utility), leaf_); + } + } + +-void EnvironmentFactory::Set(absl::Nullable> utility) { ++void EnvironmentFactory::Set(std::unique_ptr absl_nullable utility) { + if (utility != nullptr) { + clock_ = utility.get(); + Store(std::move(utility), leaf_); +@@ -78,7 +78,7 @@ void EnvironmentFactory::Set(absl::Nullable> utility) { + } + + void EnvironmentFactory::Set( +- absl::Nullable> utility) { ++ std::unique_ptr absl_nullable utility) { + if (utility != nullptr) { + task_queue_factory_ = utility.get(); + Store(std::move(utility), leaf_); +@@ -86,7 +86,7 @@ void EnvironmentFactory::Set( + } + + void EnvironmentFactory::Set( +- absl::Nullable> utility) { ++ std::unique_ptr absl_nullable utility) { + if (utility != nullptr) { + event_log_ = utility.get(); + Store(std::move(utility), leaf_); +diff --git a/src/api/environment/environment_factory.h b/src/api/environment/environment_factory.h +index a0fc3effd..b6be04f6a 100644 +--- a/src/api/environment/environment_factory.h ++++ b/src/api/environment/environment_factory.h +@@ -54,15 +54,15 @@ class RTC_EXPORT EnvironmentFactory final { + + ~EnvironmentFactory() = default; + +- void Set(absl::Nullable> utility); +- void Set(absl::Nullable> utility); +- void Set(absl::Nullable> utility); +- void Set(absl::Nullable> utility); ++ void Set(std::unique_ptr absl_nullable utility); ++ void Set(std::unique_ptr absl_nullable utility); ++ void Set(std::unique_ptr absl_nullable utility); ++ void Set(std::unique_ptr absl_nullable utility); + +- void Set(absl::Nullable utility); +- void Set(absl::Nullable utility); +- void Set(absl::Nullable utility); +- void Set(absl::Nullable utility); ++ void Set(const FieldTrialsView* absl_nullable utility); ++ void Set(Clock* absl_nullable utility); ++ void Set(TaskQueueFactory* absl_nullable utility); ++ void Set(RtcEventLog* absl_nullable utility); + + Environment Create() const; + +@@ -71,10 +71,10 @@ class RTC_EXPORT EnvironmentFactory final { + + scoped_refptr leaf_; + +- absl::Nullable field_trials_ = nullptr; +- absl::Nullable clock_ = nullptr; +- absl::Nullable task_queue_factory_ = nullptr; +- absl::Nullable event_log_ = nullptr; ++ const FieldTrialsView* absl_nullable field_trials_ = nullptr; ++ Clock* absl_nullable clock_ = nullptr; ++ TaskQueueFactory* absl_nullable task_queue_factory_ = nullptr; ++ RtcEventLog* absl_nullable event_log_ = nullptr; + }; + + // Helper for concise way to create an environment. +@@ -97,25 +97,25 @@ Environment CreateEnvironment(Utilities&&... utilities); + //------------------------------------------------------------------------------ + + inline void EnvironmentFactory::Set( +- absl::Nullable utility) { ++ const FieldTrialsView* absl_nullable utility) { + if (utility != nullptr) { + field_trials_ = utility; + } + } + +-inline void EnvironmentFactory::Set(absl::Nullable utility) { ++inline void EnvironmentFactory::Set(Clock* absl_nullable utility) { + if (utility != nullptr) { + clock_ = utility; + } + } + +-inline void EnvironmentFactory::Set(absl::Nullable utility) { ++inline void EnvironmentFactory::Set(TaskQueueFactory* absl_nullable utility) { + if (utility != nullptr) { + task_queue_factory_ = utility; + } + } + +-inline void EnvironmentFactory::Set(absl::Nullable utility) { ++inline void EnvironmentFactory::Set(RtcEventLog* absl_nullable utility) { + if (utility != nullptr) { + event_log_ = utility; + } +diff --git a/src/api/rtc_event_log/rtc_event_log_factory.cc b/src/api/rtc_event_log/rtc_event_log_factory.cc +index bfe272d2a..2196c31cd 100644 +--- a/src/api/rtc_event_log/rtc_event_log_factory.cc ++++ b/src/api/rtc_event_log/rtc_event_log_factory.cc +@@ -23,7 +23,7 @@ + + namespace webrtc { + +-absl::Nonnull> RtcEventLogFactory::Create( ++std::unique_ptr absl_nonnull RtcEventLogFactory::Create( + const Environment& env) const { + #ifndef WEBRTC_ENABLE_RTC_EVENT_LOG + return std::make_unique(); +diff --git a/src/api/rtc_event_log/rtc_event_log_factory.h b/src/api/rtc_event_log/rtc_event_log_factory.h +index 1deb0612b..7f868a552 100644 +--- a/src/api/rtc_event_log/rtc_event_log_factory.h ++++ b/src/api/rtc_event_log/rtc_event_log_factory.h +@@ -31,7 +31,7 @@ class RTC_EXPORT RtcEventLogFactory : public RtcEventLogFactoryInterface { + + ~RtcEventLogFactory() override = default; + +- absl::Nonnull> Create( ++ std::unique_ptr absl_nonnull Create( + const Environment& env) const override; + }; + +diff --git a/src/api/rtc_event_log/rtc_event_log_factory_interface.h b/src/api/rtc_event_log/rtc_event_log_factory_interface.h +index 313558496..d39766955 100644 +--- a/src/api/rtc_event_log/rtc_event_log_factory_interface.h ++++ b/src/api/rtc_event_log/rtc_event_log_factory_interface.h +@@ -26,7 +26,7 @@ class RtcEventLogFactoryInterface { + public: + virtual ~RtcEventLogFactoryInterface() = default; + +- virtual absl::Nonnull> Create( ++ virtual std::unique_ptr absl_nonnull Create( + const Environment& env) const = 0; + }; + +diff --git a/src/api/task_queue/pending_task_safety_flag.cc b/src/api/task_queue/pending_task_safety_flag.cc +index 4d8fc2b9f..4b521ea04 100644 +--- a/src/api/task_queue/pending_task_safety_flag.cc ++++ b/src/api/task_queue/pending_task_safety_flag.cc +@@ -37,7 +37,7 @@ PendingTaskSafetyFlag::CreateDetached() { + rtc::scoped_refptr + PendingTaskSafetyFlag::CreateAttachedToTaskQueue( + bool alive, +- absl::Nonnull attached_queue) { ++ TaskQueueBase* absl_nonnull attached_queue) { + RTC_DCHECK(attached_queue) << "Null TaskQueue provided"; + return rtc::scoped_refptr( + new PendingTaskSafetyFlag(alive, attached_queue)); +diff --git a/src/api/task_queue/pending_task_safety_flag.h b/src/api/task_queue/pending_task_safety_flag.h +index 12b1e00ee..1a002e0ad 100644 +--- a/src/api/task_queue/pending_task_safety_flag.h ++++ b/src/api/task_queue/pending_task_safety_flag.h +@@ -73,7 +73,7 @@ class RTC_EXPORT PendingTaskSafetyFlag final + // a given task queue and the `alive()` flag specified. + static rtc::scoped_refptr CreateAttachedToTaskQueue( + bool alive, +- absl::Nonnull attached_queue); ++ TaskQueueBase* absl_nonnull attached_queue); + + // Same as `CreateDetached()` except the initial state of the returned flag + // will be `!alive()`. +@@ -103,7 +103,7 @@ class RTC_EXPORT PendingTaskSafetyFlag final + protected: + explicit PendingTaskSafetyFlag(bool alive) : alive_(alive) {} + PendingTaskSafetyFlag(bool alive, +- absl::Nonnull attached_queue) ++ TaskQueueBase* absl_nonnull attached_queue) + : alive_(alive), main_sequence_(attached_queue) {} + + private: +diff --git a/src/api/test/create_time_controller.cc b/src/api/test/create_time_controller.cc +index cbf1f09aa..049451bf5 100644 +--- a/src/api/test/create_time_controller.cc ++++ b/src/api/test/create_time_controller.cc +@@ -44,8 +44,8 @@ void EnableMediaWithDefaultsAndTimeController( + class TimeControllerBasedFactory : public MediaFactory { + public: + TimeControllerBasedFactory( +- absl::Nonnull clock, +- absl::Nonnull> media_factory) ++ Clock* absl_nonnull clock, ++ std::unique_ptr absl_nonnull media_factory) + : clock_(clock), media_factory_(std::move(media_factory)) {} + + std::unique_ptr CreateCall(const CallConfig& config) override { +@@ -64,8 +64,8 @@ void EnableMediaWithDefaultsAndTimeController( + } + + private: +- absl::Nonnull clock_; +- absl::Nonnull> media_factory_; ++ Clock* absl_nonnull clock_; ++ std::unique_ptr absl_nonnull media_factory_; + }; + + EnableMediaWithDefaults(deps); +diff --git a/src/logging/rtc_event_log/fake_rtc_event_log_factory.cc b/src/logging/rtc_event_log/fake_rtc_event_log_factory.cc +index bacc3cd1c..c5a43e7dd 100644 +--- a/src/logging/rtc_event_log/fake_rtc_event_log_factory.cc ++++ b/src/logging/rtc_event_log/fake_rtc_event_log_factory.cc +@@ -17,7 +17,7 @@ + + namespace webrtc { + +-absl::Nonnull> FakeRtcEventLogFactory::Create( ++std::unique_ptr absl_nonnull FakeRtcEventLogFactory::Create( + const Environment& /*env*/) const { + auto fake_event_log = std::make_unique(); + const_cast(last_log_created_) = fake_event_log.get(); +diff --git a/src/logging/rtc_event_log/fake_rtc_event_log_factory.h b/src/logging/rtc_event_log/fake_rtc_event_log_factory.h +index 0d6d07603..08017432a 100644 +--- a/src/logging/rtc_event_log/fake_rtc_event_log_factory.h ++++ b/src/logging/rtc_event_log/fake_rtc_event_log_factory.h +@@ -25,7 +25,7 @@ class FakeRtcEventLogFactory : public RtcEventLogFactoryInterface { + FakeRtcEventLogFactory() = default; + ~FakeRtcEventLogFactory() override = default; + +- absl::Nonnull> Create( ++ std::unique_ptr absl_nonnull Create( + const Environment& env) const override; + + FakeRtcEventLog* last_log_created() { return last_log_created_; } +diff --git a/src/modules/audio_processing/aec_dump/aec_dump_factory.h b/src/modules/audio_processing/aec_dump/aec_dump_factory.h +index 0d258a9eb..89435d62c 100644 +--- a/src/modules/audio_processing/aec_dump/aec_dump_factory.h ++++ b/src/modules/audio_processing/aec_dump/aec_dump_factory.h +@@ -29,18 +29,18 @@ class RTC_EXPORT AecDumpFactory { + // The AecDump takes responsibility for `handle` and closes it in the + // destructor. A non-null return value indicates that the file has been + // sucessfully opened. +- static absl::Nullable> Create( ++ static std::unique_ptr absl_nullable Create( + FileWrapper file, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue); +- static absl::Nullable> Create( ++ TaskQueueBase* absl_nonnull worker_queue); ++ static std::unique_ptr absl_nullable Create( + absl::string_view file_name, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue); +- static absl::Nullable> Create( +- absl::Nonnull handle, ++ TaskQueueBase* absl_nonnull worker_queue); ++ static std::unique_ptr absl_nullable Create( ++ FILE* absl_nonnull handle, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue); ++ TaskQueueBase* absl_nonnull worker_queue); + }; + + } // namespace webrtc +diff --git a/src/modules/audio_processing/aec_dump/aec_dump_impl.cc b/src/modules/audio_processing/aec_dump/aec_dump_impl.cc +index 8484fcc6e..76b59d0e5 100644 +--- a/src/modules/audio_processing/aec_dump/aec_dump_impl.cc ++++ b/src/modules/audio_processing/aec_dump/aec_dump_impl.cc +@@ -60,7 +60,7 @@ void CopyFromConfigToEvent(const webrtc::InternalAPMConfig& config, + + AecDumpImpl::AecDumpImpl(FileWrapper debug_file, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) ++ TaskQueueBase* absl_nonnull worker_queue) + : debug_file_(std::move(debug_file)), + num_bytes_left_for_log_(max_log_size_bytes), + worker_queue_(worker_queue) {} +@@ -255,10 +255,10 @@ void AecDumpImpl::PostWriteToFileTask(std::unique_ptr event) { + }); + } + +-absl::Nullable> AecDumpFactory::Create( ++std::unique_ptr absl_nullable AecDumpFactory::Create( + FileWrapper file, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) { ++ TaskQueueBase* absl_nonnull worker_queue) { + RTC_DCHECK(worker_queue); + if (!file.is_open()) + return nullptr; +@@ -267,18 +267,18 @@ absl::Nullable> AecDumpFactory::Create( + worker_queue); + } + +-absl::Nullable> AecDumpFactory::Create( ++std::unique_ptr absl_nullable AecDumpFactory::Create( + absl::string_view file_name, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) { ++ TaskQueueBase* absl_nonnull worker_queue) { + return Create(FileWrapper::OpenWriteOnly(file_name), max_log_size_bytes, + worker_queue); + } + +-absl::Nullable> AecDumpFactory::Create( +- absl::Nonnull handle, ++std::unique_ptr absl_nullable AecDumpFactory::Create( ++ FILE* absl_nonnull handle, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) { ++ TaskQueueBase* absl_nonnull worker_queue) { + return Create(FileWrapper(handle), max_log_size_bytes, worker_queue); + } + +diff --git a/src/modules/audio_processing/aec_dump/aec_dump_impl.h b/src/modules/audio_processing/aec_dump/aec_dump_impl.h +index d5af31b01..e3fb25469 100644 +--- a/src/modules/audio_processing/aec_dump/aec_dump_impl.h ++++ b/src/modules/audio_processing/aec_dump/aec_dump_impl.h +@@ -39,7 +39,7 @@ class AecDumpImpl : public AecDump { + // `max_log_size_bytes == -1` means the log size will be unlimited. + AecDumpImpl(FileWrapper debug_file, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue); ++ TaskQueueBase* absl_nonnull worker_queue); + AecDumpImpl(const AecDumpImpl&) = delete; + AecDumpImpl& operator=(const AecDumpImpl&) = delete; + ~AecDumpImpl() override; +@@ -74,7 +74,7 @@ class AecDumpImpl : public AecDump { + FileWrapper debug_file_; + int64_t num_bytes_left_for_log_ = 0; + rtc::RaceChecker race_checker_; +- absl::Nonnull worker_queue_; ++ TaskQueueBase* absl_nonnull worker_queue_; + CaptureStreamInfo capture_stream_info_; + }; + } // namespace webrtc +diff --git a/src/modules/audio_processing/aec_dump/null_aec_dump_factory.cc b/src/modules/audio_processing/aec_dump/null_aec_dump_factory.cc +index 63929afac..2902c1bbc 100644 +--- a/src/modules/audio_processing/aec_dump/null_aec_dump_factory.cc ++++ b/src/modules/audio_processing/aec_dump/null_aec_dump_factory.cc +@@ -16,24 +16,24 @@ + + namespace webrtc { + +-absl::Nullable> AecDumpFactory::Create( ++std::unique_ptr absl_nullable AecDumpFactory::Create( + FileWrapper file, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) { ++ TaskQueueBase* absl_nonnull worker_queue) { + return nullptr; + } + +-absl::Nullable> AecDumpFactory::Create( ++std::unique_ptr absl_nullable AecDumpFactory::Create( + absl::string_view file_name, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) { ++ TaskQueueBase* absl_nonnull worker_queue) { + return nullptr; + } + +-absl::Nullable> AecDumpFactory::Create( +- absl::Nonnull handle, ++std::unique_ptr absl_nullable AecDumpFactory::Create( ++ FILE* absl_nonnull handle, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) { ++ TaskQueueBase* absl_nonnull worker_queue) { + return nullptr; + } + } // namespace webrtc +diff --git a/src/modules/audio_processing/audio_processing_impl.cc b/src/modules/audio_processing/audio_processing_impl.cc +index 0d11e418e..0a579f7dd 100644 +--- a/src/modules/audio_processing/audio_processing_impl.cc ++++ b/src/modules/audio_processing/audio_processing_impl.cc +@@ -2087,7 +2087,7 @@ void AudioProcessingImpl::UpdateRecommendedInputVolumeLocked() { + bool AudioProcessingImpl::CreateAndAttachAecDump( + absl::string_view file_name, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) { ++ TaskQueueBase* absl_nonnull worker_queue) { + std::unique_ptr aec_dump = + AecDumpFactory::Create(file_name, max_log_size_bytes, worker_queue); + if (!aec_dump) { +@@ -2101,7 +2101,7 @@ bool AudioProcessingImpl::CreateAndAttachAecDump( + bool AudioProcessingImpl::CreateAndAttachAecDump( + FILE* handle, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) { ++ TaskQueueBase* absl_nonnull worker_queue) { + std::unique_ptr aec_dump = + AecDumpFactory::Create(handle, max_log_size_bytes, worker_queue); + if (!aec_dump) { +diff --git a/src/modules/audio_processing/audio_processing_impl.h b/src/modules/audio_processing/audio_processing_impl.h +index 2c0ab198d..4cea151cd 100644 +--- a/src/modules/audio_processing/audio_processing_impl.h ++++ b/src/modules/audio_processing/audio_processing_impl.h +@@ -76,11 +76,11 @@ class AudioProcessingImpl : public AudioProcessing { + bool CreateAndAttachAecDump( + absl::string_view file_name, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) override; ++ TaskQueueBase* absl_nonnull worker_queue) override; + bool CreateAndAttachAecDump( + FILE* handle, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) override; ++ TaskQueueBase* absl_nonnull worker_queue) override; + // TODO(webrtc:5298) Deprecated variant. + void AttachAecDump(std::unique_ptr aec_dump) override; + void DetachAecDump() override; +diff --git a/src/modules/audio_processing/include/audio_processing.h b/src/modules/audio_processing/include/audio_processing.h +index dd484be4f..f7c115e58 100644 +--- a/src/modules/audio_processing/include/audio_processing.h ++++ b/src/modules/audio_processing/include/audio_processing.h +@@ -633,11 +633,11 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface { + virtual bool CreateAndAttachAecDump( + absl::string_view file_name, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) = 0; ++ TaskQueueBase* absl_nonnull worker_queue) = 0; + virtual bool CreateAndAttachAecDump( +- absl::Nonnull handle, ++ FILE* absl_nonnull handle, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue) = 0; ++ TaskQueueBase* absl_nonnull worker_queue) = 0; + + // TODO(webrtc:5298) Deprecated variant. + // Attaches provided webrtc::AecDump for recording debugging +diff --git a/src/modules/audio_processing/include/mock_audio_processing.h b/src/modules/audio_processing/include/mock_audio_processing.h +index dfe7d84e0..fad0a5b83 100644 +--- a/src/modules/audio_processing/include/mock_audio_processing.h ++++ b/src/modules/audio_processing/include/mock_audio_processing.h +@@ -157,13 +157,13 @@ class MockAudioProcessing : public AudioProcessing { + CreateAndAttachAecDump, + (absl::string_view file_name, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue), ++ TaskQueueBase* absl_nonnull worker_queue), + (override)); + MOCK_METHOD(bool, + CreateAndAttachAecDump, + (FILE * handle, + int64_t max_log_size_bytes, +- absl::Nonnull worker_queue), ++ TaskQueueBase* absl_nonnull worker_queue), + (override)); + MOCK_METHOD(void, AttachAecDump, (std::unique_ptr), (override)); + MOCK_METHOD(void, DetachAecDump, (), (override)); +diff --git a/src/pc/test/enable_fake_media.cc b/src/pc/test/enable_fake_media.cc +index 5497c6072..5c10fd8d5 100644 +--- a/src/pc/test/enable_fake_media.cc ++++ b/src/pc/test/enable_fake_media.cc +@@ -29,11 +29,11 @@ using ::cricket::MediaEngineInterface; + + void EnableFakeMedia( + PeerConnectionFactoryDependencies& deps, +- absl::Nonnull> fake_media_engine) { ++ std::unique_ptr absl_nonnull fake_media_engine) { + class FakeMediaFactory : public MediaFactory { + public: + explicit FakeMediaFactory( +- absl::Nonnull> fake) ++ std::unique_ptr absl_nonnull fake) + : fake_(std::move(fake)) {} + + std::unique_ptr CreateCall(const CallConfig& config) override { +@@ -49,7 +49,7 @@ void EnableFakeMedia( + } + + private: +- absl::Nullable> fake_; ++ std::unique_ptr absl_nullable fake_; + }; + + deps.media_factory = +diff --git a/src/pc/test/enable_fake_media.h b/src/pc/test/enable_fake_media.h +index 82c55ad08..5fc339d29 100644 +--- a/src/pc/test/enable_fake_media.h ++++ b/src/pc/test/enable_fake_media.h +@@ -28,7 +28,7 @@ namespace webrtc { + // Enables media support backed by the 'fake_media_engine'. + void EnableFakeMedia( + PeerConnectionFactoryDependencies& deps, +- absl::Nonnull> fake_media_engine); ++ std::unique_ptr absl_nonnull fake_media_engine); + + // Enables media support backed by unspecified lightweight fake implementation. + void EnableFakeMedia(PeerConnectionFactoryDependencies& deps); + diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 2a8509ac30b4f..6062608965805 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -43,6 +43,12 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # fix build with abseil 202508 + # upstream PR: https://github.com/desktop-app/tg_owt/pull/164 + ./abseil-202508.patch + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 2da08bfa6c25c..a030ed2c47fe8 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -164,7 +164,6 @@ stdenv.mkDerivation rec { # Avoid referencing -dev paths because of debug assertions. env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ]; - dontFixCmake = true; dontWrapGApps = true; shellHook = '' diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index feb66f6fdf25b..c38d5913d2ea6 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, updateAutotoolsGnuConfigScriptsHook, perl, @@ -34,6 +35,11 @@ stdenv.mkDerivation rec { patches = [ # See: ./fix-tests-in-darwin-sandbox.patch + # fix compilation with gcc15 + (fetchpatch { + url = "https://github.com/RsyncProject/rsync/commit/a4b926dcdce96b0f2cc0dc7744e95747b233500a.patch"; + hash = "sha256-UiEQJ+p2gtIDYNJqnxx4qKgItKIZzCpkHnvsgoxBmSE="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 1b5d708e433f3..9c3ffb16c186a 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -25,7 +25,7 @@ doxygen, opencl-headers, ncurses, - msgpack, + msgpack-c, fftw, zeromq, ocl-icd, @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { hdf5 gsl ncurses - msgpack + msgpack-c fftw fdip zeromq diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 8be72836cf2db..0e3fd51885d64 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -526,7 +526,7 @@ stdenv.mkDerivation (finalAttrs: { "lib" "libexec" "bin" - "share/git/contrib/credential/libsecret" + "share/git/contrib/credential" ]; passthru = { diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 57300cd864846..15c9748675d66 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, mkDerivation, stdenv, SDL2, @@ -38,6 +39,12 @@ mkDerivation rec { ./fix-web-path.patch # disable update notifications since the end user can't simply download the release artifacts to update ./disable-update-notifications.patch + + # cmake 4 compatibility + (fetchpatch { + url = "https://github.com/jellyfin/jellyfin-media-player/commit/6c5c603a1db489872832ed560581d98fdee89d6f.patch"; + hash = "sha256-Blq7y7kOygbZ6uKxPJl9aDXJWqhE0jnM5GNEAwyQEA0="; + }) ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 85c5d60af1095..26754231051b2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -113,13 +113,13 @@ let }); docker-tini = tini.overrideAttrs { - pname = "docker-init"; + pname = "docker-tini"; inherit version; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; - tag = tiniRev; + rev = tiniRev; hash = tiniHash; }; @@ -401,8 +401,8 @@ in runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4="; containerdRev = "v1.7.27"; containerdHash = "sha256-H94EHnfW2Z59KcHcbfJn+BipyZiNUvHe50G5EXbrIps="; - tiniRev = "v0.19.0"; - tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828"; + tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw="; }; docker_28 = @@ -419,8 +419,8 @@ in runcHash = "sha256-oXoDio3l23Z6UyAhb9oDMo1O4TLBbFyLh9sRWXnfLVY="; containerdRev = "v1.7.28"; containerdHash = "sha256-vz7RFJkFkMk2gp7bIMx1kbkDFUMS9s0iH0VoyD9A21s="; - tiniRev = "v0.19.0"; - tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828"; + tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw="; }; } diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu.nix b/pkgs/applications/virtualization/qemu/canokey-qemu.nix index 0ad27dd55cfb4..34a9bccbeeb55 100644 --- a/pkgs/applications/virtualization/qemu/canokey-qemu.nix +++ b/pkgs/applications/virtualization/qemu/canokey-qemu.nix @@ -57,5 +57,10 @@ stdenv.mkDerivation rec { description = "CanoKey QEMU Virt Card"; license = licenses.asl20; maintainers = with maintainers; [ oxalica ]; + # Uses a four‐year‐old patched vendored version of Mbed TLS for + # cryptography that doesn’t build with CMake 4. Doesn’t build with + # gurrent versions of `canokey-core`, either. No upstream + # development since 2023. + broken = true; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7c78704ef8c6b..00521e0feb277 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -90,7 +90,7 @@ tpmSupport ? !minimal, uringSupport ? stdenv.hostPlatform.isLinux && !userOnly, liburing, - canokeySupport ? !minimal, + canokeySupport ? false, canokey-qemu, capstoneSupport ? !minimal, capstone, diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index de2b46050b725..11de395dc1a09 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -203,7 +203,7 @@ rec { glew110 openssl libidn - tbb + onetbb wayland libgbm libxkbcommon diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 4484739d0e59f..3c6126786fccc 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -690,7 +690,7 @@ stdenvNoCC.mkDerivation { # # Unfortunately, setting -B appears to override the default search # path. Thus, the gcc-specific "../includes-fixed" directory is - # now longer searched and glibc's header fails to + # no longer searched and glibc's header fails to # compile, because it uses "#include_next " to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 45319bad3f686..7f4ed2ff3e8c5 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -18,7 +18,7 @@ lib.extendMkDerivation { fetchSubrepos ? false, preferLocalBuild ? true, }: - # TODO: statically check if mercurial as the https support if the url starts with https. + # TODO: statically check if mercurial has https support if the url starts with https. { name = "hg-archive" + (lib.optionalString (name != null) "-${name}"); builder = ./builder.sh; diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index c9ed1cf0e36ed..4295d2bdd892d 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -235,7 +235,7 @@ lib.extendMkDerivation { ++ lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true" - (lib.optional (!allowGoReference) "-trimpath"); + (lib.optional (!finalAttrs.allowGoReference) "-trimpath"); inherit enableParallelBuilding; @@ -395,7 +395,8 @@ lib.extendMkDerivation { strictDeps = true; - disallowedReferences = lib.optional (!allowGoReference) go; + inherit allowGoReference; + disallowedReferences = lib.optional (!finalAttrs.allowGoReference) go; passthru = { inherit go; diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix index 3297764bb4bbd..15b6214a4ae3b 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor.nix +++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix @@ -22,9 +22,12 @@ let } (builtins.readFile ./replace-workspace-values.py); fetchCargoVendorUtil = writers.writePython3Bin "fetch-cargo-vendor-util" { - libraries = with python3Packages; [ - requests - ]; + libraries = + with python3Packages; + [ + requests + ] + ++ requests.optional-dependencies.socks; # to support socks proxy envs like ALL_PROXY in requests flakeIgnore = [ "E501" ]; diff --git a/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py index 708ce14a7e8f1..64fd7151d46c5 100644 --- a/pkgs/build-support/rust/replace-workspace-values.py +++ b/pkgs/build-support/rust/replace-workspace-values.py @@ -31,7 +31,12 @@ def replace_key( local_dep = table[key] del local_dep["workspace"] - workspace_dep = workspace_manifest[section][key] + try: + workspace_dep = workspace_manifest[section][key] + except KeyError: + # Key is not present in workspace manifest, we can't inherit the value, so we mark it for deletion + table[key] = {} + return True if section == "dependencies": if isinstance(workspace_dep, str): @@ -39,17 +44,17 @@ def replace_key( final: dict[str, Any] = workspace_dep.copy() - merged_features = local_dep.pop("features", []) + workspace_dep.get("features", []) + merged_features = local_dep.pop("features", []) + workspace_dep.get( + "features", [] + ) if merged_features: final["features"] = merged_features local_default_features = local_dep.pop( - "default-features", - local_dep.pop("default_features", None) + "default-features", local_dep.pop("default_features", None) ) workspace_default_features = workspace_dep.get( - "default-features", - workspace_dep.get("default_features") + "default-features", workspace_dep.get("default_features") ) if not workspace_default_features and local_default_features: @@ -63,7 +68,9 @@ def replace_key( final["package"] = local_dep.pop("package") if local_dep: - raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}") + raise Exception( + f"Unhandled keys in inherited dependency {key}: {local_dep}" + ) table[key] = final elif section == "package": @@ -104,10 +111,18 @@ def main() -> None: changed = False + to_remove = [] for key in crate_manifest["package"].keys(): - changed |= replace_key( + changed_key = replace_key( workspace_manifest, crate_manifest["package"], "package", key ) + if changed_key and crate_manifest["package"][key] == {}: + # Key is missing from workspace manifest, mark for deletion + to_remove.append(key) + changed |= changed_key + # Remove keys which have no value + for key in to_remove: + del crate_manifest["package"][key] changed |= replace_dependencies(workspace_manifest, crate_manifest) diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_missing_field.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_missing_field.toml new file mode 100644 index 0000000000000..6474a38932858 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_missing_field.toml @@ -0,0 +1,13 @@ +[package] +name = "im_using_workspaces" +version = { workspace = true } +publish = false +readme.workspace = true +keywords = [ + "workspace", + "other_thing", + "third_thing", +] + +[dependencies] +bar = "1.0.0" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix index b52026190e290..e0f64510d61a8 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix @@ -8,4 +8,8 @@ runCommand "git-dependency-workspace-inheritance-test" { } '' cp --no-preserve=mode ${./crate_lints.toml} "$out" ${replaceWorkspaceValues} "$out" ${./workspace.toml} diff -u "$out" ${./want_lints.toml} + + cp --no-preserve=mode ${./crate_missing_field.toml} "$out" + ${replaceWorkspaceValues} "$out" ${./workspace.toml} + diff -u "$out" ${./want_missing_field.toml} '' diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_missing_field.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_missing_field.toml new file mode 100644 index 0000000000000..fc4b44bf7e500 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_missing_field.toml @@ -0,0 +1,12 @@ +[package] +name = "im_using_workspaces" +version = "1.0.0" +publish = false +keywords = [ + "workspace", + "other_thing", + "third_thing", +] + +[dependencies] +bar = "1.0.0" diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix index 9b539cf98d2d3..cc084c3e199b4 100644 --- a/pkgs/by-name/_7/_7zz/package.nix +++ b/pkgs/by-name/_7/_7zz/package.nix @@ -75,6 +75,10 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-unsafe-buffer-usage" "-Wno-cast-function-type-strict" ]) + # These three probably started to appear with clang 20 or 21: + "-Wno-c++-keyword" + "-Wno-implicit-void-ptr-cast" + "-Wno-nrvo" ] ); diff --git a/pkgs/by-name/aa/aalib/clang.patch b/pkgs/by-name/aa/aalib/clang.patch index 5f8fa80f387df..2ed572a906f4b 100644 --- a/pkgs/by-name/aa/aalib/clang.patch +++ b/pkgs/by-name/aa/aalib/clang.patch @@ -72,3 +72,11 @@ diff -ur a/src/aatest.c b/src/aatest.c #include "aalib.h" int main(int argc, char **argv) { +diff -ur a/src/aalib.c b/src/aalib.c +--- a/src/aalib.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aalib.c 2025-06-02 00:52:04.119364652 -0400 +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include diff --git a/pkgs/by-name/ab/abseil-cpp_202508/package.nix b/pkgs/by-name/ab/abseil-cpp/package.nix similarity index 100% rename from pkgs/by-name/ab/abseil-cpp_202508/package.nix rename to pkgs/by-name/ab/abseil-cpp/package.nix diff --git a/pkgs/by-name/ab/abseil-cpp_202501/package.nix b/pkgs/by-name/ab/abseil-cpp_202501/package.nix deleted file mode 100644 index 7fffca86c0373..0000000000000 --- a/pkgs/by-name/ab/abseil-cpp_202501/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - gtest, - static ? stdenv.hostPlatform.isStatic, - cxxStandard ? null, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "abseil-cpp"; - version = "20250127.1"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - tag = finalAttrs.version; - hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ="; - }; - - cmakeFlags = [ - (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true) - (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true) - (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) - ] - ++ lib.optionals (cxxStandard != null) [ - (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard) - ]; - - strictDeps = true; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ gtest ]; - - meta = { - description = "Open-source collection of C++ code designed to augment the C++ standard library"; - homepage = "https://abseil.io/"; - changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.GaetanLepage ]; - }; -}) diff --git a/pkgs/by-name/ab/abseil-cpp_202505/package.nix b/pkgs/by-name/ab/abseil-cpp_202505/package.nix deleted file mode 100644 index c1884d4a953d8..0000000000000 --- a/pkgs/by-name/ab/abseil-cpp_202505/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - gtest, - static ? stdenv.hostPlatform.isStatic, - cxxStandard ? null, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "abseil-cpp"; - version = "20250512.1"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - tag = finalAttrs.version; - hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk="; - }; - - cmakeFlags = [ - (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true) - (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true) - (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) - ] - ++ lib.optionals (cxxStandard != null) [ - (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard) - ]; - - strictDeps = true; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ gtest ]; - - meta = { - description = "Open-source collection of C++ code designed to augment the C++ standard library"; - homepage = "https://abseil.io/"; - changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.GaetanLepage ]; - }; -}) diff --git a/pkgs/by-name/ad/adaptivecpp/tests.nix b/pkgs/by-name/ad/adaptivecpp/tests.nix index 7ce1149ff6b76..68a2d41b58abe 100644 --- a/pkgs/by-name/ad/adaptivecpp/tests.nix +++ b/pkgs/by-name/ad/adaptivecpp/tests.nix @@ -9,7 +9,7 @@ # Not setting an explicit target makes it default to the generic target. targets ? null, enablePstlTests ? false, - tbb, + onetbb, cmake, boost, }: @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - tbb + onetbb ]; buildInputs = [ boost ]; diff --git a/pkgs/by-name/af/aften/package.nix b/pkgs/by-name/af/aften/package.nix index b0960550c8579..f95f018bc21e7 100644 --- a/pkgs/by-name/af/aften/package.nix +++ b/pkgs/by-name/af/aften/package.nix @@ -23,6 +23,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSHARED=ON" ]; + # Fix the build with CMake 4. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 2.4)' \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)' + ''; + meta = { description = "Audio encoder which generates compressed audio streams based on ATSC A/52 specification"; homepage = "https://aften.sourceforge.net/"; diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index 2e00c9c5eb4eb..4a71ca7879d77 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -61,12 +61,6 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "tests"; - checkFlags = lib.optionals stdenv.hostPlatform.isMusl [ - # equality tests are broken on musl due to different priority values - # https://gitlab.com/apparmor/apparmor/-/issues/513 - "-o equality" - ]; - postCheck = "popd"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; diff --git a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix index 28679553b7bf3..88ebf23ee2731 100644 --- a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix +++ b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix @@ -36,21 +36,5 @@ self: super: { llvm-readtapi --filetype=tbd-v4 usr/lib/$libSystem~ -o usr/lib/$libSystem rm usr/lib/$libSystem~ done - - # Strip weak C++ symbols to work around `libc++` leakage in system - # frameworks for now. These are only present on `x86_64-darwin`, so - # it should hopefully be harmless. - # - # TODO FIXME: This is kind of horrible. - while read -r -d "" stub; do - printf 'Stripping weak C++ symbols from %s\n' "$stub" - llvm-readtapi --filetype=tbd-v5 "$stub" \ - | jq ' - (.main_library, .libraries[]?).exported_symbols[]?.data.weak[]? |= - select(startswith("__Z") | not) - ' > $stub~ - llvm-readtapi --filetype=tbd-v4 $stub~ -o $stub - rm $stub~ - done < <(find . -name '*.tbd' -print0) ''; } diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json index 5157b58ce3df4..2dc99f12620d5 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json @@ -711,14 +711,14 @@ "version": "10063.101.15" } }, - "15.2": { + "15.5": { "CarbonHeaders": { "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", "version": "18.1" }, "CommonCrypto": { "hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=", - "version": "600033.60.1" + "version": "600035" }, "IOAudioFamily": { "hash": "sha256-VSk3jvsITJugtL67Qt0m4qJ879i7Fj6B/NGBFVCwpiU=", @@ -757,16 +757,16 @@ "version": "261" }, "IOGraphics": { - "hash": "sha256-Ag37fd3tZJLXLVq1yzHOCWGOYYfwwTkC8hnvNaTEaWg=", - "version": "598" + "hash": "sha256-iysZE42mOKZbFxSZBNspaBTCRKEKK38DFGBxZWQxZxI=", + "version": "599" }, "IOHIDFamily": { - "hash": "sha256-utWAwmn9jss/6fc4flDHXeJR5ZBymO0ZFbDFIFVBnt4=", - "version": "2104.61.1" + "hash": "sha256-gEYPyjXgQ2ABGufCKPjmzMdNRLxhELkCvOURCokyTO4=", + "version": "2115.100.21" }, "IOKitUser": { - "hash": "sha256-vfz/kLZlVyoHKOlrNdNrf2HcUOB6bY+mpbCvEEg2sus=", - "version": "100140.60.14" + "hash": "sha256-p32U+jHfwA/tqnjF4p1BmojghEXK8KxiflW3IHs2iIY=", + "version": "100150.120.2" }, "IONetworkingFamily": { "hash": "sha256-gZ7Dkk4Iu7AV9K2ioqSeJ1W7bTNxv77bmT18iv3ljLg=", @@ -777,28 +777,28 @@ "version": "93" }, "IOStorageFamily": { - "hash": "sha256-tjzvlJYVjSTG7oF3AhHgCASKax1fYjOBAxcsrKh/urY=", - "version": "317.40.2" + "hash": "sha256-/0H0tqWUWkgYigYypucbc7lOCFYDuukwF9fvLEOhwOk=", + "version": "323" }, "IOUSBFamily": { "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", "version": "630.4.5" }, "Libc": { - "hash": "sha256-/J1Oawa+cMbcAlMlpr6ce32KQQp2lMGnfbRi/2Oc1cY=", - "version": "1669.60.4" + "hash": "sha256-nWDokN0Vr5pUyNGculnDOah9RNgHiWr3S13RSQLmZrc=", + "version": "1698.100.8" }, "Libinfo": { - "hash": "sha256-D7JMCakQVCQ9j2zUHQSGB8zZcHD6azwYY3bsJU0JfEE=", - "version": "592" + "hash": "sha256-UI5mGvzZ6BPafGYD6CrNAJAKjeJLB6urAS2lpB6X/Ec=", + "version": "597" }, "Libm": { "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", "version": "2026" }, "Libnotify": { - "hash": "sha256-XwVB4sYXPLAHDuLv8mxAWlC1ia17V4cf73DEJDDm4ck=", - "version": "327.60.1" + "hash": "sha256-GDYMVi1034f9empq0YOuumQp/BDJ7phTb0Zl4KTY9xg=", + "version": "342" }, "Librpcsvc": { "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", @@ -813,80 +813,80 @@ "version": "146" }, "Security": { - "hash": "sha256-sRpFQyMk3x4kRthXpqeAnfQ9dE5RMxiSFUiUKRCneck=", - "version": "61439.60.117" + "hash": "sha256-ZOrOOCk+hZbzDilzkihpQfsDpzV3Ul4zy6fpFRWUQHw=", + "version": "61439.120.27" }, "architecture": { "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", "version": "282" }, "configd": { - "hash": "sha256-xRaEzq/OOMBi7lvi2bV2/ObN5JJJ5vcFy8DGHLItUWM=", - "version": "1351" + "hash": "sha256-ZdUq1SrOwB88Lx68ekrA4zeVsLDZz4TAJywNnF+uAzY=", + "version": "1351.120.3" }, "copyfile": { - "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=", - "version": "213.40.2" + "hash": "sha256-rLqT6e44W2ohgwUXREmiOyJBYCrV3gRLbtVnbUq60xc=", + "version": "221.121.1" }, "dtrace": { "hash": "sha256-iNEZyxK3DmEwO3gzrfvCaVZSEuuOMQm5IG/6FodPNdI=", "version": "411" }, "dyld": { - "hash": "sha256-DDhV7X81nhd3oeJuICEvF8FU43yE/afQ/LYgDNtXswA=", - "version": "1241.17" + "hash": "sha256-4OOghgUYyMJbsTe96fiWCndTJ1BS94rK9v6Kqn/ooYs=", + "version": "1285.19" }, "eap8021x": { - "hash": "sha256-2FdEb76KBbCAl2iwly4c1Xstar53O8qgGdN/3WXO23U=", - "version": "364" + "hash": "sha256-Kx/wwnt108hDm0qQPyTNbZ8KoHkD5m7L4yb5qjSuQjI=", + "version": "365.120.2" }, "hfs": { - "hash": "sha256-isTLSBDxh12W10I5KY6O6SsygqnOvqJ0TfdWIKSK3pM=", - "version": "677.60.1" + "hash": "sha256-5/3Ycp3cKqlgAl1kjBmbF5tFlfJYQS5rbrbk4SS66b8=", + "version": "683.120.3" }, "launchd": { "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", "version": "842.1.4" }, "libclosure": { - "hash": "sha256-I0PKQFnoJVRMA7H3yT+inHS0454/FXHhQB6nwmHFvFs=", - "version": "95" + "hash": "sha256-pvwfcbeEJmTEPdt6/lgVswiabLRG+sMN6VT5FwG7C4Q=", + "version": "96" }, "libdispatch": { - "hash": "sha256-f2ex/53OFeSR5A0nMapxC6AocqBSweecNtEhp4bWjhE=", - "version": "1504.60.7" + "hash": "sha256-jTp2DolOOCQPBt1HRotkmPnKgQ2LGgniEqeHoM+vlKg=", + "version": "1521.120.4" }, "libmalloc": { - "hash": "sha256-Rw/9s7yY3qPtKfDhP+p+0z+aaCsxgwvdUyRG2V1N6D8=", - "version": "657.60.21" + "hash": "sha256-d9AVHSYTqHDlgctv8Hh4HAYW53MJelj4F8LWPsjrsws=", + "version": "715.120.13" }, "libplatform": { - "hash": "sha256-o/W1pQ9yGTE8HQlGcggM+XiJbEyqgc/s0uiY3+yBtnA=", - "version": "340.60.2" + "hash": "sha256-gpijoTMvdkM0PdG8gyIllOJlh/MtTc4ro9ODDAhN6gM=", + "version": "349" }, "libpthread": { - "hash": "sha256-eYHDAt2wNk7hJZJxsC7Y9w4ASKdexidu613kPo7TAKs=", - "version": "535" + "hash": "sha256-N+MMXdbthsxauTTfZ5ElUs39dVH+Chn1yyU6pObZpkU=", + "version": "536" }, "mDNSResponder": { - "hash": "sha256-mDyY/2S4EHbGh02J6VWZVxhNXXZmWGX+NjUjPfMZgZA=", - "version": "2559.60.39.0.1" + "hash": "sha256-ILx12PRxj/+VqfpCCErJFEJXFI9yzTh4g+FK0UCenIE=", + "version": "2600.120.12" }, "objc4": { - "hash": "sha256-uBFS5extMQkXAXJfPtPlBYAQpz+zsRHQnEaLpDOcYGM=", - "version": "928.3" + "hash": "sha256-DMxa25gXjKCkiDnVJ/8SyJUjaBlmBGABg8EfCHcmTj0=", + "version": "940.4" }, "ppp": { "hash": "sha256-8+QUA79sHf85yvGSPE9qCmGsrZDT3NZnbgZVroJw/Hg=", "version": "1016" }, "removefile": { - "hash": "sha256-h1jb4DcgDHwi9eiUguc2e5OLP8ZHxCN3B4Myp/DFDBg=", - "version": "75" + "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=", + "version": "81" }, "xnu": { - "hash": "sha256-o8CxHvM2OXiAWJmnFe5ERQYnrNyJ+Bpdb9H0sjd6L10=", - "version": "11215.61.5" + "hash": "sha256-o4tCuCAIgAYg/Li3wTs12mVWr5C/4vbwu1zi+kJ9d6w=", + "version": "11417.121.6" } } } diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 8de44211cfa10..6c0b1ecabf462 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -33,10 +33,10 @@ }, "15": { "urls": [ - "https://swcdn.apple.com/content/downloads/36/33/072-44426-A_G1AII30AST/ddbss9h6gse6a32rg6luosbrm6vgniu033/CLTools_macOSNMOS_SDK.pkg", - "https://web.archive.org/web/20250210234739/https://swcdn.apple.com/content/downloads/36/33/072-44426-A_G1AII30AST/ddbss9h6gse6a32rg6luosbrm6vgniu033/CLTools_macOSNMOS_SDK.pkg" + "https://swcdn.apple.com/content/downloads/52/01/082-41241-A_0747ZN8FHV/dectd075r63pppkkzsb75qk61s0lfee22j/CLTools_macOSNMOS_SDK.pkg", + "https://web.archive.org/web/20250530132510/https://swcdn.apple.com/content/downloads/52/01/082-41241-A_0747ZN8FHV/dectd075r63pppkkzsb75qk61s0lfee22j/CLTools_macOSNMOS_SDK.pkg" ], - "version": "15.2", - "hash": "sha256-OP5Ah/JnSZ6sD42BD5vGDmikgFzjsfFBmz1hvQD1dOI=" + "version": "15.5", + "hash": "sha256-HBiSJuw1XBUK5R/8Sj65c3rftSEvQl/O9ZZVp/g1Amo=" } } diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index e33b1116c061d..215cda4ba4590 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -7,47 +7,51 @@ bashNonInteractive, buildPackages, linuxHeaders, - python3, + python3Packages, swig, - pkgsCross, libcap_ng, installShellFiles, + makeWrapper, + gawk, + gnugrep, + coreutils, - # Enabling python support while cross compiling would be possible, but the - # configure script tries executing python to gather info instead of relying on - # python3-config exclusively - enablePython ? stdenv.hostPlatform == stdenv.buildPlatform, + enablePython ? !stdenv.hostPlatform.isStatic, + + # passthru nix-update-script, testers, nixosTests, + pkgsStatic ? { }, # CI has allowVariants = false, in which case pkgsMusl would not be passed. So, instead add a default here. + pkgsMusl ? { }, }: stdenv.mkDerivation (finalAttrs: { pname = "audit"; - version = "4.1.1-unstable-2025-08-01"; + version = "4.1.2-unstable-2025-09-06"; # fixes to non-static builds right after 4.1.2 release src = fetchFromGitHub { owner = "linux-audit"; repo = "audit-userspace"; - rev = "bee5984843d0b38992a369825a87a65fb54b18fc"; # musl fixes, --disable-legacy-actions and --runstatedir support - hash = "sha256-l3JHWEHz2xGrYxEvfCUD29W8xm5llUnXwX5hLymRG74="; + rev = "cb13fe75ee2c36d5c525ed9de22aae10dbc8caf4"; + hash = "sha256-NX0TWA+LtcZgbM9aQfokWv2rGNAAb3ksGqAH8URAkYM="; }; postPatch = '' substituteInPlace bindings/swig/src/auditswig.i \ --replace-fail "/usr/include/linux/audit.h" \ "${linuxHeaders}/include/linux/audit.h" + '' + + lib.optionalString (enablePython && finalAttrs.finalPackage.doCheck) '' + patchShebangs auparse/test/auparse_test.py ''; - # https://github.com/linux-audit/audit-userspace/issues/474 - # building databuf_test fails otherwise, as that uses hidden symbols only available in the static builds - dontDisableStatic = true; - outputs = [ "bin" "lib" "dev" "out" "man" + "scripts" ]; strictDeps = true; @@ -59,9 +63,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook installShellFiles + makeWrapper ] ++ lib.optionals enablePython [ - python3 + python3Packages.python # for python3-config swig ]; @@ -87,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { # capability dropping, currently mostly for plugins as those get spawned as root # see auditd-plugins(5) "--with-libcap-ng=yes" - (if enablePython then "--with-python" else "--without-python") + (lib.withFeature enablePython "python3") ]; __structuredAttrs = true; @@ -98,16 +103,55 @@ stdenv.mkDerivation (finalAttrs: { bashNonInteractive ]; + # bin output is used if audit is enabled, becoming part of the system closure. + outputChecks.bin.disallowedRequisites = [ + bash + bashNonInteractive + ]; + + nativeCheckInputs = lib.optionals enablePython [ + python3Packages.pythonImportsCheckHook + ]; + + pythonImportsCheck = [ "audit" ]; + + enableParallelChecking = false; + doCheck = true; + postInstall = '' installShellCompletion --bash init.d/audit.bash_completion ''; + # augenrules is a bit broken, but may be helpful to collect audit rules in a builder. + # It is not required on a running system, it can just go into its own output. + # audit-rules.service relies on augenrules, and is not useful on a nixos system. + # It is intended to collect rule files from /etc/audit/rules.d, which we don't set up. + # Instead, we load audit rules in a dedicated module. + postFixup = '' + moveToOutput bin/augenrules $scripts + substituteInPlace $scripts/bin/augenrules \ + --replace-fail "/sbin/auditctl -R" "$bin/bin/auditctl -R" \ + --replace-fail "auditctl -s" "$bin/bin/auditctl -s" \ + --replace-fail "/bin/ls" "ls" + wrapProgram $scripts/bin/augenrules \ + --prefix PATH : ${ + lib.makeBinPath [ + gawk + gnugrep + coreutils + ] + } + + rm $out/lib/systemd/system/audit-rules.service + ''; + enableParallelBuilding = true; passthru = { updateScript = nix-update-script { }; tests = { - musl = pkgsCross.musl64.audit; + musl = pkgsMusl.audit or null; + static = pkgsStatic.audit or null; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; audit = nixosTests.audit; }; @@ -116,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://people.redhat.com/sgrubb/audit/"; description = "Audit Library"; - changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.1"; + changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.2"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ grimmauld ]; pkgConfigModules = [ diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix index ffd7a0679cd93..9da9946f42714 100644 --- a/pkgs/by-name/au/autotier/package.nix +++ b/pkgs/by-name/au/autotier/package.nix @@ -8,7 +8,7 @@ boost, fuse3, lib45d, - tbb_2022, + onetbb, liburing, installShellFiles, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { boost fuse3 lib45d - tbb_2022 + onetbb liburing ]; diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix index 48c1a85ac8433..0fdb9c282641d 100644 --- a/pkgs/by-name/aw/aws-c-auth/package.nix +++ b/pkgs/by-name/aw/aws-c-auth/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; # nixpkgs-update: no auto update - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; - rev = "v${version}"; - hash = "sha256-HzDUINTmgjW7rNEe+5iwZBv6ayxNKmGAJy+Lg4tp1t0="; + tag = "v${version}"; + hash = "sha256-8oQTTqBuEzhBUWqXHVYrGtaX44SmB2sJQZchiweHekM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-c-common/package.nix b/pkgs/by-name/aw/aws-c-common/package.nix index e2b86d35fec96..33d8dd77c2c18 100644 --- a/pkgs/by-name/aw/aws-c-common/package.nix +++ b/pkgs/by-name/aw/aws-c-common/package.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { let ignoreTests = [ "promise_test_multiple_waiters" + # Flaky test https://github.com/NixOS/nixpkgs/issues/443233 + "test_memory_usage_maxrss" ]; in '' diff --git a/pkgs/by-name/aw/aws-c-event-stream/package.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix index d71b3861e6ab5..93a7d254ad029 100644 --- a/pkgs/by-name/aw/aws-c-event-stream/package.nix +++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; # nixpkgs-update: no auto update - version = "0.5.5"; + version = "0.5.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-event-stream"; rev = "v${version}"; - hash = "sha256-wVjpDKKwoksq5gFtvhH76c7ciP0XmMozhkWmzY6GwgU="; + hash = "sha256-JvjUrIj1bh5WZEzkauLSLIolxrT8CKIMjO7p1c35XZI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/aw/aws-c-io/package.nix b/pkgs/by-name/aw/aws-c-io/package.nix index 68efabd3aef1a..f130056cdada9 100644 --- a/pkgs/by-name/aw/aws-c-io/package.nix +++ b/pkgs/by-name/aw/aws-c-io/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; # nixpkgs-update: no auto update - version = "0.21.2"; + version = "0.22.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-io"; rev = "v${version}"; - hash = "sha256-QNf4TJIqtypDliiu6I72CbgjyJhdS9Uuim9tZOb3SJs="; + hash = "sha256-NOEjXk4s/FV4CdmyXOr4Oh2y+pFNrUMP/Sy+X+fVQc4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/aw/aws-c-s3/package.nix b/pkgs/by-name/aw/aws-c-s3/package.nix index 88419b389db46..b4787f2db12db 100644 --- a/pkgs/by-name/aw/aws-c-s3/package.nix +++ b/pkgs/by-name/aw/aws-c-s3/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; # nixpkgs-update: no auto update - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - hash = "sha256-g2w1igjv0N0o6+bewypJm2coHTvhYN2v8usdMN7TBI4="; + hash = "sha256-8yUwgiZ50BiItapeg0zIc5vr0+OFHvzIRrwWH4lQFBM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-crt-cpp/package.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix index b8b35b095602b..d5629c850d1fd 100644 --- a/pkgs/by-name/aw/aws-crt-cpp/package.nix +++ b/pkgs/by-name/aw/aws-crt-cpp/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; # nixpkgs-update: no auto update - version = "0.33.1"; + version = "0.34.3"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-C8KWe5+CXujD8nN3gLkjaaMld15sat/ohwEKhyWELKI="; + sha256 = "sha256-jKmIsWAzxnfsNgHavR6crhIQXVJq/PbQgaj4KVGrMP0="; }; postPatch = '' diff --git a/pkgs/by-name/aw/aws-sdk-cpp/package.nix b/pkgs/by-name/aw/aws-sdk-cpp/package.nix index 28b2e2bb146cd..4471a43b92438 100644 --- a/pkgs/by-name/aw/aws-sdk-cpp/package.nix +++ b/pkgs/by-name/aw/aws-sdk-cpp/package.nix @@ -35,13 +35,13 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; # nixpkgs-update: no auto update - version = "1.11.612"; + version = "1.11.647"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; tag = version; - hash = "sha256-W4eKgUvN2NLYEOO47HTJYJpEmyn10gNK29RIrvoXkek="; + hash = "sha256-RJKR0xw3HTNItaLGyYCjibmfK3UBDA4hfAZzQ0xYg9U="; }; postPatch = '' diff --git a/pkgs/by-name/aw/awscli/package.nix b/pkgs/by-name/aw/awscli/package.nix index 298f46a9773c1..35018deb4cf70 100644 --- a/pkgs/by-name/aw/awscli/package.nix +++ b/pkgs/by-name/aw/awscli/package.nix @@ -14,14 +14,14 @@ let pname = "awscli"; # N.B: if you change this, change botocore and boto3 to a matching version too # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py - version = "1.42.4"; + version = "1.42.18"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; tag = version; - hash = "sha256-vkQFhSsK9MWhp+jvomkVdjxXuBOH4GnFgz/9jtPRNIs="; + hash = "sha256-f6CVQotsdvU2g/GjOMWPay/7FxxRvhtBrVZE5TLHTNY="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index 646344d6ae041..441b62d5a67fe 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -34,7 +34,7 @@ opencv, pcre, systemd, - tbb_2022, + onetbb, webkitgtk_4_1, wxGTK31, xorg, @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { opencascade-occt_7_6 openvdb pcre - tbb_2022 + onetbb webkitgtk_4_1 wxGTK' xorg.libX11 diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix index 3a1acbf76abca..7abb156858fae 100644 --- a/pkgs/by-name/ba/basalt-monado/package.nix +++ b/pkgs/by-name/ba/basalt-monado/package.nix @@ -20,7 +20,7 @@ opencv, pkg-config, stdenv, - tbb, + onetbb, xorg, cudaPackages, enableCuda ? config.cudaSupport, @@ -58,7 +58,7 @@ stdenv.mkDerivation { lz4 magic-enum opencv.cxxdev - tbb + onetbb xorg.libX11 ] ++ lib.optionals enableCuda [ diff --git a/pkgs/by-name/bc/bcache-tools/package.nix b/pkgs/by-name/bc/bcache-tools/package.nix index 0b20b7d004757..9220ff281f256 100644 --- a/pkgs/by-name/bc/bcache-tools/package.nix +++ b/pkgs/by-name/bc/bcache-tools/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { -e "/INSTALL.*initcpio\/install/d" \ -e "/INSTALL.*dracut\/module-setup.sh/d" \ -e "/INSTALL.*probe-bcache/d" \ + -e "s/pkg-config/$PKG_CONFIG/" \ -i Makefile # * Remove probe-bcache which is handled by util-linux sed -e "/probe-bcache/d" \ diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index 608e81a4ddd3a..1a378885979dd 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -5,6 +5,7 @@ cmake, elfutils, fetchFromGitHub, + fetchpatch, flex, iperf, lib, @@ -43,6 +44,12 @@ python3Packages.buildPythonApplication rec { (replaceVars ./absolute-ausyscall.patch { ausyscall = lib.getExe' audit "ausyscall"; }) + + (fetchpatch { + name = "clang-21.patch"; + url = "https://github.com/iovisor/bcc/commit/8c5c96ad3beeed2fa827017f451a952306826974.diff"; + hash = "sha256-VOzhdeZ3mRstLlMhxHwEgqCa6L39eRpbFJuKZqFnBws="; + }) ]; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/bc/bcg729/package.nix b/pkgs/by-name/bc/bcg729/package.nix index 7dc3ccb8cd64c..942e9e4d6ebcb 100644 --- a/pkgs/by-name/bc/bcg729/package.nix +++ b/pkgs/by-name/bc/bcg729/package.nix @@ -22,7 +22,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} + --replace-fail '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} + + # cmake 4 compatibility, upstream has patches but they don't backport cleanly + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" ''; meta = { diff --git a/pkgs/by-name/bl/blasfeo/package.nix b/pkgs/by-name/bl/blasfeo/package.nix index 8053b628b59f5..1355e51da77e2 100644 --- a/pkgs/by-name/bl/blasfeo/package.nix +++ b/pkgs/by-name/bl/blasfeo/package.nix @@ -1,6 +1,7 @@ { cmake, fetchFromGitHub, + fetchpatch, lib, stdenv, withTarget ? "GENERIC", @@ -17,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-p1pxqJ38h6RKXMg1t+2RHlfmRKPuM18pbUarUx/w9lw="; }; + patches = [ + (fetchpatch { + name = "blasfeo-fix-cmake-4.patch"; + url = "https://github.com/giaf/blasfeo/commit/75078e2b6153d1c8bc5329e83a82d4d4d3eefd76.patch"; + hash = "sha256-bH5xUKAjNFCO9rRc655BcMiUesNFFln+iEPC5JHcQAU="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DTARGET=${withTarget}" ]; diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index bc02d8848575a..dc4f903ade7f9 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -74,7 +74,7 @@ spaceNavSupport ? stdenv.hostPlatform.isLinux, sse2neon, stdenv, - tbb_2022, + onetbb, vulkan-headers, vulkan-loader, wayland, @@ -112,8 +112,6 @@ let tag = "v8.0.0"; hash = "sha256-SXkXZHzQH8JOkXypjjxNvT/lUlWZkCuhh6hNCHE7FkY="; }; - - tbb = tbb_2022; in stdenv'.mkDerivation (finalAttrs: { @@ -262,20 +260,20 @@ stdenv'.mkDerivation (finalAttrs: { openexr openimageio openjpeg - (openpgl.override { inherit tbb; }) + openpgl (opensubdiv.override { inherit cudaSupport; }) - (openvdb.override { inherit tbb; }) + openvdb potrace pugixml python3 python3Packages.materialx - tbb + onetbb zlib zstd ] ++ lib.optional embreeSupport embree ++ lib.optional hipSupport rocmPackages.clr - ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport tbb; }) + ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; }) ++ ( if (!stdenv.hostPlatform.isDarwin) then [ diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index c221957f8f3e9..6cdfb11e29544 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -53,22 +53,17 @@ stdenv.mkDerivation (finalAttrs: { ]; # Disabled tests: + # * cmd-interrupt: tries to `SIGINT` make itself, flaky as a result # * directive-export{,-gmake}: another failure related to TZ variables # * opt-keep-going-indirect: not yet known - # * varmod-localtime: musl doesn't support TZDIR and this test relies on - # impure, implicit paths - # * interrupt-compat (fails on x86_64-linux building for i686-linux) - env.BROKEN_TESTS = lib.concatStringsSep " " ( - [ - "directive-export" - "directive-export-gmake" - "opt-keep-going-indirect" - "varmod-localtime" - ] - ++ lib.optionals stdenv.targetPlatform.is32bit [ - "interrupt-compat" - ] - ); + # * varmod-localtime: musl doesn't support TZDIR and this test relies on impure, implicit paths + env.BROKEN_TESTS = lib.concatStringsSep " " [ + "cmd-interrupt" + "directive-export" + "directive-export-gmake" + "opt-keep-going-indirect" + "varmod-localtime" + ]; strictDeps = true; diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index bb5b68f8eefa5..d4616fbd002be 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { ]; separateDebugInfo = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "musl"; + __structuredAttrs = true; + nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/bo/bowtie2/package.nix b/pkgs/by-name/bo/bowtie2/package.nix index adc49a98e353b..5286edb36f81c 100644 --- a/pkgs/by-name/bo/bowtie2/package.nix +++ b/pkgs/by-name/bo/bowtie2/package.nix @@ -5,7 +5,7 @@ cmake, perl, python3, - tbb, + onetbb, zlib, runCommand, bowtie2, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = [ - tbb + onetbb zlib python3 perl diff --git a/pkgs/by-name/br/brickstore/package.nix b/pkgs/by-name/br/brickstore/package.nix index 44ba98dd143a5..f3d36b7f2b54c 100644 --- a/pkgs/by-name/br/brickstore/package.nix +++ b/pkgs/by-name/br/brickstore/package.nix @@ -7,7 +7,7 @@ gst_all_1, cmake, libglvnd, - tbb, + onetbb, ninja, pkg-config, }: @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qttools qt6.qtwayland qt6.wrapQtAppsHook - tbb + onetbb ]; patches = [ diff --git a/pkgs/by-name/br/brunsli/package.nix b/pkgs/by-name/br/brunsli/package.nix index c687020c0a312..1a0399733fb8c 100644 --- a/pkgs/by-name/br/brunsli/package.nix +++ b/pkgs/by-name/br/brunsli/package.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' rm -r build + '' + # fix build with cmake v4, should be removed in next release + + '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 3.1)' 'cmake_minimum_required(VERSION 3.10)' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/bt/btor2tools/package.nix b/pkgs/by-name/bt/btor2tools/package.nix index e47800f7aa2c2..50591eba7f098 100644 --- a/pkgs/by-name/bt/btor2tools/package.nix +++ b/pkgs/by-name/bt/btor2tools/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "btor2tools"; - version = "0-unstable-2024-08-07"; + version = "0-unstable-2025-09-18"; src = fetchFromGitHub { owner = "boolector"; repo = "btor2tools"; - rev = "44bcadbfede292ff4c4a4a8962cc18130de522fb"; - sha256 = "0ncl4xwms8d656x95ga8v8zjybx4cmdl5hlcml7dpcgm3p8qj4ks"; + rev = "d33c73ff1d173f1bfac8ba6b1c6d68ba62c55f8e"; + sha256 = "sha256-RVjZ5HM2yQ3eAICFuzwvNeQDXzWzzSiCCslIWMJi6U8="; }; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; diff --git a/pkgs/by-name/bu/bullet/package.nix b/pkgs/by-name/bu/bullet/package.nix index 2877168712942..ed90d083b421a 100644 --- a/pkgs/by-name/bu/bullet/package.nix +++ b/pkgs/by-name/bu/bullet/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, libGLU, libGL, @@ -26,6 +27,14 @@ stdenv.mkDerivation rec { libglut ]; + patches = [ + # fix for CMake v4, merged upstream + (fetchpatch { + url = "https://github.com/bulletphysics/bullet3/commit/d1a4256b3a019117f2bb6cb8c63d6367aaf512e2.patch"; + hash = "sha256-FklMKYw5dKUcR5kZOkqv+KVLcWL/7r/0SAdYolmrn5A="; + }) + ]; + postPatch = '' substituteInPlace examples/ThirdPartyLibs/Gwen/CMakeLists.txt \ --replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing" diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix index d8144db6aa423..2672addf2fffb 100644 --- a/pkgs/by-name/ca/cabinpkg/package.nix +++ b/pkgs/by-name/ca/cabinpkg/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - tbb_2022, + onetbb, libgit2, curl, fmt, @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgit2 fmt - tbb_2022 + onetbb nlohmann_json curl ]; diff --git a/pkgs/by-name/ca/casadi/clang-19.diff b/pkgs/by-name/ca/casadi/clang-19.diff deleted file mode 100644 index e7706cb320ba1..0000000000000 --- a/pkgs/by-name/ca/casadi/clang-19.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/casadi/interfaces/clang/clang_compiler.hpp b/casadi/interfaces/clang/clang_compiler.hpp -index 7f54853..9f8d4b1 100644 ---- a/casadi/interfaces/clang/clang_compiler.hpp -+++ b/casadi/interfaces/clang/clang_compiler.hpp -@@ -52,7 +52,7 @@ - #include "llvm/IR/LLVMContext.h" - //#include "llvm/IR/Verifier.h" - #include --#include -+#include - #include - #include - #include -diff --git a/cmake/FindCLANG.cmake b/cmake/FindCLANG.cmake -index 4edf60b..f23a348 100644 ---- a/cmake/FindCLANG.cmake -+++ b/cmake/FindCLANG.cmake -@@ -16,7 +16,7 @@ set(CLANG_CXX_FLAGS "-fPIC -fvisibility-inlines-hidden -ffunction-sections -fdat - set(CLANG_INCLUDE_DIR ${LLVM_INSTALL_PREFIX}/include) - - # All clang libraries --set(CLANG_DEP clangFrontend clangDriver clangCodeGen clangRewriteFrontend clangSerialization clangParse clangSema clangAnalysis clangEdit clangAST clangLex clangBasic ${LLVM_DEP}) -+set(CLANG_DEP clangFrontend clangDriver clangCodeGen clangRewriteFrontend clangSerialization clangParse clangSema clangAPINotes clangAnalysis clangEdit clangAST clangLex clangBasic ${LLVM_DEP}) - - # Get libraries - set(CLANG_LIBRARIES) -@@ -86,7 +86,7 @@ set(CLANG_INCLUDE_DIR ${CLANG_LLVM_INCLUDE_DIR}) - - # All clang libraries - set(CLANG_DEP clangFrontend clangDriver clangCodeGen clangRewriteFrontend clangSerialization -- clangParse clangSema clangAnalysis clangEdit clangAST clangLex clangBasic) -+ clangParse clangSema clangAPINotes clangAnalysis clangEdit clangAST clangLex clangBasic) - - # Get libraries - foreach(D ${CLANG_DEP}) diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index c2a247525efc1..73df0e0d930b6 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -38,20 +38,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "casadi"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "casadi"; repo = "casadi"; tag = finalAttrs.version; - hash = "sha256-554ZN+GfkGHN0cthsb/fPWdo+U2IqLz4q+x60SxRAfk="; + hash = "sha256-I6CYtKVvE67NSYH/JGJFP5wHhm1xACctz7uTwOFFihA="; }; patches = [ - # update include file path and link with clangAPINotes - # https://github.com/casadi/casadi/issues/3969 - ./clang-19.diff - # Add missing include # ref. https://github.com/casadi/casadi/pull/4192 (fetchpatch { @@ -77,11 +73,6 @@ stdenv.mkDerivation (finalAttrs: { "FATROP HPIPM" \ "FATROP hpipm" - # nix provide lib/clang headers in libclang, not in llvm. - substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \ - '$'{CLANG_LLVM_LIB_DIR} \ - ${lib.getLib llvmPackages.libclang}/lib - # help casadi find its own libs substituteInPlace casadi/core/casadi_os.cpp --replace-fail \ "std::vector search_paths;" \ @@ -108,11 +99,6 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace casadi/interfaces/hpipm/hpipm_runtime.hpp --replace-fail \ "d_print_exp_tran_mat" \ "//d_print_exp_tran_mat" - - # fix missing symbols - substituteInPlace cmake/FindCLANG.cmake --replace-fail \ - "clangBasic)" \ - "clangBasic clangASTMatchers clangSupport)" ''; nativeBuildInputs = [ @@ -189,7 +175,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_TINYXML" true) (lib.cmakeBool "WITH_BUILD_DSDP" true) # not sure where this come from (lib.cmakeBool "WITH_DSDP" true) - (lib.cmakeBool "WITH_CLANG" true) + # "clang_compiler.cpp has basically been abandonded for several years", ref. + # https://github.com/casadi/casadi/issues/4225#issuecomment-3352552113 + (lib.cmakeBool "WITH_CLANG" false) (lib.cmakeBool "WITH_LAPACK" true) (lib.cmakeBool "WITH_QPOASES" true) (lib.cmakeBool "WITH_BLOCKSQP" true) @@ -223,6 +211,7 @@ stdenv.mkDerivation (finalAttrs: { Python or Matlab/Octave ''; homepage = "https://github.com/casadi/casadi"; + changelog = "https://github.com/casadi/casadi/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ nim65s ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ca/catch/package.nix b/pkgs/by-name/ca/catch/package.nix deleted file mode 100644 index 96bb28887d196..0000000000000 --- a/pkgs/by-name/ca/catch/package.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, -}: - -stdenv.mkDerivation rec { - pname = "catch"; - version = "1.12.2"; - - src = fetchFromGitHub { - owner = "catchorg"; - repo = "Catch"; - rev = "v${version}"; - sha256 = "1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23"; - }; - - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DUSE_CPP14=ON" ]; - - patches = [ - # https://github.com/catchorg/Catch2/pull/2151 - (fetchpatch { - url = "https://github.com/catchorg/Catch2/commit/bb6d08323f23a39eb65dd86671e68f4f5d3f2d6c.patch"; - sha256 = "1vhbzx84nrhhf9zlbl6h5zmg3r5w5v833ihlswsysb9wp2i4isc5"; - }) - - # Fix glibc-2.34 build - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/catch1/raw/23276476148a657e7a45ade547f858cbf965a33a/f/catch1-sigstksz.patch"; - sha256 = "sha256-XSsI3iDEZCUSbozlYWC0y/LZ7qr/5zwACpn1jHKD0yU="; - }) - ]; - - doCheck = true; - checkTarget = "test"; - - meta = with lib; { - description = "Multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; - homepage = "http://catch-lib.net"; - license = licenses.boost; - maintainers = with maintainers; [ - edwtjo - ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/by-name/ca/catch2/package.nix similarity index 100% rename from pkgs/development/libraries/catch2/default.nix rename to pkgs/by-name/ca/catch2/package.nix diff --git a/pkgs/by-name/ca/catch2_3/clang-20-disable-broken-test.patch b/pkgs/by-name/ca/catch2_3/clang-20-disable-broken-test.patch new file mode 100644 index 0000000000000..372243455aed9 --- /dev/null +++ b/pkgs/by-name/ca/catch2_3/clang-20-disable-broken-test.patch @@ -0,0 +1,15 @@ +diff --git a/tests/SelfTest/UsageTests/Misc.tests.cpp b/tests/SelfTest/UsageTests/Misc.tests.cpp +index 3697f0695c..8c10aace7b 100644 +--- a/tests/SelfTest/UsageTests/Misc.tests.cpp ++++ b/tests/SelfTest/UsageTests/Misc.tests.cpp +@@ -384,10 +384,6 @@ + REQUIRE(x.size() > 0); + } + +-TEMPLATE_PRODUCT_TEST_CASE("Product with differing arities", "[template][product]", std::tuple, (int, (int, double), (int, double, float))) { +- REQUIRE(std::tuple_size::value >= 1); +-} +- + using MyTypes = std::tuple; + TEMPLATE_LIST_TEST_CASE("Template test case with test types specified inside std::tuple", "[template][list]", MyTypes) + { diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/by-name/ca/catch2_3/package.nix similarity index 72% rename from pkgs/development/libraries/catch2/3.nix rename to pkgs/by-name/ca/catch2_3/package.nix index 5ba4113754d25..269a445c48a4f 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/by-name/ca/catch2_3/package.nix @@ -4,19 +4,31 @@ fetchFromGitHub, cmake, python3, + spdlog, }: stdenv.mkDerivation rec { pname = "catch2"; - version = "3.8.1"; + version = "3.10.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; - rev = "v${version}"; - hash = "sha256-blhSdtNXwe4wKPVKlopsE0omgikMdl12JjwqASwJM2w="; + tag = "v${version}"; + hash = "sha256-eeqqzHMeXLRiXzbY+ay8gJ/YDuxDj3f6+d6eXA1uZHE="; }; + patches = lib.optionals stdenv.cc.isClang [ + # This test fails to compile with Clang 20 + # See: https://github.com/catchorg/Catch2/issues/2991 + ./clang-20-disable-broken-test.patch + ]; + + postPatch = '' + substituteInPlace CMake/*.pc.in \ + --replace-fail "\''${prefix}/" "" + ''; + nativeBuildInputs = [ cmake ]; @@ -50,10 +62,14 @@ stdenv.mkDerivation rec { python3 ]; + passthru.tests = { + inherit spdlog; + }; + meta = { description = "Modern, C++-native, test framework for unit-tests"; homepage = "https://github.com/catchorg/Catch2"; - changelog = "https://github.com/catchorg/Catch2/blob/${src.rev}/docs/release-notes.md"; + changelog = "https://github.com/catchorg/Catch2/blob/${src.tag}/docs/release-notes.md"; license = lib.licenses.boost; maintainers = with lib.maintainers; [ dotlambda ]; platforms = with lib.platforms; unix ++ windows; diff --git a/pkgs/by-name/ce/cereal_1_3_2/package.nix b/pkgs/by-name/ce/cereal/package.nix similarity index 100% rename from pkgs/by-name/ce/cereal_1_3_2/package.nix rename to pkgs/by-name/ce/cereal/package.nix diff --git a/pkgs/by-name/ce/cereal_1_3_0/package.nix b/pkgs/by-name/ce/cereal_1_3_0/package.nix deleted file mode 100644 index 2f433d7f268eb..0000000000000 --- a/pkgs/by-name/ce/cereal_1_3_0/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cereal"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "USCiLab"; - repo = "cereal"; - rev = "v${finalAttrs.version}"; - hash = "sha256-NwyUVeqXxfdyuDevjum6r8LyNtHa0eJ+4IFd3hLkiEE="; - }; - - patches = [ - (fetchpatch { - name = "CVE-2020-11105.patch"; - url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch"; - hash = "sha256-CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; - - meta = { - homepage = "https://uscilab.github.io/cereal/"; - description = "Header-only C++11 serialization library"; - changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.bsd3; - maintainers = [ ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix index 215a9989b37cb..7d97bb0208492 100644 --- a/pkgs/by-name/cf/cfitsio/package.nix +++ b/pkgs/by-name/cf/cfitsio/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, gitUpdater, cmake, bzip2, @@ -29,6 +30,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./cfitsio-pc-cmake.patch + + (fetchpatch { + name = "cfitsio-fix-cmake-4.patch"; + url = "https://github.com/HEASARC/cfitsio/commit/101e0880fca41e2223df7eec56d9e84e90b9ed56.patch"; + hash = "sha256-rufuqOBfE7ItTYwsGdu9G4BXSz4vZd52XmJi09kqrCM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index e4a4f48ecba26..d0c7fe4bbef41 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchpatch, - fetchpatch2, fetchurl, cmake, ninja, @@ -18,33 +17,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "chromaprint"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "acoustid"; repo = "chromaprint"; tag = "v${finalAttrs.version}"; - hash = "sha256-bFplHaqXYvGbl8E8b/HUNFO4X+B/HPZjGTmuVFPjS3g="; + hash = "sha256-G3HIMgbjaAXsC+8nt7mkj58xA62qwA8FC+PfTGblhNg="; }; patches = [ - # Use FFmpeg 5.x - # https://github.com/acoustid/chromaprint/pull/120 + # fix generated pkg-config files (fetchpatch { - url = "https://github.com/acoustid/chromaprint/commit/8ccad6937177b1b92e40ab8f4447ea27bac009a7.patch"; - hash = "sha256-yO2iWmU9s2p0uJfwIdmk3jZ5HXBIQZ/NyOqG+Y5EHdg="; - excludes = [ "package/build.sh" ]; - }) - # ffmpeg5 fix for issue #122 - # https://github.com/acoustid/chromaprint/pull/125 - (fetchpatch { - url = "https://github.com/acoustid/chromaprint/commit/aa67c95b9e486884a6d3ee8b0c91207d8c2b0551.patch"; - hash = "sha256-dLY8FBzBqJehAofE924ayZK0HA/aKiuFhEFxL7dg6rY="; - }) - # Fix for FFmpeg 7 - (fetchpatch2 { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/chromaprint/-/raw/74ae4c7faea2114f2d70a57755f714e348476d28/ffmpeg-7.patch"; - hash = "sha256-io+dzhDNlz+2hWhNfsyePKLQjiUvSzbv10lHVKumTEk="; + url = "https://github.com/acoustid/chromaprint/commit/782ef6bb5f6498e35f8e275f76998fbd5ffa36d6.patch"; + hash = "sha256-drUfAMzTrqqB5UbzOnfPq6XD3HI+3sxyJJSTCa0BmD8="; }) ]; diff --git a/pkgs/by-name/cj/cjson/package.nix b/pkgs/by-name/cj/cjson/package.nix index 7f1eac88571a7..c1fa9f4c55cd6 100644 --- a/pkgs/by-name/cj/cjson/package.nix +++ b/pkgs/by-name/cj/cjson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cjson"; - version = "1.7.18"; + version = "1.7.19"; src = fetchFromGitHub { owner = "DaveGamble"; repo = "cJSON"; rev = "v${version}"; - sha256 = "sha256-UgUWc/+Zie2QNijxKK5GFe4Ypk97EidG8nTiiHhn5Ys="; + sha256 = "sha256-WjgzokT9aHJ7dB40BtmhS7ur1slTuXmemgDimZHLVQM="; }; nativeBuildInputs = [ cmake ]; @@ -22,11 +22,24 @@ stdenv.mkDerivation rec { lib.cmakeBool "ENABLE_CUSTOM_COMPILER_FLAGS" false ); - # cJSON actually uses C99 standard, not C89 - # https://github.com/DaveGamble/cJSON/issues/275 - postPatch = '' - substituteInPlace CMakeLists.txt --replace -std=c89 -std=c99 - ''; + postPatch = + # cJSON actually uses C99 standard, not C89 + # https://github.com/DaveGamble/cJSON/issues/275 + '' + substituteInPlace CMakeLists.txt --replace -std=c89 -std=c99 + '' + # Fix the build with CMake 4. + # + # See: + # * + # * + # * + + '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 3.0)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; meta = with lib; { homepage = "https://github.com/DaveGamble/cJSON"; diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix index b2079b16ad360..496b0e7a761e9 100644 --- a/pkgs/by-name/cl/cloudcompare/package.nix +++ b/pkgs/by-name/cl/cloudcompare/package.nix @@ -15,7 +15,7 @@ mpfr, pcl, libsForQt5, - tbb, + onetbb, xercesc, wrapGAppsHook3, }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { libsForQt5.qtbase libsForQt5.qtsvg libsForQt5.qttools - tbb + onetbb xercesc ]; diff --git a/pkgs/by-name/cm/cmake/004-cygwin.diff b/pkgs/by-name/cm/cmake/004-cygwin.diff deleted file mode 100644 index 982aba17e874d..0000000000000 --- a/pkgs/by-name/cm/cmake/004-cygwin.diff +++ /dev/null @@ -1,274 +0,0 @@ ---- cmake-3.2.2/Source/cmFileCommand.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/ccmFileCommand.cxx 2015-06-10 11:02:27.345598700 +0200 -@@ -1179,7 +1179,7 @@ - MatchProperties CollectMatchProperties(const char* file) - { - // Match rules are case-insensitive on some platforms. --#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__APPLE__) - std::string lower = cmSystemTools::LowerCase(file); - const char* file_to_match = lower.c_str(); - #else ---- cmake-3.2.2/Source/cmInstallCommand.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/cmInstallCommand.cxx 2015-06-10 11:04:19.257935200 +0200 -@@ -1138,7 +1138,7 @@ - { - literal_args += " REGEX \""; - // Match rules are case-insensitive on some platforms. --#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__APPLE__) - std::string regex = cmSystemTools::LowerCase(args[i]); - #else - std::string regex = args[i]; ---- cmake-3.2.2/Source/kwsys/Glob.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/kwsys/Glob.cxx 2015-06-10 11:05:51.602674000 +0200 -@@ -37,7 +37,7 @@ - #include - namespace KWSYS_NAMESPACE - { --#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__APPLE__) - // On Windows and apple, no difference between lower and upper case - # define KWSYS_GLOB_CASE_INDEPENDENT - #endif ---- cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-06-10 11:13:00.308303500 +0200 -@@ -911,7 +911,7 @@ - // Hide implementation details in an anonymous namespace. - namespace { - // ***************************************************************************** --#if defined(__linux) || defined(__APPLE__) -+#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) - int LoadLines( - FILE *file, - kwsys_stl::vector &lines) -@@ -947,7 +947,7 @@ - return nRead; - } - --# if defined(__linux) -+# if defined(__linux) || defined(__CYGWIN__) - // ***************************************************************************** - int LoadLines( - const char *fileName, -@@ -986,7 +986,7 @@ - } - #endif - --#if defined(__linux) -+#if defined(__linux) || defined(__CYGWIN__) - // **************************************************************************** - template - int GetFieldsFromFile( -@@ -3132,7 +3132,6 @@ - pos = buffer.find("processor\t",pos+1); - } - --#ifdef __linux - // Find the largest physical id. - int maxId = -1; - kwsys_stl::string idc = -@@ -3165,14 +3164,6 @@ - atoi(this->ExtractValueFromCpuInfoFile(buffer,"ncpus active").c_str()); - } - --#else // __CYGWIN__ -- // does not have "physical id" entries, neither "cpu cores" -- // this has to be fixed for hyper-threading. -- kwsys_stl::string cpucount = -- this->ExtractValueFromCpuInfoFile(buffer,"cpu count"); -- this->NumberOfPhysicalCPU= -- this->NumberOfLogicalCPU = atoi(cpucount.c_str()); --#endif - // gotta have one, and if this is 0 then we get a / by 0n - // better to have a bad answer than a crash - if(this->NumberOfPhysicalCPU <= 0) -@@ -3370,7 +3361,7 @@ - GlobalMemoryStatusEx(&statex); - return statex.ullTotalPhys/1024; - # endif --#elif defined(__linux) -+#elif defined(__linux) || defined(__CYGWIN__) - SystemInformation::LongLong memTotal=0; - int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal); - if (ierr) -@@ -3501,7 +3492,7 @@ - GlobalMemoryStatusEx(&statex); - return (statex.ullTotalPhys - statex.ullAvailPhys)/1024; - # endif --#elif defined(__linux) -+#elif defined(__linux) || defined(__CYGWIN__) - const char *names[3]={"MemTotal:","MemFree:",NULL}; - SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)}; - int ierr=GetFieldsFromFile("/proc/meminfo",names,values); -@@ -3560,7 +3551,7 @@ - return -2; - } - return pmc.WorkingSetSize/1024; --#elif defined(__linux) -+#elif defined(__linux) || defined(__CYGWIN__) - SystemInformation::LongLong memUsed=0; - int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed); - if (ierr) -@@ -3612,7 +3603,7 @@ - { - #if defined(_WIN32) - return GetCurrentProcessId(); --#elif defined(__linux) || defined(__APPLE__) -+#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) - return getpid(); - #else - return -1; ---- cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-06-10 11:21:58.980443200 +0200 -@@ -93,19 +93,12 @@ - # if defined(_MSC_VER) && _MSC_VER >= 1800 - # define KWSYS_WINDOWS_DEPRECATED_GetVersionEx - # endif --#elif defined (__CYGWIN__) --# include --# undef _WIN32 - #endif - - #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H - extern char **environ; - #endif - --#ifdef __CYGWIN__ --# include --#endif -- - // getpwnam doesn't exist on Windows and Cray Xt3/Catamount - // same for TIOCGWINSZ - #if defined(_WIN32) || defined (__LIBCATAMOUNT__) -@@ -1148,15 +1141,7 @@ - { - return false; - } --#if defined(__CYGWIN__) -- // Convert filename to native windows path if possible. -- char winpath[MAX_PATH]; -- if(SystemTools::PathCygwinToWin32(filename.c_str(), winpath)) -- { -- return (GetFileAttributesA(winpath) != INVALID_FILE_ATTRIBUTES); -- } -- return access(filename.c_str(), R_OK) == 0; --#elif defined(_WIN32) -+#if defined(_WIN32) - return (GetFileAttributesW( - SystemTools::ConvertToWindowsExtendedPath(filename).c_str()) - != INVALID_FILE_ATTRIBUTES); -@@ -1190,28 +1175,6 @@ - } - - //---------------------------------------------------------------------------- --#ifdef __CYGWIN__ --bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path) --{ -- SystemToolsTranslationMap::iterator i = -- SystemTools::Cyg2Win32Map->find(path); -- -- if (i != SystemTools::Cyg2Win32Map->end()) -- { -- strncpy(win32_path, i->second.c_str(), MAX_PATH); -- } -- else -- { -- if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0) -- { -- win32_path[0] = 0; -- } -- SystemToolsTranslationMap::value_type entry(path, win32_path); -- SystemTools::Cyg2Win32Map->insert(entry); -- } -- return win32_path[0] != 0; --} --#endif - - bool SystemTools::Touch(const kwsys_stl::string& filename, bool create) - { -@@ -4307,7 +4270,7 @@ - - bool SystemTools::FileIsFullPath(const char* in_name, size_t len) - { --#if defined(_WIN32) || defined(__CYGWIN__) -+#if defined(_WIN32) - // On Windows, the name must be at least two characters long. - if(len < 2) - { -@@ -5078,9 +5041,6 @@ - static unsigned int SystemToolsManagerCount; - SystemToolsTranslationMap *SystemTools::TranslationMap; - SystemToolsTranslationMap *SystemTools::LongPathMap; --#ifdef __CYGWIN__ --SystemToolsTranslationMap *SystemTools::Cyg2Win32Map; --#endif - - // SystemToolsManager manages the SystemTools singleton. - // SystemToolsManager should be included in any translation unit -@@ -5126,9 +5086,6 @@ - // Allocate the translation map first. - SystemTools::TranslationMap = new SystemToolsTranslationMap; - SystemTools::LongPathMap = new SystemToolsTranslationMap; --#ifdef __CYGWIN__ -- SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap; --#endif - - // Add some special translation paths for unix. These are not added - // for windows because drive letters need to be maintained. Also, -@@ -5183,9 +5140,6 @@ - { - delete SystemTools::TranslationMap; - delete SystemTools::LongPathMap; --#ifdef __CYGWIN__ -- delete SystemTools::Cyg2Win32Map; --#endif - } - - ---- cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-06-10 11:24:24.271286600 +0200 -@@ -298,15 +298,6 @@ - static bool FileExists(const kwsys_stl::string& filename); - - /** -- * Converts Cygwin path to Win32 path. Uses dictionary container for -- * caching and calls to cygwin_conv_to_win32_path from Cygwin dll -- * for actual translation. Returns true on success, else false. -- */ --#ifdef __CYGWIN__ -- static bool PathCygwinToWin32(const char *path, char *win32_path); --#endif -- -- /** - * Return file length - */ - static unsigned long FileLength(const kwsys_stl::string& filename); -@@ -942,9 +933,6 @@ - */ - static SystemToolsTranslationMap *TranslationMap; - static SystemToolsTranslationMap *LongPathMap; --#ifdef __CYGWIN__ -- static SystemToolsTranslationMap *Cyg2Win32Map; --#endif - friend class SystemToolsManager; - }; - ---- cmake-3.2.2/Modules/FindCurses.cmake 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Modules/FindCurses.cmake 2015-06-10 12:10:19.682030300 +0200 -@@ -60,15 +60,6 @@ - if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES)) - set(CURSES_USE_NCURSES TRUE) - endif() --# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html --# cygwin ncurses stopped providing curses.h symlinks see above --# message. Cygwin is an ncurses package, so force ncurses on --# cygwin if the curses.h is missing --if(CYGWIN) -- if(NOT EXISTS /usr/include/curses.h) -- set(CURSES_USE_NCURSES TRUE) -- endif() --endif() - - - # Not sure the logic is correct here. diff --git a/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff b/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff deleted file mode 100644 index dc10e6b342311..0000000000000 --- a/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff +++ /dev/null @@ -1,14 +0,0 @@ -Revert of commit 1af23c4de2c7d58c06171d70b37794b5c860d5f4. ---- b/Modules/Platform/Darwin.cmake -+++ a/Modules/Platform/Darwin.cmake -@@ -47,9 +47,7 @@ - set(CMAKE_SHARED_MODULE_SUFFIX ".so") - set(CMAKE_MODULE_EXISTS 1) - set(CMAKE_DL_LIBS "") -+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") --if(NOT "${_CURRENT_OSX_VERSION}" VERSION_LESS "10.5") -- set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") --endif() - - foreach(lang C CXX OBJC OBJCXX) - set(CMAKE_${lang}_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ") diff --git a/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff b/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff deleted file mode 100644 index d610192074367..0000000000000 --- a/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff +++ /dev/null @@ -1,41 +0,0 @@ -diff -ur a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c ---- a/Source/kwsys/ProcessUNIX.c 2024-04-11 07:12:19.000000000 -0700 -+++ b/Source/kwsys/ProcessUNIX.c 2024-05-15 10:41:00.286160616 -0700 -@@ -2501,20 +2501,20 @@ - have two integers to store: the pid and then the ppid. */ - #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ - defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__) --# define KWSYSPE_PS_COMMAND "ps axo pid,ppid" -+# define KWSYSPE_PS_COMMAND "@ps@ axo pid,ppid" - # define KWSYSPE_PS_FORMAT "%d %d\n" - #elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */ --# define KWSYSPE_PS_COMMAND "ps -e -o pid,ppid" -+# define KWSYSPE_PS_COMMAND "@ps@ -e -o pid,ppid" - # define KWSYSPE_PS_FORMAT "%d %d\n" - #elif defined(__hpux) || defined(__sun__) || defined(__sgi) || \ - defined(_AIX) || defined(__sparc) --# define KWSYSPE_PS_COMMAND "ps -ef" -+# define KWSYSPE_PS_COMMAND "@ps@ -ef" - # define KWSYSPE_PS_FORMAT "%*s %d %d %*[^\n]\n" - #elif defined(__QNX__) --# define KWSYSPE_PS_COMMAND "ps -Af" -+# define KWSYSPE_PS_COMMAND "@ps@ -Af" - # define KWSYSPE_PS_FORMAT "%*d %d %d %*[^\n]\n" - #elif defined(__CYGWIN__) --# define KWSYSPE_PS_COMMAND "ps aux" -+# define KWSYSPE_PS_COMMAND "@ps@ aux" - # define KWSYSPE_PS_FORMAT "%d %d %*[^\n]\n" - #endif - -diff -ur a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx ---- a/Source/kwsys/SystemInformation.cxx 2024-04-11 07:12:19.000000000 -0700 -+++ b/Source/kwsys/SystemInformation.cxx 2024-05-15 10:40:00.901059278 -0700 -@@ -3884,7 +3884,7 @@ - long long memUsed = 0; - pid_t pid = getpid(); - std::ostringstream oss; -- oss << "ps -o rss= -p " << pid; -+ oss << "@ps@ -o rss= -p " << pid; - FILE* file = popen(oss.str().c_str(), "r"); - if (file == nullptr) { - return -1; diff --git a/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff b/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff deleted file mode 100644 index 8dfc354a9c203..0000000000000 --- a/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake -index 5ce8a9046b..f7361308b7 100644 ---- a/Modules/FindCURL.cmake -+++ b/Modules/FindCURL.cmake -@@ -239,9 +239,24 @@ if(CURL_FOUND) - IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}") - endif() - -- if(CURL_USE_STATIC_LIBS AND MSVC) -- set_target_properties(CURL::libcurl PROPERTIES -- INTERFACE_LINK_LIBRARIES "normaliz.lib;ws2_32.lib;wldap32.lib") -+ if(PC_CURL_FOUND) -+ if(PC_CURL_LINK_LIBRARIES) -+ set_property(TARGET CURL::libcurl PROPERTY -+ INTERFACE_LINK_LIBRARIES "${PC_CURL_LINK_LIBRARIES}") -+ endif() -+ if(PC_CURL_LDFLAGS_OTHER) -+ set_property(TARGET CURL::libcurl PROPERTY -+ INTERFACE_LINK_OPTIONS "${PC_CURL_LDFLAGS_OTHER}") -+ endif() -+ if(PC_CURL_CFLAGS_OTHER) -+ set_property(TARGET CURL::libcurl PROPERTY -+ INTERFACE_COMPILE_OPTIONS "${PC_CURL_CFLAGS_OTHER}") -+ endif() -+ else() -+ if(CURL_USE_STATIC_LIBS AND MSVC) -+ set_target_properties(CURL::libcurl PROPERTIES -+ INTERFACE_LINK_LIBRARIES "normaliz.lib;ws2_32.lib;wldap32.lib") -+ endif() - endif() - - endif() diff --git a/pkgs/by-name/cm/cmake/001-search-path.diff b/pkgs/by-name/cm/cmake/add-nixpkgs-libc-paths.patch similarity index 52% rename from pkgs/by-name/cm/cmake/001-search-path.diff rename to pkgs/by-name/cm/cmake/add-nixpkgs-libc-paths.patch index 04ab0847a7074..3a1cbf0e11ace 100644 --- a/pkgs/by-name/cm/cmake/001-search-path.diff +++ b/pkgs/by-name/cm/cmake/add-nixpkgs-libc-paths.patch @@ -1,61 +1,29 @@ diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index b9381c3d7d..5e944640b5 100644 +index e95da44ea4..bdf4155232 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake -@@ -26,9 +26,6 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) - # please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst - # synchronized - list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # Standard -- /usr/local /usr / -- - # CMake install location - "${_CMAKE_INSTALL_DIR}" - ) -@@ -47,48 +44,49 @@ endif() - - # Non "standard" but common install prefixes - list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- /usr/X11R6 -- /usr/pkg -- /opt +@@ -71,28 +71,38 @@ + /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 ) - # List common include file locations not under the common prefixes. +-if(CMAKE_SYSROOT_COMPILE) +- set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}") ++# Add the Nix C library paths. +if(DEFINED ENV{NIX_CC} + AND IS_DIRECTORY "$ENV{NIX_CC}" + AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc" + AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc-dev") + file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc" _nix_cmake_libc) + file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev) -+else() + else() +- set(_cmake_sysroot_compile "${CMAKE_SYSROOT}") + set(_nix_cmake_libc @libc_lib@) + set(_nix_cmake_libc_dev @libc_dev@) -+endif() -+ - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # X11 -- /usr/include/X11 -+ "${_nix_cmake_libc_dev}/include" - ) - - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # X11 -- /usr/lib/X11 -+ "${_nix_cmake_libc}/lib" - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ "${_nix_cmake_libc}/lib" - ) + endif() ++list(APPEND CMAKE_SYSTEM_INCLUDE_PATH "${_nix_cmake_libc_dev}/include") ++list(APPEND CMAKE_SYSTEM_LIBRARY_PATH "${_nix_cmake_libc}/lib") ++list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_nix_cmake_libc}/lib") --if(CMAKE_SYSROOT_COMPILE) -- set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}") --else() -- set(_cmake_sysroot_compile "${CMAKE_SYSROOT}") --endif() -- # Default per-language values. These may be later replaced after # parsing the implicit directory information from compiler output. set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT @@ -80,16 +48,3 @@ index b9381c3d7d..5e944640b5 100644 # Reminder when adding new locations computed from environment variables # please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst -diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake -index b9e2f17979..ab517cd4a7 100644 ---- a/Modules/Platform/WindowsPaths.cmake -+++ b/Modules/Platform/WindowsPaths.cmake -@@ -70,7 +70,7 @@ endif() - - if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") - # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set) -- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) -+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) - endif() - - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH diff --git a/pkgs/by-name/cm/cmake/darwin-binary-paths.patch b/pkgs/by-name/cm/cmake/darwin-binary-paths.patch new file mode 100644 index 0000000000000..b4e84bef22e64 --- /dev/null +++ b/pkgs/by-name/cm/cmake/darwin-binary-paths.patch @@ -0,0 +1,61 @@ +diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake +index 196ab18b0b..31dd4346b1 100644 +--- a/Modules/Platform/Darwin-Initialize.cmake ++++ b/Modules/Platform/Darwin-Initialize.cmake +@@ -16,7 +16,7 @@ + endif() + + if(NOT CMAKE_CROSSCOMPILING) +- execute_process(COMMAND sw_vers -productVersion ++ execute_process(COMMAND @sw_vers@ -productVersion + OUTPUT_VARIABLE _CMAKE_HOST_OSX_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() +diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx +index c65587edbe..0a7cc380c3 100644 +--- a/Source/kwsys/SystemInformation.cxx ++++ b/Source/kwsys/SystemInformation.cxx +@@ -3833,7 +3833,7 @@ + } + char const* names[3] = { "Pages wired down:", "Pages active:", nullptr }; + long long values[2] = { 0 }; +- int ierr = GetFieldsFromCommand("vm_stat", names, values); ++ int ierr = GetFieldsFromCommand("@vm_stat@", names, values); + if (ierr) { + return -1; + } +@@ -5586,7 +5586,7 @@ + { + #ifdef __APPLE__ + std::vector args; +- args.push_back("sw_vers"); ++ args.push_back("@sw_vers@"); + args.push_back(arg); + args.push_back(nullptr); + ver = this->RunProcess(args); +diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt +index 15a1e2c0c3..33bb304cf7 100644 +--- a/Tests/CMakeLists.txt ++++ b/Tests/CMakeLists.txt +@@ -1958,7 +1958,7 @@ + if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5) + if(NOT CMake_TEST_XCTest_DEPLOYMENT_TARGET) + execute_process( +- COMMAND sw_vers -productVersion ++ COMMAND @sw_vers@ -productVersion + OUTPUT_VARIABLE OSX_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt +index ddc975c202..8ff651fd90 100644 +--- a/Utilities/cmcurl/CMakeLists.txt ++++ b/Utilities/cmcurl/CMakeLists.txt +@@ -127,7 +127,7 @@ + set(OSX_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET}) + else() + execute_process( +- COMMAND sw_vers -productVersion ++ COMMAND @sw_vers@ -productVersion + OUTPUT_VARIABLE OSX_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) diff --git a/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch b/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch new file mode 100644 index 0000000000000..b7917467f2f02 --- /dev/null +++ b/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch @@ -0,0 +1,79 @@ +diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake +index dc26258eac..dd8d30e3d9 100644 +--- a/Modules/CMakeDetermineSystem.cmake ++++ b/Modules/CMakeDetermineSystem.cmake +@@ -68,7 +68,7 @@ + endif() + if(_CMAKE_APPLE_SILICON_PROCESSOR) + if(";${_CMAKE_APPLE_SILICON_PROCESSOR};" MATCHES "^;(arm64|x86_64);$") +- execute_process(COMMAND sysctl -q hw.optional.arm64 ++ execute_process(COMMAND @sysctl@ -q hw.optional.arm64 + OUTPUT_VARIABLE _sysctl_stdout + ERROR_VARIABLE _sysctl_stderr + RESULT_VARIABLE _sysctl_result +diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake +index 31dd4346b1..7c4f123a1d 100644 +--- a/Modules/Platform/Darwin-Initialize.cmake ++++ b/Modules/Platform/Darwin-Initialize.cmake +@@ -28,7 +28,7 @@ + if(NOT CMAKE_CROSSCOMPILING AND + CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND + CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64|x86_64)$") +- execute_process(COMMAND sysctl -q hw.optional.arm64 ++ execute_process(COMMAND @sysctl@ -q hw.optional.arm64 + OUTPUT_VARIABLE _sysctl_stdout + ERROR_VARIABLE _sysctl_stderr + RESULT_VARIABLE _sysctl_result +diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake +index 260b6631c0..ffb8fcd8d2 100644 +--- a/Modules/ProcessorCount.cmake ++++ b/Modules/ProcessorCount.cmake +@@ -87,8 +87,7 @@ + + if(NOT count) + # Mac, FreeBSD, OpenBSD (systems with sysctl): +- find_program(ProcessorCount_cmd_sysctl sysctl +- PATHS /usr/sbin /sbin) ++ set(ProcessorCount_cmd_sysctl @sysctl@) + mark_as_advanced(ProcessorCount_cmd_sysctl) + if(ProcessorCount_cmd_sysctl) + execute_process(COMMAND ${ProcessorCount_cmd_sysctl} -n hw.ncpu +diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c +index a918b8d9a7..36145707e1 100644 +--- a/Source/kwsys/ProcessUNIX.c ++++ b/Source/kwsys/ProcessUNIX.c +@@ -2503,7 +2503,7 @@ + have two integers to store: the pid and then the ppid. */ + #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ + defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__) +-# define KWSYSPE_PS_COMMAND "ps axo pid,ppid" ++# define KWSYSPE_PS_COMMAND "@ps@ axo pid,ppid" + # define KWSYSPE_PS_FORMAT "%d %d\n" + #elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */ + # define KWSYSPE_PS_COMMAND "ps -e -o pid,ppid" +diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx +index 0a7cc380c3..9923dc4ab9 100644 +--- a/Source/kwsys/SystemInformation.cxx ++++ b/Source/kwsys/SystemInformation.cxx +@@ -3876,7 +3876,7 @@ + long long memUsed = 0; + pid_t pid = getpid(); + std::ostringstream oss; +- oss << "ps -o rss= -p " << pid; ++ oss << "@ps@ -o rss= -p " << pid; + FILE* file = popen(oss.str().c_str(), "r"); + if (!file) { + return -1; +diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt +index 33bb304cf7..7dbda40a81 100644 +--- a/Tests/CMakeLists.txt ++++ b/Tests/CMakeLists.txt +@@ -216,7 +216,7 @@ + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT DEFINED CMake_TEST_APPLE_SILICON) +- execute_process(COMMAND sysctl -q hw.optional.arm64 ++ execute_process(COMMAND @sysctl@ -q hw.optional.arm64 + OUTPUT_VARIABLE _sysctl_stdout + ERROR_VARIABLE _sysctl_stderr + RESULT_VARIABLE _sysctl_result diff --git a/pkgs/by-name/cm/cmake/fix-curl-8.16.patch b/pkgs/by-name/cm/cmake/fix-curl-8.16.patch new file mode 100644 index 0000000000000..feabba28b0d6f --- /dev/null +++ b/pkgs/by-name/cm/cmake/fix-curl-8.16.patch @@ -0,0 +1,13 @@ +diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h +index 7836f4b9c78a1d103eee515d618856a6712b4480..9113890b5a12cb157b691b66d96e25d0fd4b50ef 100644 +--- a/Source/CTest/cmCTestCurl.h ++++ b/Source/CTest/cmCTestCurl.h +@@ -52,7 +52,7 @@ private: + std::vector HttpHeaders; + std::string HTTPProxyAuth; + std::string HTTPProxy; +- curl_proxytype HTTPProxyType; ++ long HTTPProxyType; + bool UseHttp10 = false; + bool Quiet = false; + int TimeOutSeconds = 0; diff --git a/pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff b/pkgs/by-name/cm/cmake/nixpkgs-cmake-prefix-path.patch similarity index 80% rename from pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff rename to pkgs/by-name/cm/cmake/nixpkgs-cmake-prefix-path.patch index 4ebdcced055c2..8a572fc083201 100644 --- a/pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff +++ b/pkgs/by-name/cm/cmake/nixpkgs-cmake-prefix-path.patch @@ -1,8 +1,8 @@ diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx -index 8840cdcb..c34b7ee9 100644 +index b8d4765692..902c1e5290 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx -@@ -280,6 +280,11 @@ void cmFindBase::FillCMakeEnvironmentPath() +@@ -312,6 +312,11 @@ void cmFindBase::FillCMakeEnvironmentPath() // Add CMAKE_*_PATH environment variables std::string var = cmStrCat("CMAKE_", this->CMakePathName, "_PATH"); paths.AddEnvPrefixPath("CMAKE_PREFIX_PATH"); @@ -15,14 +15,14 @@ index 8840cdcb..c34b7ee9 100644 if (this->CMakePathName == "PROGRAM") { diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx -index 9b51b1ad..6acc676c 100644 +index 6201894fd1..9533862a2b 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx -@@ -2039,6 +2039,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment() +@@ -2467,6 +2467,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment() // And now the general CMake environment variables paths.AddEnvPath("CMAKE_PREFIX_PATH"); + paths.AddEnvPath("NIXPKGS_CMAKE_PREFIX_PATH"); - if (this->DebugMode) { + if (this->DebugModeEnabled()) { debugBuffer = cmStrCat(debugBuffer, "CMAKE_PREFIX_PATH env variable " diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 8f2f690f90aa7..7e3b689f45678 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -13,11 +13,13 @@ openssl, pkg-config, ps, + sysctl, rhash, sphinx, texinfo, xz, zlib, + darwin, isBootstrap ? null, isMinimalBuild ? ( if isBootstrap != null then @@ -48,33 +50,41 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.31.7"; + version = "4.1.1"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-ptLrHr65kTDf5j71o0DD/bEUMczj18oUhSTBJZJM6mg="; + hash = "sha256-sp9vGXM6oiS3djUHoQikJ+1Ixojh+vIrKcROHDBUkoI="; }; patches = [ # Add NIXPKGS_CMAKE_PREFIX_PATH to cmake which is like CMAKE_PREFIX_PATH # except it is not searched for programs - ./000-nixpkgs-cmake-prefix-path.diff - # Don't search in non-Nix locations such as /usr, but do search in our libc. - ./001-search-path.diff + ./nixpkgs-cmake-prefix-path.patch + + # Add the libc paths from the compiler wrapper. + ./add-nixpkgs-libc-paths.patch + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (replaceVars ./darwin-binary-paths.patch { + sw_vers = lib.getExe' darwin.DarwinTools "sw_vers"; + vm_stat = lib.getExe' darwin.system_cmds "vm_stat"; + }) ] - ++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff - # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. - ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff - # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path. - ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) ( - replaceVars ./007-darwin-bsd-ps-abspath.diff { + ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [ + (replaceVars ./darwin-bsd-binary-paths.patch { + # `ps(1)` is theoretically used on Linux too, but only when + # `/proc` is inaccessible, so we can skip the dependency. ps = lib.getExe ps; - } - ) + sysctl = lib.getExe sysctl; + }) + ] ++ [ - # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900 - # Needed to correctly link curl in pkgsStatic. - ./008-FindCURL-Add-more-target-properties-from-pkg-config.diff + # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11134 + ./fix-curl-8.16.patch + + # Remove references to non‐Nix search paths. + ./remove-impure-search-paths.patch ]; outputs = [ @@ -118,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional qt5UI qtbase; preConfigure = '' - fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \ --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ @@ -133,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { configurePlatforms = [ ]; configureFlags = [ - "CXXFLAGS=-Wno-elaborated-enum-base" "--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}" ] ++ ( @@ -154,11 +162,6 @@ stdenv.mkDerivation (finalAttrs: { "--sphinx-info" "--sphinx-man" ] - # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 - ++ lib.optionals stdenv.hostPlatform.is32bit [ - "CFLAGS=-D_FILE_OFFSET_BITS=64" - "CXXFLAGS=-D_FILE_OFFSET_BITS=64" - ] ++ [ "--" # We should set the proper `CMAKE_SYSTEM_NAME`. @@ -177,25 +180,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_CursesDialog" cursesUI) ]; - # `pkgsCross.musl64.cmake.override { stdenv = pkgsCross.musl64.llvmPackages_16.libcxxStdenv; }` - # fails with `The C++ compiler does not support C++11 (e.g. std::unique_ptr).` - # The cause is a compiler warning `warning: argument unused during compilation: '-pie' [-Wunused-command-line-argument]` - # interfering with the feature check. - env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument"; - # make install attempts to use the just-built cmake preInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile ''; - # Undo some of `fixCmakeFiles` for Darwin to make sure that checks for libraries in the SDK find them - # (e.g., `find_library(MATH_LIBRARY m)` should find `$SDKROOT/usr/lib/libm.tbd`). - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace "$out/share/cmake-${lib.versions.majorMinor finalAttrs.version}/Modules/Platform/Darwin.cmake" \ - --replace-fail '/var/empty/include' '/usr/include' \ - --replace-fail '/var/empty/lib' '/usr/lib' - ''; - dontUseCmakeConfigure = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch b/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch new file mode 100644 index 0000000000000..cb01326b9c352 --- /dev/null +++ b/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch @@ -0,0 +1,1968 @@ +diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake +index b20a255621..bc67fdf4aa 100644 +--- a/Modules/CMakeDetermineJavaCompiler.cmake ++++ b/Modules/CMakeDetermineJavaCompiler.cmake +@@ -42,19 +42,6 @@ + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin" + $ENV{JAVA_HOME}/bin +- /usr/bin +- /usr/lib/java/bin +- /usr/share/java/bin +- /usr/local/bin +- /usr/local/java/bin +- /usr/local/java/share/bin +- /usr/java/j2sdk1.4.2_04 +- /usr/lib/j2sdk1.4-sun/bin +- /usr/java/j2sdk1.4.2_09/bin +- /usr/lib/j2sdk1.5-sun/bin +- /opt/sun-jdk-1.5.0.04/bin +- /usr/local/jdk-1.7.0/bin +- /usr/local/jdk-1.6.0/bin + ) + # if no compiler has been specified yet, then look for one + if(CMAKE_Java_COMPILER_INIT) +diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake +index dd8d30e3d9..d500364ba5 100644 +--- a/Modules/CMakeDetermineSystem.cmake ++++ b/Modules/CMakeDetermineSystem.cmake +@@ -9,7 +9,7 @@ + + # find out on which system cmake runs + if(CMAKE_HOST_UNIX) +- find_program(CMAKE_UNAME NAMES uname PATHS /bin /usr/bin /usr/local/bin) ++ find_program(CMAKE_UNAME NAMES uname) + if(CMAKE_UNAME) + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "AIX") + execute_process(COMMAND ${CMAKE_UNAME} -v +diff --git a/Modules/CMakeFindFrameworks.cmake b/Modules/CMakeFindFrameworks.cmake +index 87ad38b46b..95f226be40 100644 +--- a/Modules/CMakeFindFrameworks.cmake ++++ b/Modules/CMakeFindFrameworks.cmake +@@ -39,22 +39,10 @@ + macro(CMAKE_FIND_FRAMEWORKS fwk) + set(${fwk}_FRAMEWORKS) + if(APPLE) +- # 'Frameworks' directory from Brew (Apple Silicon and Intel) +- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") +- set(_brew_framework_path /opt/homebrew/Frameworks) +- else() +- set(_brew_framework_path /usr/local/Frameworks) +- endif() +- + file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _cmff_CMAKE_FRAMEWORK_PATH) + set(_cmff_search_paths + ${CMAKE_FRAMEWORK_PATH} + ${_cmff_CMAKE_FRAMEWORK_PATH} +- ~/Library/Frameworks +- ${_brew_framework_path} +- /Library/Frameworks +- /System/Library/Frameworks +- /Network/Library/Frameworks + ${CMAKE_SYSTEM_FRAMEWORK_PATH}) + + # For backwards compatibility reasons, +diff --git a/Modules/CMakeFindJavaCommon.cmake b/Modules/CMakeFindJavaCommon.cmake +index 95ca9b57b6..616295e031 100644 +--- a/Modules/CMakeFindJavaCommon.cmake ++++ b/Modules/CMakeFindJavaCommon.cmake +@@ -15,20 +15,6 @@ + if(_ENV_JAVA_HOME AND IS_DIRECTORY "${_ENV_JAVA_HOME}") + set(_JAVA_HOME "${_ENV_JAVA_HOME}") + set(_JAVA_HOME_EXPLICIT 1) +- else() +- set(_CMD_JAVA_HOME "") +- if(APPLE AND EXISTS /usr/libexec/java_home) +- execute_process(COMMAND /usr/libexec/java_home +- OUTPUT_VARIABLE _CMD_JAVA_HOME +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ERROR_QUIET +- ) +- endif() +- if(_CMD_JAVA_HOME AND IS_DIRECTORY "${_CMD_JAVA_HOME}") +- set(_JAVA_HOME "${_CMD_JAVA_HOME}") +- set(_JAVA_HOME_EXPLICIT 0) +- endif() +- unset(_CMD_JAVA_HOME) + endif() + unset(_ENV_JAVA_HOME) + endif() +diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake +index 6e2762cf41..f88cf2f7c1 100644 +--- a/Modules/CMakeFindPackageMode.cmake ++++ b/Modules/CMakeFindPackageMode.cmake +@@ -64,7 +64,7 @@ + # from the outside + if(NOT CMAKE_SIZEOF_VOID_P) + set(CMAKE_SIZEOF_VOID_P 4) +- if(EXISTS ${CMAKE_SYSROOT}/usr/lib64) ++ if(FALSE) + set(CMAKE_SIZEOF_VOID_P 8) + else() + # use the file utility to check whether itself is 64 bit: +@@ -79,22 +79,6 @@ + endif() + endif() + +- # guess Debian multiarch if it has not been set: +- if(EXISTS /etc/debian_version) +- if(NOT CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ) +- file(GLOB filesInLib RELATIVE /lib /lib/*-linux-gnu* ) +- foreach(file ${filesInLib}) +- if("${file}" MATCHES "${CMAKE_LIBRARY_ARCHITECTURE_REGEX}") +- set(CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ${file}) +- break() +- endif() +- endforeach() +- endif() +- if(NOT CMAKE_LIBRARY_ARCHITECTURE) +- set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE}) +- endif() +- endif() +- + endif() + + set(CMAKE_${LANGUAGE}_COMPILER "dummy") +diff --git a/Modules/CMakeFindSublimeText2.cmake b/Modules/CMakeFindSublimeText2.cmake +index fc0ec313b8..46d8418d2c 100644 +--- a/Modules/CMakeFindSublimeText2.cmake ++++ b/Modules/CMakeFindSublimeText2.cmake +@@ -7,15 +7,6 @@ + + find_program(CMAKE_SUBLIMETEXT_EXECUTABLE + NAMES subl3 subl sublime_text +- PATHS +- "/Applications/Sublime Text.app/Contents/SharedSupport/bin" +- "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin" +- "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin" +- "$ENV{HOME}/Applications/Sublime Text.app/Contents/SharedSupport/bin" +- "$ENV{HOME}/Applications/Sublime Text 3.app/Contents/SharedSupport/bin" +- "$ENV{HOME}/Applications/Sublime Text 2.app/Contents/SharedSupport/bin" +- "/opt/sublime_text" +- "/opt/sublime_text_3" + DOC "The Sublime Text executable") + + if(CMAKE_SUBLIMETEXT_EXECUTABLE) +diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake +index 2a2f478fd7..f22281bdca 100644 +--- a/Modules/CPackIFW.cmake ++++ b/Modules/CPackIFW.cmake +@@ -426,7 +426,7 @@ + else() + list(APPEND _CPACK_IFW_PATHS + "$ENV{HOME}/Qt" +- "/opt/Qt") ++ ) + endif() + list(REMOVE_DUPLICATES _CPACK_IFW_PATHS) + +diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake +index b45a279b94..884ccc0e32 100644 +--- a/Modules/FindBLAS.cmake ++++ b/Modules/FindBLAS.cmake +@@ -1098,16 +1098,8 @@ + ((BLA_VENDOR STREQUAL "ACML_GPU") AND (NOT BLAS_ACML_GPU_LIB_DIRS)) + ) + # try to find acml in "standard" paths +- if(WIN32) +- file(GLOB _ACML_ROOT "C:/AMD/acml*/ACML-EULA.txt") +- else() +- file(GLOB _ACML_ROOT "/opt/acml*/ACML-EULA.txt") +- endif() +- if(WIN32) +- file(GLOB _ACML_GPU_ROOT "C:/AMD/acml*/GPGPUexamples") +- else() +- file(GLOB _ACML_GPU_ROOT "/opt/acml*/GPGPUexamples") +- endif() ++ set(_ACML_ROOT) ++ set(_ACML_GPU_ROOT) + list(GET _ACML_ROOT 0 _ACML_ROOT) + list(GET _ACML_GPU_ROOT 0 _ACML_GPU_ROOT) + if(_ACML_ROOT) +diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake +index bceb615ca0..2350b15655 100644 +--- a/Modules/FindCUDA.cmake ++++ b/Modules/FindCUDA.cmake +@@ -854,7 +854,6 @@ + # Now search default paths + find_program(CUDA_TOOLKIT_ROOT_DIR_NVCC + NAMES nvcc nvcc.exe +- PATHS /opt/cuda/bin + PATH_SUFFIXES cuda/bin + DOC "Toolkit location." + ) +@@ -1014,7 +1013,6 @@ + # Search default search paths, after we search our own set of paths. + find_library(${_var} + NAMES ${_names} +- PATHS "/usr/lib/nvidia-current" + DOC ${_doc} + ) + endif() +@@ -1114,11 +1112,6 @@ + if (CUDA_rt_LIBRARY) + list(APPEND CUDA_LIBRARIES ${CUDA_rt_LIBRARY}) + endif() +- if(APPLE) +- # We need to add the default path to the driver (libcuda.dylib) as an rpath, so that +- # the static cuda runtime can find it at runtime. +- list(APPEND CUDA_LIBRARIES -Wl,-rpath,/usr/local/cuda/lib) +- endif() + else() + list(APPEND CUDA_LIBRARIES ${CUDA_CUDART_LIBRARY}) + endif() +@@ -1223,8 +1216,6 @@ + "$ENV{NVSDKCOMPUTE_ROOT}/C" + ENV NVSDKCUDA_ROOT + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Installed Products\\NVIDIA SDK 10\\Compute;InstallDir]" +- PATHS +- "/Developer/GPU\ Computing/C" + ) + + # Keep the CUDA_SDK_ROOT_DIR first in order to be able to override the +@@ -1236,7 +1227,6 @@ + "${CUDA_TOOLKIT_ROOT_DIR}/NV_CUDA_SDK" + "$ENV{HOME}/NVIDIA_CUDA_SDK" + "$ENV{HOME}/NVIDIA_CUDA_SDK_MACOSX" +- "/Developer/CUDA" + ) + + # Example of how to find an include file from the CUDA_SDK_ROOT_DIR +diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake +index b00cd26b7e..f5f74ebe1d 100644 +--- a/Modules/FindCUDAToolkit.cmake ++++ b/Modules/FindCUDAToolkit.cmake +@@ -776,12 +776,6 @@ + elseif(CUDAToolkit_ROOT_DIR AND EXISTS "${CUDAToolkit_ROOT_DIR}/${vf}") + set(${result_variable} "${CUDAToolkit_ROOT_DIR}/${vf}" PARENT_SCOPE) + break() +- elseif(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}") +- set(${result_variable} "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}" PARENT_SCOPE) +- break() +- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}") +- set(${result_variable} "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}" PARENT_SCOPE) +- break() + endif() + endforeach() + endfunction() +@@ -864,18 +858,8 @@ + # if CUDAToolkit_ROOT is not specified, it is assumed that the symlinked + # directory is the desired location. + if(NOT CUDAToolkit_ROOT_DIR) +- if(UNIX) +- if(NOT APPLE) +- set(platform_base "/usr/local/cuda-") +- else() +- set(platform_base "/Developer/NVIDIA/CUDA-") +- endif() +- else() +- set(platform_base "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v") +- endif() +- + # Build out a descending list of possible cuda installations, e.g. +- file(GLOB possible_paths "${platform_base}*") ++ set(possible_paths) + # Iterate the glob results and create a descending list. + set(versions) + foreach(p ${possible_paths}) +@@ -891,14 +875,6 @@ + + # With a descending list of versions, populate possible paths to search. + set(search_paths) +- foreach(v ${versions}) +- list(APPEND search_paths "${platform_base}${v}") +- endforeach() +- +- # Force the global default /usr/local/cuda to the front on Unix. +- if(UNIX) +- list(INSERT search_paths 0 "/usr/local/cuda") +- endif() + + # Now search for the toolkit again using the platform default search paths. + _CUDAToolkit_find_root_dir(SEARCH_PATHS "${search_paths}" FIND_FLAGS PATH_SUFFIXES bin) +diff --git a/Modules/FindCoin3D.cmake b/Modules/FindCoin3D.cmake +index 1d89c604e0..5b70e71a87 100644 +--- a/Modules/FindCoin3D.cmake ++++ b/Modules/FindCoin3D.cmake +@@ -76,10 +76,8 @@ + else () + if(APPLE) + find_path(COIN3D_INCLUDE_DIRS Inventor/So.h +- /Library/Frameworks/Inventor.framework/Headers + ) + find_library(COIN3D_LIBRARIES Coin +- /Library/Frameworks/Inventor.framework/Libraries + ) + set(COIN3D_LIBRARIES "-framework Coin3d" CACHE STRING "Coin3D library for OSX") + else() +diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake +index 64600c6c64..de6af241a1 100644 +--- a/Modules/FindCurses.cmake ++++ b/Modules/FindCurses.cmake +@@ -136,15 +136,7 @@ + # message. Cygwin is an ncurses package, so force ncurses on + # cygwin if the curses.h is missing + if(CURSES_NCURSES_LIBRARY AND CYGWIN) +- if (CURSES_NEED_WIDE) +- if(NOT EXISTS /usr/include/ncursesw/curses.h) +- set(CURSES_USE_NCURSES TRUE) +- endif() +- else() +- if(NOT EXISTS /usr/include/curses.h) +- set(CURSES_USE_NCURSES TRUE) +- endif() +- endif() ++ set(CURSES_USE_NCURSES TRUE) + endif() + + +diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake +index 4e0ff47f52..6db26cb855 100644 +--- a/Modules/FindDCMTK.cmake ++++ b/Modules/FindDCMTK.cmake +@@ -88,14 +88,7 @@ + + set(_dcmtk_dir_description "The directory of DCMTK build or install tree.") + +-# Ensure that DCMTK_DIR is set to a reasonable default value +-# so that DCMTK libraries can be found on a standard Unix distribution. +-# It also overwrite the value of DCMTK_DIR after this one has been +-# set by a successful discovery of DCMTK by the unpatched FindDCMTK.cmake module +-# distributed with CMake (as of 0167cea) +-if(NOT DCMTK_DIR OR DCMTK_DIR STREQUAL "/usr/include/dcmtk") +- set(DCMTK_DIR "/usr" CACHE PATH ${_dcmtk_dir_description} FORCE) +-endif() ++set(DCMTK_DIR CACHE PATH ${_dcmtk_dir_description}) + + set(_SAVED_DCMTK_DIR ${DCMTK_DIR}) + +diff --git a/Modules/FindDart.cmake b/Modules/FindDart.cmake +index 96cce45590..245dffaf21 100644 +--- a/Modules/FindDart.cmake ++++ b/Modules/FindDart.cmake +@@ -24,7 +24,6 @@ + ENV DART_ROOT + PATHS + ${PROJECT_SOURCE_DIR} +- /usr/share + C:/ + "C:/Program Files" + ${PROJECT_SOURCE_DIR}/.. +diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake +index 2d430994e8..335c733150 100644 +--- a/Modules/FindDoxygen.cmake ++++ b/Modules/FindDoxygen.cmake +@@ -755,10 +755,6 @@ + NAMES doxygen + PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin" +- /Applications/Doxygen.app/Contents/Resources +- /Applications/Doxygen.app/Contents/MacOS +- /Applications/Utilities/Doxygen.app/Contents/Resources +- /Applications/Utilities/Doxygen.app/Contents/MacOS + DOC "Doxygen documentation generation tool (https://www.doxygen.nl)" + VALIDATOR _Doxygen_version_validator + ) +@@ -845,12 +841,6 @@ + "$ENV{ProgramFiles}/ATT/Graphviz/bin" + "C:/Program Files/ATT/Graphviz/bin" + [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin +- /Applications/Graphviz.app/Contents/MacOS +- /Applications/Utilities/Graphviz.app/Contents/MacOS +- /Applications/Doxygen.app/Contents/Resources +- /Applications/Doxygen.app/Contents/MacOS +- /Applications/Utilities/Doxygen.app/Contents/Resources +- /Applications/Utilities/Doxygen.app/Contents/MacOS + DOC "Dot tool for use with Doxygen" + ) + mark_as_advanced(DOXYGEN_DOT_EXECUTABLE) +diff --git a/Modules/FindFontconfig.cmake b/Modules/FindFontconfig.cmake +index 218ad2fbfa..94e6052564 100644 +--- a/Modules/FindFontconfig.cmake ++++ b/Modules/FindFontconfig.cmake +@@ -64,7 +64,6 @@ + fontconfig/fontconfig.h + HINTS + ${PKG_FONTCONFIG_INCLUDE_DIRS} +- /usr/X11/include + ) + + find_library( Fontconfig_LIBRARY +diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake +index e29758dc1c..d6255f98c2 100644 +--- a/Modules/FindGLUT.cmake ++++ b/Modules/FindGLUT.cmake +@@ -120,12 +120,10 @@ + set(_GLUT_glut_LIB_DIR /boot/develop/lib/x86) + else() + find_library( GLUT_Xi_LIBRARY Xi +- /usr/openwin/lib + ) + mark_as_advanced(GLUT_Xi_LIBRARY) + + find_library( GLUT_Xmu_LIBRARY Xmu +- /usr/openwin/lib + ) + mark_as_advanced(GLUT_Xmu_LIBRARY) + +@@ -145,11 +143,6 @@ + + find_path( GLUT_INCLUDE_DIR GL/glut.h + PATHS +- /usr/include/GL +- /usr/openwin/share/include +- /usr/openwin/include +- /opt/graphics/OpenGL/include +- /opt/graphics/OpenGL/contrib/libglut + ${_GLUT_INC_DIR} + HINTS + ${PC_GLUT_INCLUDE_DIRS} +@@ -158,7 +151,6 @@ + + find_library( GLUT_glut_LIBRARY glut + PATHS +- /usr/openwin/lib + ${_GLUT_glut_LIB_DIR} + HINTS + ${PC_GLUT_LIBRARY_DIRS} +diff --git a/Modules/FindGTK.cmake b/Modules/FindGTK.cmake +index 6e39f5a989..df231de76e 100644 +--- a/Modules/FindGTK.cmake ++++ b/Modules/FindGTK.cmake +@@ -71,9 +71,6 @@ + find_path( GTK_gtk_INCLUDE_PATH NAMES gtk/gtk.h + PATH_SUFFIXES gtk-1.2 gtk12 + PATHS +- /usr/openwin/share/include +- /usr/openwin/include +- /opt/gnome/include + ) + + # Some Linux distributions (e.g. Red Hat) have glibconfig.h +@@ -84,26 +81,17 @@ + find_path( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h + PATH_SUFFIXES glib/include lib/glib/include include/glib12 + PATHS +- /usr/openwin/share/include +- /opt/gnome/include +- /opt/gnome/lib/glib/include + ) + + find_path( GTK_glib_INCLUDE_PATH NAMES glib.h + PATH_SUFFIXES gtk-1.2 glib-1.2 glib12 glib/include lib/glib/include + PATHS +- /usr/openwin/share/include +- /opt/gnome/include + ) + + find_path( GTK_gtkgl_INCLUDE_PATH NAMES gtkgl/gtkglarea.h +- PATHS /usr/openwin/share/include +- /opt/gnome/include + ) + + find_library( GTK_gtkgl_LIBRARY gtkgl +- /usr/openwin/lib +- /opt/gnome/lib + ) + + # +@@ -112,38 +100,26 @@ + + find_library( GTK_gtk_LIBRARY + NAMES gtk gtk12 +- PATHS /usr/openwin/lib +- /opt/gnome/lib + ) + + find_library( GTK_gdk_LIBRARY + NAMES gdk gdk12 +- PATHS /usr/openwin/lib +- /opt/gnome/lib + ) + + find_library( GTK_gmodule_LIBRARY + NAMES gmodule gmodule12 +- PATHS /usr/openwin/lib +- /opt/gnome/lib + ) + + find_library( GTK_glib_LIBRARY + NAMES glib glib12 +- PATHS /usr/openwin/lib +- /opt/gnome/lib + ) + + find_library( GTK_Xi_LIBRARY + NAMES Xi +- PATHS /usr/openwin/lib +- /opt/gnome/lib + ) + + find_library( GTK_gthread_LIBRARY + NAMES gthread gthread12 +- PATHS /usr/openwin/lib +- /opt/gnome/lib + ) + + if(GTK_gtk_INCLUDE_PATH +diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake +index 9c5bc63272..87f8f81149 100644 +--- a/Modules/FindGTK2.cmake ++++ b/Modules/FindGTK2.cmake +@@ -377,34 +377,12 @@ + "include suffixes = ${_suffixes}") + endif() + +- if(CMAKE_LIBRARY_ARCHITECTURE) +- set(_gtk2_arch_dir /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}) +- if(GTK2_DEBUG) +- message(STATUS "Adding ${_gtk2_arch_dir} to search path for multiarch support") +- endif() +- endif() + find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr} + PATHS + ${PC_GLIB2_INCLUDEDIR} + ${PC_GLIB2_LIBDIR} + ${PC_GTK2_INCLUDEDIR} + ${PC_GTK2_LIBDIR} +- ${_gtk2_arch_dir} +- /usr/local/libx32 +- /usr/local/lib64 +- /usr/local/lib +- /usr/libx32 +- /usr/lib64 +- /usr/lib +- /opt/gnome/include +- /opt/gnome/lib +- /opt/openwin/include +- /usr/openwin/lib +- /sw/lib +- /opt/local/lib +- /opt/homebrew/lib +- /usr/pkg/lib +- /usr/pkg/include/glib + $ENV{GTKMM_BASEPATH}/include + $ENV{GTKMM_BASEPATH}/lib + [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include +@@ -509,8 +487,6 @@ + find_library(GTK2_${_var}_LIBRARY_RELEASE + NAMES ${_lib_list} + PATHS +- /opt/gnome/lib +- /usr/openwin/lib + $ENV{GTKMM_BASEPATH}/lib + [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib + [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib +diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake +index 82156747d3..cc3f2a64af 100644 +--- a/Modules/FindIce.cmake ++++ b/Modules/FindIce.cmake +@@ -629,11 +629,6 @@ + list(APPEND ice_roots "${ice_location}") + endif() + endforeach() +- else() +- foreach(ice_version ${ice_versions}) +- # Prefer 64-bit variants if present (and using a 64-bit compiler) +- list(APPEND ice_roots "/opt/Ice-${ice_version}") +- endforeach() + endif() + + # Find all Ice programs +@@ -689,7 +684,7 @@ + # In common use on Linux, MacOS X (homebrew) and FreeBSD; prefer + # version-specific dir + list(APPEND ice_slice_paths +- /usr/local/share /usr/share) ++ ) + list(APPEND ice_slice_suffixes + "Ice-${Ice_VERSION_SLICE2CPP_FULL}/slice" + "Ice-${Ice_VERSION_SLICE2CPP_SHORT}/slice" +diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake +index 10dcc51776..e272bd9583 100644 +--- a/Modules/FindJNI.cmake ++++ b/Modules/FindJNI.cmake +@@ -363,51 +363,6 @@ + endif() + + set(_JNI_JAVA_DIRECTORIES_BASE +- /usr/lib/jvm/java +- /usr/lib/java +- /usr/lib/jvm +- /usr/local/lib/java +- /usr/local/share/java +- /usr/lib/j2sdk1.4-sun +- /usr/lib/j2sdk1.5-sun +- /opt/sun-jdk-1.5.0.04 +- /usr/lib/jvm/java-6-sun +- /usr/lib/jvm/java-1.5.0-sun +- /usr/lib/jvm/java-6-sun-1.6.0.00 # can this one be removed according to #8821 ? Alex +- /usr/lib/jvm/java-6-openjdk +- /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0 # fedora +- # Debian specific paths for default JVM +- /usr/lib/jvm/default-java +- # Arch Linux specific paths for default JVM +- /usr/lib/jvm/default +- # Ubuntu specific paths for default JVM +- /usr/lib/jvm/java-21-openjdk-{libarch} # Ubuntu 23.04 +- /usr/lib/jvm/java-20-openjdk-{libarch} # Ubuntu 22.10 +- /usr/lib/jvm/java-19-openjdk-{libarch} # Ubuntu 22.04 LTS +- /usr/lib/jvm/java-18-openjdk-{libarch} # Ubuntu 22.04 LTS +- /usr/lib/jvm/java-17-openjdk-{libarch} # Ubuntu 18.04 LTS +- /usr/lib/jvm/java-16-openjdk-{libarch} # Ubuntu 20.04 LTS +- /usr/lib/jvm/java-13-openjdk-{libarch} # Ubuntu 20.04 LTS +- /usr/lib/jvm/java-11-openjdk-{libarch} # Ubuntu 18.04 LTS +- /usr/lib/jvm/java-8-openjdk-{libarch} # Ubuntu 15.10 +- /usr/lib/jvm/java-7-openjdk-{libarch} # Ubuntu 15.10 +- /usr/lib/jvm/java-6-openjdk-{libarch} # Ubuntu 15.10 +- # OpenBSD specific paths for default JVM +- /usr/local/jdk-1.7.0 +- /usr/local/jre-1.7.0 +- /usr/local/jdk-1.6.0 +- /usr/local/jre-1.6.0 +- # FreeBSD specific paths for default JVM +- /usr/local/openjdk15 +- /usr/local/openjdk14 +- /usr/local/openjdk13 +- /usr/local/openjdk12 +- /usr/local/openjdk11 +- /usr/local/openjdk8 +- /usr/local/openjdk7 +- # SuSE specific paths for default JVM +- /usr/lib64/jvm/java +- /usr/lib64/jvm/jre + ) + + set(_JNI_JAVA_AWT_LIBRARY_TRIES) +diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake +index 1587ce648b..e92213cba7 100644 +--- a/Modules/FindJava.cmake ++++ b/Modules/FindJava.cmake +@@ -199,17 +199,6 @@ + # Hard-coded guesses should still go in PATHS. This ensures that the user + # environment can always override hard guesses. + set(_JAVA_PATHS +- /usr/lib/java/bin +- /usr/share/java/bin +- /usr/local/java/bin +- /usr/local/java/share/bin +- /usr/java/j2sdk1.4.2_04 +- /usr/lib/j2sdk1.4-sun/bin +- /usr/java/j2sdk1.4.2_09/bin +- /usr/lib/j2sdk1.5-sun/bin +- /opt/sun-jdk-1.5.0.04/bin +- /usr/local/jdk-1.7.0/bin +- /usr/local/jdk-1.6.0/bin + ) + find_program(Java_JAVA_EXECUTABLE + NAMES java +diff --git a/Modules/FindKDE3.cmake b/Modules/FindKDE3.cmake +index ccfad5e7fb..265e99eb1a 100644 +--- a/Modules/FindKDE3.cmake ++++ b/Modules/FindKDE3.cmake +@@ -234,9 +234,6 @@ + find_program(KDECONFIG_EXECUTABLE NAMES kde-config + HINTS + $ENV{KDEDIR}/bin +- PATHS +- /opt/kde3/bin +- /opt/kde/bin + ) + + set(KDE3PREFIX) +@@ -261,9 +258,6 @@ + HINTS + $ENV{KDEDIR}/include + ${KDE3PREFIX}/include +- PATHS +- /opt/kde3/include +- /opt/kde/include + PATH_SUFFIXES include/kde + ) + +@@ -272,9 +266,6 @@ + HINTS + $ENV{KDEDIR}/lib + ${KDE3PREFIX}/lib +- PATHS +- /opt/kde3/lib +- /opt/kde/lib + ) + + set(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY}) +@@ -296,27 +287,18 @@ + HINTS + $ENV{KDEDIR}/bin + ${KDE3PREFIX}/bin +- PATHS +- /opt/kde3/bin +- /opt/kde/bin + ) + + find_program(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp + HINTS + $ENV{KDEDIR}/bin + ${KDE3PREFIX}/bin +- PATHS +- /opt/kde3/bin +- /opt/kde/bin + ) + + find_program(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler + HINTS + $ENV{KDEDIR}/bin + ${KDE3PREFIX}/bin +- PATHS +- /opt/kde3/bin +- /opt/kde/bin + ) + + +diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake +index 220906b2de..7eb7b692d8 100644 +--- a/Modules/FindKDE4.cmake ++++ b/Modules/FindKDE4.cmake +@@ -52,7 +52,6 @@ + HINTS + ${CMAKE_INSTALL_PREFIX} + ${_KDEDIRS} +- /opt/kde4 + ONLY_CMAKE_FIND_ROOT_PATH + ) + +diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake +index e272770af3..9f702c3f6d 100644 +--- a/Modules/FindLATEX.cmake ++++ b/Modules/FindLATEX.cmake +@@ -203,14 +203,12 @@ + find_program(LATEX_COMPILER + NAMES latex + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + + # find pdflatex + find_program(PDFLATEX_COMPILER + NAMES pdflatex + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (PDFLATEX_COMPILER) + set(LATEX_PDFLATEX_FOUND TRUE) +@@ -222,7 +220,6 @@ + find_program(XELATEX_COMPILER + NAMES xelatex + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (XELATEX_COMPILER) + set(LATEX_XELATEX_FOUND TRUE) +@@ -234,7 +231,6 @@ + find_program(LUALATEX_COMPILER + NAMES lualatex + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (LUALATEX_COMPILER) + set(LATEX_LUALATEX_FOUND TRUE) +@@ -246,7 +242,6 @@ + find_program(BIBTEX_COMPILER + NAMES bibtex + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (BIBTEX_COMPILER) + set(LATEX_BIBTEX_FOUND TRUE) +@@ -258,7 +253,6 @@ + find_program(BIBER_COMPILER + NAMES biber + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (BIBER_COMPILER) + set(LATEX_BIBER_FOUND TRUE) +@@ -270,7 +264,6 @@ + find_program(MAKEINDEX_COMPILER + NAMES makeindex + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (MAKEINDEX_COMPILER) + set(LATEX_MAKEINDEX_FOUND TRUE) +@@ -282,7 +275,6 @@ + find_program(XINDY_COMPILER + NAMES xindy + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (XINDY_COMPILER) + set(LATEX_XINDY_FOUND TRUE) +@@ -294,7 +286,6 @@ + find_program(DVIPS_CONVERTER + NAMES dvips + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (DVIPS_CONVERTER) + set(LATEX_DVIPS_FOUND TRUE) +@@ -306,7 +297,6 @@ + find_program(DVIPDF_CONVERTER + NAMES dvipdfm dvipdft dvipdf + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (DVIPDF_CONVERTER) + set(LATEX_DVIPDF_FOUND TRUE) +@@ -336,7 +326,6 @@ + find_program(PDFTOPS_CONVERTER + NAMES pdftops + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (PDFTOPS_CONVERTER) + set(LATEX_PDFTOPS_FOUND TRUE) +@@ -348,7 +337,6 @@ + find_program(LATEX2HTML_CONVERTER + NAMES latex2html + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (LATEX2HTML_CONVERTER) + set(LATEX_LATEX2HTML_FOUND TRUE) +@@ -360,7 +348,6 @@ + find_program(HTLATEX_COMPILER + NAMES htlatex + PATHS ${MIKTEX_BINARY_PATH} +- /usr/bin + ) + if (HTLATEX_COMPILER) + set(LATEX_HTLATEX_FOUND TRUE) +diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake +index ac36c86640..fe5d2147e8 100644 +--- a/Modules/FindLua50.cmake ++++ b/Modules/FindLua50.cmake +@@ -84,10 +84,6 @@ + HINTS + ENV LUA_DIR + PATH_SUFFIXES lua50 lua5.0 lua5 lua +- PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /opt + ) + + find_library(LUA_LIBRARY_lua +@@ -95,10 +91,6 @@ + HINTS + ENV LUA_DIR + PATH_SUFFIXES lib +- PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /opt + ) + + # In an OS X framework, lualib is usually included as part of the framework +@@ -113,7 +105,6 @@ + ENV LUA_DIR + PATH_SUFFIXES lib + PATHS +- /opt + ) + if(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua) + # include the math library for Unix +diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake +index cba30e4b58..21a95cb89f 100644 +--- a/Modules/FindLua51.cmake ++++ b/Modules/FindLua51.cmake +@@ -87,10 +87,6 @@ + HINTS + ENV LUA_DIR + PATH_SUFFIXES lua51 lua5.1 lua-5.1 lua +- PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /opt + ) + + find_library(LUA_LIBRARY +@@ -98,10 +94,6 @@ + HINTS + ENV LUA_DIR + PATH_SUFFIXES lib +- PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /opt + ) + + if(LUA_LIBRARY) +diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake +index 78b1c5c915..741f86aaef 100644 +--- a/Modules/FindMPI.cmake ++++ b/Modules/FindMPI.cmake +@@ -1349,15 +1349,6 @@ + endmacro() + + set(MPI_HINT_DIRS ${MPI_HOME} $ENV{MPI_HOME} $ENV{I_MPI_ROOT}) +-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") +- # SUSE Linux Enterprise Server stores its MPI implementations under /usr/lib64/mpi/gcc/ +- # We enumerate the subfolders and append each as a prefix +- MPI_search_mpi_prefix_folder("/usr/lib64/mpi/gcc") +-elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") +- # FreeBSD ships mpich under the normal system paths - but available openmpi implementations +- # will be found in /usr/local/mpi/ +- MPI_search_mpi_prefix_folder("/usr/local/mpi") +-endif() + + # Most MPI distributions have some form of mpiexec or mpirun which gives us something we can look for. + # The MPI standard does not mandate the existence of either, but instead only makes requirements if a distribution +diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake +index 8a7bd80957..74009fbebc 100644 +--- a/Modules/FindMatlab.cmake ++++ b/Modules/FindMatlab.cmake +@@ -1529,7 +1529,7 @@ + endif() + + foreach(_matlab_current_release IN LISTS _matlab_releases) +- foreach(_macos_app_base IN ITEMS "$ENV{HOME}/Applications" "/Applications") ++ foreach(_macos_app_base IN ITEMS) + matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version) + string(REPLACE "." "" _matlab_current_version_without_dot "${_matlab_current_version}") + set(_matlab_base_path "${_macos_app_base}/MATLAB_${_matlab_current_release}.app") +diff --git a/Modules/FindMotif.cmake b/Modules/FindMotif.cmake +index d72b19309e..5753e5c3dc 100644 +--- a/Modules/FindMotif.cmake ++++ b/Modules/FindMotif.cmake +@@ -39,12 +39,10 @@ + if(UNIX) + find_path(MOTIF_INCLUDE_DIR + Xm/Xm.h +- /usr/openwin/include + ) + + find_library(MOTIF_LIBRARIES + Xm +- /usr/openwin/lib + ) + + endif() +diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake +index dad9ada128..32d02db7c3 100644 +--- a/Modules/FindOpenAL.cmake ++++ b/Modules/FindOpenAL.cmake +@@ -95,9 +95,6 @@ + HINTS + ENV OPENALDIR + PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /opt + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] + PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL + ) +@@ -113,9 +110,6 @@ + HINTS + ENV OPENALDIR + PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /opt + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] + PATH_SUFFIXES libx32 lib64 lib libs64 libs ${_OpenAL_ARCH_DIR} + ) +diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake +index 3be945ba1b..4086ebe2f2 100644 +--- a/Modules/FindOpenCL.cmake ++++ b/Modules/FindOpenCL.cmake +@@ -113,8 +113,6 @@ + ENV CUDA_PATH + ENV ATISTREAMSDKROOT + ENV OCL_ROOT +- /usr/local/cuda +- /opt/cuda + PATH_SUFFIXES + include + OpenCL/common/inc +@@ -170,8 +168,6 @@ + PATHS + ENV AMDAPPSDKROOT + ENV CUDA_PATH +- /usr/local/cuda +- /opt/cuda + PATH_SUFFIXES + lib/x86 + lib) +@@ -181,8 +177,6 @@ + PATHS + ENV AMDAPPSDKROOT + ENV CUDA_PATH +- /usr/local/cuda +- /opt/cuda + PATH_SUFFIXES + lib/x86_64 + lib/x64 +diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake +index a842756fcf..a02a66eb60 100644 +--- a/Modules/FindOpenGL.cmake ++++ b/Modules/FindOpenGL.cmake +@@ -271,12 +271,7 @@ + set(_OPENGL_INCLUDE_PATH + /boot/develop/headers/os/opengl) + elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") +- # CMake doesn't support arbitrary globs in search paths. +- file(GLOB _OPENGL_LIB_PATH +- # The NVidia driver installation tool on Linux installs libraries to a +- # `nvidia-` subdirectory. +- "/usr/lib/nvidia-*" +- "/usr/lib32/nvidia-*") ++ set(_OPENGL_LIB_PATH) + endif() + + # The first line below is to make sure that the proper headers +@@ -287,9 +282,6 @@ + # Make sure the NVIDIA directory comes BEFORE the others. + # - Atanas Georgiev + find_path(OPENGL_INCLUDE_DIR GL/gl.h +- /usr/share/doc/NVIDIA_GLX-1.0/include +- /usr/openwin/share/include +- /opt/graphics/OpenGL/include + ${_OPENGL_INCLUDE_PATH} + ) + find_path(OPENGL_GLX_INCLUDE_DIR GL/glx.h ${_OPENGL_INCLUDE_PATH}) +@@ -297,9 +289,6 @@ + find_path(OPENGL_GLES2_INCLUDE_DIR GLES2/gl2.h ${_OPENGL_INCLUDE_PATH}) + find_path(OPENGL_GLES3_INCLUDE_DIR GLES3/gl3.h ${_OPENGL_INCLUDE_PATH}) + find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h +- /usr/share/doc/NVIDIA_GLX-1.0/include +- /usr/openwin/share/include +- /opt/graphics/OpenGL/include + ) + + find_path(OPENGL_GLU_INCLUDE_DIR GL/glu.h ${_OPENGL_INCLUDE_PATH}) +@@ -347,9 +336,6 @@ + find_library(OPENGL_glu_LIBRARY + NAMES GLU MesaGLU + PATHS ${OPENGL_gl_LIBRARY} +- /opt/graphics/OpenGL/lib +- /usr/openwin/lib +- /usr/shlib + ) + + list(APPEND _OpenGL_CACHE_VARS +@@ -401,10 +387,7 @@ + # Search for the legacy GL library. + find_library(OPENGL_gl_LIBRARY + NAMES GL MesaGL +- PATHS /opt/graphics/OpenGL/lib +- /usr/openwin/lib +- /usr/shlib +- ${_OPENGL_LIB_PATH} ++ PATHS ${_OPENGL_LIB_PATH} + PATH_SUFFIXES libglvnd + ) + list(APPEND _OpenGL_CACHE_VARS OPENGL_gl_LIBRARY) +@@ -513,9 +496,6 @@ + find_library(OPENGL_glu_LIBRARY + NAMES GLU MesaGLU + PATHS ${OPENGL_gl_LIBRARY} +- /opt/graphics/OpenGL/lib +- /usr/openwin/lib +- /usr/shlib + ) + endif () + +diff --git a/Modules/FindPHP4.cmake b/Modules/FindPHP4.cmake +index edef791cb8..5515f44710 100644 +--- a/Modules/FindPHP4.cmake ++++ b/Modules/FindPHP4.cmake +@@ -36,15 +36,9 @@ + #]=======================================================================] + + set(PHP4_POSSIBLE_INCLUDE_PATHS +- /usr/include/php4 +- /usr/local/include/php4 +- /usr/include/php +- /usr/local/include/php +- /usr/local/apache/php + ) + + set(PHP4_POSSIBLE_LIB_PATHS +- /usr/lib + ) + + find_path(PHP4_FOUND_INCLUDE_PATH main/php.h +diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake +index 330700e183..7fc89df6eb 100644 +--- a/Modules/FindPerlLibs.cmake ++++ b/Modules/FindPerlLibs.cmake +@@ -141,10 +141,6 @@ + PATHS + "${PERL_UPDATE_ARCHLIB}/CORE" + "${PERL_ARCHLIB}/CORE" +- /usr/lib/perl5/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE +- /usr/lib/perl/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE +- /usr/lib/perl5/${PERL_VERSION_STRING}/CORE +- /usr/lib/perl/${PERL_VERSION_STRING}/CORE + ) + + ### PERL_LIBRARY +@@ -154,10 +150,6 @@ + PATHS + "${PERL_UPDATE_ARCHLIB}/CORE" + "${PERL_ARCHLIB}/CORE" +- /usr/lib/perl5/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE +- /usr/lib/perl/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE +- /usr/lib/perl5/${PERL_VERSION_STRING}/CORE +- /usr/lib/perl/${PERL_VERSION_STRING}/CORE + ) + + endif () +diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake +index 1894498d9d..03c6e61853 100644 +--- a/Modules/FindPhysFS.cmake ++++ b/Modules/FindPhysFS.cmake +@@ -52,10 +52,6 @@ + HINTS + ENV PHYSFSDIR + PATH_SUFFIXES include/physfs include +- PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /opt + ) + + find_library(PHYSFS_LIBRARY +@@ -63,10 +59,6 @@ + HINTS + ENV PHYSFSDIR + PATH_SUFFIXES lib +- PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /opt + ) + + include(FindPackageHandleStandardArgs) +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index b230eb5ef5..bf7b204406 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -391,7 +391,7 @@ + if(NOT DEFINED CMAKE_SYSTEM_NAME + OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|GNU)$" + AND NOT CMAKE_CROSSCOMPILING)) +- if(EXISTS "/etc/debian_version") # is this a debian system ? ++ if(FALSE) # is this a debian system ? + if(CMAKE_LIBRARY_ARCHITECTURE) + list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig") + endif() +diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake +index 1d034bc207..d176655f46 100644 +--- a/Modules/FindProducer.cmake ++++ b/Modules/FindProducer.cmake +@@ -100,9 +100,6 @@ + ENV OSGDIR + PATH_SUFFIXES include + PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /opt + [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] + [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] + ) +@@ -114,8 +111,6 @@ + ENV OSG_DIR + ENV OSGDIR + PATH_SUFFIXES lib +- PATHS +- /opt + ) + + include(FindPackageHandleStandardArgs) +diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake +index a9441646d1..28ba743f60 100644 +--- a/Modules/FindPython/Support.cmake ++++ b/Modules/FindPython/Support.cmake +@@ -162,9 +162,6 @@ + file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _pff_CMAKE_FRAMEWORK_PATH) + set (_pff_frameworks ${CMAKE_FRAMEWORK_PATH} + ${_pff_CMAKE_FRAMEWORK_PATH} +- ~/Library/Frameworks +- /usr/local/Frameworks +- /opt/homebrew/Frameworks + ${CMAKE_SYSTEM_FRAMEWORK_PATH}) + list (REMOVE_DUPLICATES _pff_frameworks) + foreach (_pff_implementation IN LISTS _${_PYTHON_PREFIX}_FIND_IMPLEMENTATIONS) +diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake +index 98cd1e2abf..90ad88365d 100644 +--- a/Modules/FindQt.cmake ++++ b/Modules/FindQt.cmake +@@ -63,44 +63,6 @@ + return() + endif() + +-# look for signs of qt3 installations +-file(GLOB GLOB_TEMP_VAR /usr/lib*/qt-3*/bin/qmake /usr/lib*/qt3*/bin/qmake) +-if(GLOB_TEMP_VAR) +- set(QT3_INSTALLED TRUE) +-endif() +-set(GLOB_TEMP_VAR) +- +-file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-3*/bin/qmake) +-if(GLOB_TEMP_VAR) +- set(QT3_INSTALLED TRUE) +-endif() +-set(GLOB_TEMP_VAR) +- +-file(GLOB GLOB_TEMP_VAR /usr/local/lib/qt3/bin/qmake) +-if(GLOB_TEMP_VAR) +- set(QT3_INSTALLED TRUE) +-endif() +-set(GLOB_TEMP_VAR) +- +-# look for qt4 installations +-file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/qmake) +-if(GLOB_TEMP_VAR) +- set(QT4_INSTALLED TRUE) +-endif() +-set(GLOB_TEMP_VAR) +- +-file(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/bin/qmake) +-if(GLOB_TEMP_VAR) +- set(QT4_INSTALLED TRUE) +-endif() +-set(GLOB_TEMP_VAR) +- +-file(GLOB GLOB_TEMP_VAR /usr/local/lib/qt4/bin/qmake) +-if(GLOB_TEMP_VAR) +- set(QT4_INSTALLED TRUE) +-endif() +-set(GLOB_TEMP_VAR) +- + if (Qt_FIND_VERSION) + if (Qt_FIND_VERSION MATCHES "^([34])(\\.[0-9]+.*)?$") + set(DESIRED_QT_VERSION ${CMAKE_MATCH_1}) +@@ -135,9 +97,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" + ${qt_headers}/Qt + $ENV{QTDIR}/include/Qt +- /usr/lib/qt/include/Qt +- /usr/share/qt4/include/Qt +- /usr/local/include/X11/qt4/Qt + C:/Progra~1/qt/include/Qt + PATH_SUFFIXES qt/include/Qt include/Qt) + +@@ -152,9 +111,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" + C:/Qt/3.3.3Educational/include + $ENV{QTDIR}/include +- /usr/include/qt3/Qt +- /usr/share/qt3/include +- /usr/local/include/X11/qt3 + C:/Progra~1/qt/include + PATH_SUFFIXES qt/include include/qt3) + +diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake +index 2c62a5f17f..772a8d88f6 100644 +--- a/Modules/FindQt3.cmake ++++ b/Modules/FindQt3.cmake +@@ -101,10 +101,6 @@ + endif() + + +-file(GLOB GLOB_PATHS /usr/lib/qt-3*) +-foreach(GLOB_PATH ${GLOB_PATHS}) +- list(APPEND GLOB_PATHS_BIN "${GLOB_PATH}/bin") +-endforeach() + find_path(QT_INCLUDE_DIR + NAMES qt.h + PATHS +@@ -112,10 +108,7 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" + $ENV{QTDIR}/include +- ${GLOB_PATHS} +- /usr/share/qt3/include + C:/Progra~1/qt/include +- /usr/local/include/X11/qt3 + PATH_SUFFIXES lib/qt/include lib/qt3/include include/qt include/qt3 qt/include qt3/include + ) + +@@ -137,7 +130,6 @@ + set(QT_VERSION_STRING "${qt_version_str}") + endif() + +-file(GLOB GLOB_PATHS_LIB /usr/lib/qt-3*/lib/) + if (QT_MT_REQUIRED) + find_library(QT_QT_LIBRARY + NAMES +@@ -148,8 +140,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" + ENV QTDIR +- ${GLOB_PATHS_LIB} +- /usr/share/qt3 + C:/Progra~1/qt + PATH_SUFFIXES + lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib +@@ -166,8 +156,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" + ENV QTDIR +- ${GLOB_PATHS_LIB} +- /usr/share/qt3 + C:/Progra~1/qt/lib + PATH_SUFFIXES + lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib +@@ -182,8 +170,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" + ENV QTDIR +- ${GLOB_PATHS_LIB} +- /usr/share/qt3 + C:/Progra~1/qt + PATH_SUFFIXES + lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib +@@ -198,8 +184,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" +- ${GLOB_PATHS_BIN} +- /usr/share/qt3 + C:/Progra~1/qt + PATH_SUFFIXES + bin lib/qt lib/qt3 qt qt3 qt/bin qt3/bin lib/qt/bin lib/qt3/bin +@@ -218,8 +202,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" +- ${GLOB_PATHS_BIN} +- /usr/share/qt3 + C:/Progra~1/qt + PATH_SUFFIXES + bin lib/qt lib/qt3 qt qt3 qt/bin qt3/bin lib/qt/bin lib/qt3/bin +diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake +index 18b9e35855..dba9976565 100644 +--- a/Modules/FindRuby.cmake ++++ b/Modules/FindRuby.cmake +@@ -367,7 +367,6 @@ + HINTS + ${Ruby_HDR_DIR} + ${Ruby_ARCH_DIR} +- /usr/lib/ruby/${_Ruby_VERSION_SHORT}/i586-linux-gnu/ + ) + + set(Ruby_INCLUDE_DIRS ${Ruby_INCLUDE_DIR}) +diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake +index a720dcc3df..73e222a27c 100644 +--- a/Modules/FindSDL.cmake ++++ b/Modules/FindSDL.cmake +@@ -214,8 +214,6 @@ + HINTS + ENV SDLDIR + PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} +- PATHS +- /opt + ) + endif() + endif() +diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake +index 954303f3d3..26a5781e2a 100644 +--- a/Modules/FindSDL_sound.cmake ++++ b/Modules/FindSDL_sound.cmake +@@ -292,7 +292,6 @@ + ENV MIKMODDIR + ENV SDLSOUNDDIR + ENV SDLDIR +- /opt + PATH_SUFFIXES + lib + ) +@@ -309,7 +308,6 @@ + ENV MODPLUGDIR + ENV SDLSOUNDDIR + ENV SDLDIR +- /opt + PATH_SUFFIXES + lib + ) +@@ -328,7 +326,6 @@ + ENV OGGDIR + ENV SDLSOUNDDIR + ENV SDLDIR +- /opt + PATH_SUFFIXES + lib + ) +@@ -343,7 +340,6 @@ + ENV VORBISDIR + ENV SDLSOUNDDIR + ENV SDLDIR +- /opt + PATH_SUFFIXES + lib + ) +@@ -361,7 +357,6 @@ + ENV SMPEGDIR + ENV SDLSOUNDDIR + ENV SDLDIR +- /opt + PATH_SUFFIXES + lib + ) +@@ -379,7 +374,6 @@ + ENV FLACDIR + ENV SDLSOUNDDIR + ENV SDLDIR +- /opt + PATH_SUFFIXES + lib + ) +@@ -400,7 +394,6 @@ + ENV SPEEXDIR + ENV SDLSOUNDDIR + ENV SDLDIR +- /opt + PATH_SUFFIXES + lib + ) +@@ -419,7 +412,6 @@ + ENV SPEEXDIR + ENV SDLSOUNDDIR + ENV SDLDIR +- /opt + PATH_SUFFIXES lib + ) + if(OGG_LIBRARY) +diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake +index b2f23bd1dd..9a94529589 100644 +--- a/Modules/FindX11.cmake ++++ b/Modules/FindX11.cmake +@@ -138,22 +138,9 @@ + set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET}) + set(CMAKE_REQUIRED_QUIET ${X11_FIND_QUIETLY}) + set(X11_INC_SEARCH_PATH +- /usr/pkg/xorg/include +- /usr/X11R6/include +- /usr/X11R7/include +- /usr/include/X11 +- /usr/openwin/include +- /usr/openwin/share/include +- /opt/graphics/OpenGL/include +- /opt/X11/include + ) + + set(X11_LIB_SEARCH_PATH +- /usr/pkg/xorg/lib +- /usr/X11R6/lib +- /usr/X11R7/lib +- /usr/openwin/lib +- /opt/X11/lib + ) + + find_path(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) +diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake +index ff9c11a9d7..706b34b087 100644 +--- a/Modules/GNUInstallDirs.cmake ++++ b/Modules/GNUInstallDirs.cmake +@@ -336,17 +336,6 @@ + set(${out_var} "conda") + endif() + endif() +- # If we didn't detect conda from the previous step, check +- # for the linux variant +- if(NOT ${out_var}) +- if (EXISTS "/etc/alpine-release") +- set(${out_var} "alpine") +- elseif (EXISTS "/etc/arch-release") +- set(${out_var} "arch linux") +- elseif (EXISTS "/etc/debian_version") +- set(${out_var} "debian") +- endif() +- endif() + return(PROPAGATE ${out_var}) + endfunction() + +diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake +index f1f5db7b7b..9b4bdddb36 100644 +--- a/Modules/GetPrerequisites.cmake ++++ b/Modules/GetPrerequisites.cmake +@@ -458,11 +458,9 @@ + if(NOT resolved) + set(ri "ri-NOTFOUND") + find_file(ri "${item}" ${exepath} ${dirs} NO_DEFAULT_PATH) +- find_file(ri "${item}" ${exepath} ${dirs} /usr/lib) + + get_filename_component(basename_item "${item}" NAME) + find_file(ri "${basename_item}" PATHS ${exepath} ${dirs} NO_DEFAULT_PATH) +- find_file(ri "${basename_item}" PATHS /usr/lib) + + if(ri) + #message(STATUS "info: 'find_file' in exepath/dirs (${ri})") +@@ -472,23 +470,6 @@ + endif() + endif() + +- if(NOT resolved) +- if(item MATCHES "[^/]+\\.framework/") +- set(fw "fw-NOTFOUND") +- find_file(fw "${item}" +- "~/Library/Frameworks" +- "/Library/Frameworks" +- "/System/Library/Frameworks" +- ) +- if(fw) +- #message(STATUS "info: 'find_file' found framework (${fw})") +- set(resolved 1) +- set(resolved_item "${fw}") +- set(fw "fw-NOTFOUND") +- endif() +- endif() +- endif() +- + # Using find_program on Windows will find dll files that are in the PATH. + # (Converting simple file names into full path names if found.) + # +diff --git a/Modules/Internal/CMakeCUDAFindToolkit.cmake b/Modules/Internal/CMakeCUDAFindToolkit.cmake +index 8fd408994f..61894813a2 100644 +--- a/Modules/Internal/CMakeCUDAFindToolkit.cmake ++++ b/Modules/Internal/CMakeCUDAFindToolkit.cmake +@@ -50,18 +50,8 @@ + # if CUDAToolkit_ROOT is not specified, it is assumed that the symlinked + # directory is the desired location. + if(NOT _CUDA_NVCC_EXECUTABLE) +- if(UNIX) +- if(NOT APPLE) +- set(platform_base "/usr/local/cuda-") +- else() +- set(platform_base "/Developer/NVIDIA/CUDA-") +- endif() +- else() +- set(platform_base "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v") +- endif() +- + # Build out a descending list of possible cuda installations, e.g. +- file(GLOB possible_paths "${platform_base}*") ++ set(possible_paths) + # Iterate the glob results and create a descending list. + set(versions) + foreach(p ${possible_paths}) +@@ -77,14 +67,6 @@ + + # With a descending list of versions, populate possible paths to search. + set(search_paths) +- foreach(v ${versions}) +- list(APPEND search_paths "${platform_base}${v}") +- endforeach() +- +- # Force the global default /usr/local/cuda to the front on Unix. +- if(UNIX) +- list(INSERT search_paths 0 "/usr/local/cuda") +- endif() + + # Now search for nvcc again using the platform default search paths. + find_program(_CUDA_NVCC_EXECUTABLE +@@ -140,23 +122,13 @@ + set(${lang_var_}LIBRARY_ROOT "${_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR}") + elseif(EXISTS "${${lang_var_}TOOLKIT_ROOT}/nvvm/libdevice") + set(${lang_var_}LIBRARY_ROOT "${${lang_var_}TOOLKIT_ROOT}") +- elseif(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/nvvm/libdevice") +- set(${lang_var_}LIBRARY_ROOT "${CMAKE_SYSROOT_LINK}/usr/lib/cuda") +- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/cuda/nvvm/libdevice") +- set(${lang_var_}LIBRARY_ROOT "${CMAKE_SYSROOT}/usr/lib/cuda") + else() + message(FATAL_ERROR "Couldn't find CUDA library root.") + endif() + unset(_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR) + + # ${lang_var_}TOOLKIT_LIBRARY_ROOT contains the linking stubs necessary for device linking and other low-level library files. +- if(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/nvidia-cuda-toolkit/bin/crt/link.stub") +- set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${CMAKE_SYSROOT_LINK}/usr/lib/nvidia-cuda-toolkit") +- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/nvidia-cuda-toolkit/bin/crt/link.stub") +- set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${CMAKE_SYSROOT}/usr/lib/nvidia-cuda-toolkit") +- else() +- set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${${lang_var_}TOOLKIT_ROOT}") +- endif() ++ set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${${lang_var_}TOOLKIT_ROOT}") + + # For regular nvcc we the toolkit version is the same as the compiler version and we can parse it from the vendor test output. + # For Clang we need to invoke nvcc to get version output. +diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake +index b733cfe964..90709f48e8 100644 +--- a/Modules/Internal/CPack/CPackRPM.cmake ++++ b/Modules/Internal/CPack/CPackRPM.cmake +@@ -640,7 +640,7 @@ + endif() + + # With debugedit we prepare source files list +- find_program(DEBUGEDIT_EXECUTABLE debugedit "/usr/lib/rpm/") ++ find_program(DEBUGEDIT_EXECUTABLE debugedit) + if(NOT DEBUGEDIT_EXECUTABLE) + message(FATAL_ERROR "CPackRPM: debugedit binary could not be found!" + " Required for debuginfo packaging. See documentation of" +diff --git a/Modules/Platform/CYGWIN.cmake b/Modules/Platform/CYGWIN.cmake +index cf5e732833..1bbbfeca54 100644 +--- a/Modules/Platform/CYGWIN.cmake ++++ b/Modules/Platform/CYGWIN.cmake +@@ -15,13 +15,3 @@ + set(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 1) + + include(Platform/UnixPaths) +- +-# Windows API on Cygwin +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- /usr/include/w32api +- ) +- +-# Windows API on Cygwin +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- /usr/lib/w32api +- ) +diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake +index 7c4f123a1d..4cfd53de9f 100644 +--- a/Modules/Platform/Darwin-Initialize.cmake ++++ b/Modules/Platform/Darwin-Initialize.cmake +@@ -1,19 +1,7 @@ + set(APPLE 1) + set(UNIX 1) + +-# Ask xcode-select where to find /Developer or fall back to ancient location. +-execute_process(COMMAND xcode-select -print-path +- OUTPUT_VARIABLE _stdout +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ERROR_VARIABLE _stderr +- RESULT_VARIABLE _failed) +-if(NOT _failed AND IS_DIRECTORY ${_stdout}) +- set(OSX_DEVELOPER_ROOT ${_stdout}) +-elseif(IS_DIRECTORY "/Developer") +- set(OSX_DEVELOPER_ROOT "/Developer") +-else() +- set(OSX_DEVELOPER_ROOT "") +-endif() ++set(OSX_DEVELOPER_ROOT "") + + if(NOT CMAKE_CROSSCOMPILING) + execute_process(COMMAND @sw_vers@ -productVersion +diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake +index 42c6b35424..f2985f3765 100644 +--- a/Modules/Platform/Darwin.cmake ++++ b/Modules/Platform/Darwin.cmake +@@ -166,7 +166,6 @@ + + # set up the default search directories for frameworks + set(CMAKE_SYSTEM_FRAMEWORK_PATH +- ~/Library/Frameworks + ) + if(_CMAKE_OSX_SYSROOT_PATH) + list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH +@@ -201,10 +200,6 @@ + list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH + ${OSX_DEVELOPER_ROOT}/Library/Frameworks) + endif() +-list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH +- /Library/Frameworks +- /Network/Library/Frameworks +- /System/Library/Frameworks) + + # Warn about known system misconfiguration case. + if(CMAKE_OSX_SYSROOT) +@@ -230,10 +225,6 @@ + # set up the default search directories for application bundles + set(_apps_paths) + foreach(_path +- "~/Applications" +- "/Applications" +- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ +- "${OSX_DEVELOPER_ROOT}/Applications" # pre-4.3 + ) + get_filename_component(_apps "${_path}" ABSOLUTE) + if(EXISTS "${_apps}") +@@ -249,28 +240,6 @@ + + include(Platform/UnixPaths) + +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +- execute_process( +- COMMAND brew --prefix +- OUTPUT_VARIABLE _cmake_homebrew_prefix +- RESULT_VARIABLE _brew_result +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- if (_brew_result EQUAL 0 AND IS_DIRECTORY "${_cmake_homebrew_prefix}") +- list(PREPEND CMAKE_SYSTEM_PREFIX_PATH "${_cmake_homebrew_prefix}") +- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") +- list(PREPEND CMAKE_SYSTEM_PREFIX_PATH +- /opt/homebrew # Brew on Apple Silicon +- ) +- else() +- list(PREPEND CMAKE_SYSTEM_PREFIX_PATH +- /usr/local # Brew on Intel +- ) +- endif() +- unset(_cmake_homebrew_prefix) +- unset(_brew_result) +-endif() +- + if(_CMAKE_OSX_SYSROOT_PATH) + if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include) + list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr) +@@ -285,7 +254,3 @@ + endforeach() + endif() + endif() +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- /sw # Fink +- /opt/local # MacPorts +- ) +diff --git a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake +index 6a25b00b81..2430bdb7e4 100644 +--- a/Modules/Platform/GNU.cmake ++++ b/Modules/Platform/GNU.cmake +@@ -48,13 +48,8 @@ + # checking the platform every time. This option is advanced enough + # that only package maintainers should need to adjust it. They are + # capable of providing a setting on the command line. +- if(EXISTS "/etc/debian_version") +- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL +- "Install .so files without execute permission.") +- else() +- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL +- "Install .so files without execute permission.") +- endif() ++ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL ++ "Install .so files without execute permission.") + endif() + + include(Platform/UnixPaths) +diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake +index 5b61dd6b61..d324b903ed 100644 +--- a/Modules/Platform/Linux.cmake ++++ b/Modules/Platform/Linux.cmake +@@ -45,25 +45,8 @@ + # checking the platform every time. This option is advanced enough + # that only package maintainers should need to adjust it. They are + # capable of providing a setting on the command line. +- if(EXISTS "/etc/debian_version") +- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL +- "Install .so files without execute permission.") +- else() +- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL +- "Install .so files without execute permission.") +- endif() ++ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL ++ "Install .so files without execute permission.") + endif() + + include(Platform/UnixPaths) +- +-# Debian has lib32 and lib64 paths only for compatibility so they should not be +-# searched. +-if(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_COMPILER_SYSROOT) +- if (EXISTS "/etc/debian_version") +- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) +- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +- endif() +- if (EXISTS "/etc/arch-release") +- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +- endif() +-endif() +diff --git a/Modules/Platform/OpenBSD.cmake b/Modules/Platform/OpenBSD.cmake +index 97e2a6a83e..02c607618c 100644 +--- a/Modules/Platform/OpenBSD.cmake ++++ b/Modules/Platform/OpenBSD.cmake +@@ -31,13 +31,9 @@ + + if($ENV{LOCALBASE}) + set(OPENBSD_LOCALBASE $ENV{LOCALBASE}) +-else() +- set(OPENBSD_LOCALBASE /usr/local) + endif() + if($ENV{X11BASE}) + set(OPENBSD_X11BASE $ENV{X11BASE}) +-else() +- set(OPENBSD_X11BASE /usr/X11R6) + endif() + + list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${OPENBSD_LOCALBASE}) +diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake +index e01e892283..d044d81c88 100644 +--- a/Modules/Platform/SunOS.cmake ++++ b/Modules/Platform/SunOS.cmake +@@ -19,11 +19,6 @@ + + include(Platform/UnixPaths) + +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- /opt/csw +- /opt/openwin +- ) +- + # The Sun linker needs to find transitive shared library dependencies + # in the -L path. + set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1) +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index bdf4155232..588064821d 100644 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -29,9 +29,6 @@ + # please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst + # synchronized + list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- # Standard +- /usr/local /usr / +- + # CMake install location + "${_CMAKE_INSTALL_DIR}" + ) +@@ -49,28 +46,6 @@ + endif() + _cmake_record_install_prefix() + +-# Non "standard" but common install prefixes +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- /usr/X11R6 +- /usr/pkg +- /opt +- ) +- +-# List common include file locations not under the common prefixes. +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # X11 +- /usr/include/X11 +- ) +- +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # X11 +- /usr/lib/X11 +- ) +- +-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 +- ) +- + # Add the Nix C library paths. + if(DEFINED ENV{NIX_CC} + AND IS_DIRECTORY "$ENV{NIX_CC}" +diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake +index c56dfaf9ac..4e0b250c1a 100644 +--- a/Modules/Platform/WindowsPaths.cmake ++++ b/Modules/Platform/WindowsPaths.cmake +@@ -69,11 +69,6 @@ + endif() + _cmake_record_install_prefix() + +-if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") +- # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set) +- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) +-endif() +- + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH + ) + +diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake +index ffb8fcd8d2..6b8fcf87dc 100644 +--- a/Modules/ProcessorCount.cmake ++++ b/Modules/ProcessorCount.cmake +@@ -128,7 +128,7 @@ + if(NOT count) + # HPUX (systems with machinfo): + find_program(ProcessorCount_cmd_machinfo machinfo +- PATHS /usr/contrib/bin) ++ ) + mark_as_advanced(ProcessorCount_cmd_machinfo) + if(ProcessorCount_cmd_machinfo) + execute_process(COMMAND ${ProcessorCount_cmd_machinfo} +@@ -160,7 +160,7 @@ + if(NOT count) + # AIX (systems with lsconf): + find_program(ProcessorCount_cmd_lsconf lsconf +- PATHS /usr/sbin) ++ ) + mark_as_advanced(ProcessorCount_cmd_lsconf) + if(ProcessorCount_cmd_lsconf) + execute_process(COMMAND ${ProcessorCount_cmd_lsconf} +@@ -190,7 +190,7 @@ + + if(NOT count) + # Sun (systems where psrinfo tool is available) +- find_program(ProcessorCount_cmd_psrinfo psrinfo PATHS /usr/sbin /sbin) ++ find_program(ProcessorCount_cmd_psrinfo psrinfo) + mark_as_advanced(ProcessorCount_cmd_psrinfo) + if (ProcessorCount_cmd_psrinfo) + execute_process(COMMAND ${ProcessorCount_cmd_psrinfo} -p -v +diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake +index b977d955ca..5ff835298d 100644 +--- a/Modules/UseJava.cmake ++++ b/Modules/UseJava.cmake +@@ -1125,8 +1125,6 @@ + set(_jar_files) + set(_jar_versions) + set(_jar_paths +- /usr/share/java/ +- /usr/local/share/java/ + ${Java_JAR_PATHS}) + set(_jar_doc "NOTSET") + +diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt +index 8ff651fd90..9659deedf5 100644 +--- a/Utilities/cmcurl/CMakeLists.txt ++++ b/Utilities/cmcurl/CMakeLists.txt +@@ -1826,43 +1826,6 @@ + endif() + mark_as_advanced(CURL_CA_PATH_SET) + +- if(CURL_CA_BUNDLE_SET AND _curl_ca_path_autodetect) +- # Skip auto-detection of unset CA path because CA bundle is set explicitly +- elseif(CURL_CA_PATH_SET AND _curl_ca_bundle_autodetect) +- # Skip auto-detection of unset CA bundle because CA path is set explicitly +- elseif(_curl_ca_bundle_autodetect OR _curl_ca_path_autodetect) +- # First try auto-detecting a CA bundle, then a CA path +- +- if(_curl_ca_bundle_autodetect) +- foreach(_search_ca_bundle_path IN ITEMS +- "/etc/ssl/certs/ca-certificates.crt" +- "/etc/pki/tls/certs/ca-bundle.crt" +- "/usr/share/ssl/certs/ca-bundle.crt" +- "/usr/local/share/certs/ca-root-nss.crt" +- "/etc/ssl/cert.pem") +- if(EXISTS "${_search_ca_bundle_path}") +- message(STATUS "Found CA bundle: ${_search_ca_bundle_path}") +- set(CURL_CA_BUNDLE "${_search_ca_bundle_path}" CACHE +- STRING "Path to the CA bundle. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.") +- set(CURL_CA_BUNDLE_SET TRUE CACHE BOOL "Path to the CA bundle has been set") +- break() +- endif() +- endforeach() +- endif() +- +- if(_curl_ca_path_autodetect AND NOT CURL_CA_PATH_SET) +- set(_search_ca_path "/etc/ssl/certs") +- file(GLOB _curl_ca_files_found "${_search_ca_path}/[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].0") +- if(_curl_ca_files_found) +- unset(_curl_ca_files_found) +- message(STATUS "Found CA path: ${_search_ca_path}") +- set(CURL_CA_PATH "${_search_ca_path}" CACHE +- STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.") +- set(CURL_CA_PATH_SET TRUE CACHE BOOL "Path to the CA bundle has been set") +- endif() +- endif() +- endif() +- + set(CURL_CA_EMBED_SET FALSE) + if(BUILD_CURL_EXE AND NOT CURL_CA_EMBED STREQUAL "") + if(EXISTS "${CURL_CA_EMBED}") +diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt +index e6ab5de99b..158a407c3e 100644 +--- a/Utilities/cmlibarchive/CMakeLists.txt ++++ b/Utilities/cmlibarchive/CMakeLists.txt +@@ -39,9 +39,6 @@ + MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|NONE)\$") + ENDIF() + +-# On MacOS, prefer MacPorts libraries to system libraries. +-# I haven't come up with a compelling argument for this to be conditional. +-list(APPEND CMAKE_PREFIX_PATH /opt/local) + # Enable @rpath in the install name. + # detail in "cmake --help-policy CMP0042" + SET(CMAKE_MACOSX_RPATH ON) diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index ea2d3d2a45bba..5e84594934f40 100755 --- a/pkgs/by-name/cm/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh @@ -4,16 +4,6 @@ addCMakeParams() { addToSearchPath NIXPKGS_CMAKE_PREFIX_PATH $1 } -fixCmakeFiles() { - # Replace occurences of /usr and /opt by /var/empty. - echo "fixing cmake files..." - find "$1" -type f \( -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print | - while read fn; do - sed -e 's^/usr\([ /]\|$\)^/var/empty\1^g' -e 's^/opt\([ /]\|$\)^/var/empty\1^g' < "$fn" > "$fn.tmp" - mv "$fn.tmp" "$fn" - done -} - cmakeConfigurePhase() { runHook preConfigure @@ -25,10 +15,6 @@ cmakeConfigurePhase() { export CTEST_PARALLEL_LEVEL=$NIX_BUILD_CORES fi - if [ -z "${dontFixCmake-}" ]; then - fixCmakeFiles . - fi - if [ -z "${dontUseCmakeBuildDir-}" ]; then mkdir -p "$cmakeBuildDir" cd "$cmakeBuildDir" diff --git a/pkgs/by-name/cm/cmocka/package.nix b/pkgs/by-name/cm/cmocka/package.nix index 74de381fbe52f..2bb7d843df4ce 100644 --- a/pkgs/by-name/cm/cmocka/package.nix +++ b/pkgs/by-name/cm/cmocka/package.nix @@ -7,12 +7,11 @@ stdenv.mkDerivation rec { pname = "cmocka"; - majorVersion = "1.1"; - version = "${majorVersion}.7"; + version = "1.1.8"; src = fetchurl { - url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz"; - sha256 = "sha256-gQVw6wuNZIBDMfgrKf9Hx5DOnNaxY+mNR6SAcEfsrYI="; + url = "https://cmocka.org/files/${lib.versions.majorMinor version}/cmocka-${version}.tar.xz"; + hash = "sha256-WENbVYdm1/THKboWO9867Di+07x2batoTjUm7Qqnx4A="; }; patches = [ diff --git a/pkgs/by-name/co/console-bridge/package.nix b/pkgs/by-name/co/console-bridge/package.nix index 384f305977c94..653843bdb94eb 100644 --- a/pkgs/by-name/co/console-bridge/package.nix +++ b/pkgs/by-name/co/console-bridge/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, validatePkgConfig, }: @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-M3GocT0hodw3Sc2NHcFDiPVZ1XN7BqIUuYLW8OaXMqM="; }; + patches = [ + (fetchpatch { + name = "console-bridge-fix-cmake-4.patch"; + url = "https://github.com/ros/console_bridge/commit/81ec67f6daf3cd19ef506e00f02efb1645597b9c.patch"; + hash = "sha256-qSYnqjD+63lWBdtrXbTawt1OpiAO9uvT7R5KmfpUmwQ="; + }) + ]; + nativeBuildInputs = [ cmake validatePkgConfig diff --git a/pkgs/by-name/co/cortex-command-community-project/package.nix b/pkgs/by-name/co/cortex-command-community-project/package.nix index ec2f85a455bfd..80198390624bb 100644 --- a/pkgs/by-name/co/cortex-command-community-project/package.nix +++ b/pkgs/by-name/co/cortex-command-community-project/package.nix @@ -16,7 +16,7 @@ pkg-config, SDL2, SDL2_image, - tbb, + onetbb, }: stdenv.mkDerivation rec { @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { luajit minizip SDL2_image - tbb + onetbb ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cp/cpio/package.nix b/pkgs/by-name/cp/cpio/package.nix index 879b52a98c7d5..d2b2ed66fa1d3 100644 --- a/pkgs/by-name/cp/cpio/package.nix +++ b/pkgs/by-name/cp/cpio/package.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { separateDebugInfo = true; + # The code won't compile in c23 mode. + # https://gcc.gnu.org/gcc-15/porting_to.html#c23-fn-decls-without-parameters + configureFlags = [ + "CFLAGS=-std=gnu17" + ]; + preConfigure = lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i gnu/fpending.h -e 's,include ,,' ''; diff --git a/pkgs/by-name/cp/cpptoml/package.nix b/pkgs/by-name/cp/cpptoml/package.nix index 9cc05daed3748..825a8b61b67f1 100644 --- a/pkgs/by-name/cp/cpptoml/package.nix +++ b/pkgs/by-name/cp/cpptoml/package.nix @@ -34,6 +34,19 @@ stdenv.mkDerivation { "-DCPPTOML_BUILD_EXAMPLES=OFF" ]; + # Fix the build with CMake 4. + # + # See: + # + # * + # * + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 3.1.0)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; + meta = with lib; { description = "C++ TOML configuration library"; homepage = "https://github.com/skystrife/cpptoml"; diff --git a/pkgs/by-name/cr/crc32c/package.nix b/pkgs/by-name/cr/crc32c/package.nix index fa2dd97b7a144..977f35dc9c68f 100644 --- a/pkgs/by-name/cr/crc32c/package.nix +++ b/pkgs/by-name/cr/crc32c/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, gflags, staticOnly ? stdenv.hostPlatform.isStatic, @@ -19,10 +20,22 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "crc32c-fix-cmake-4.patch"; + url = "https://github.com/google/crc32c/commit/2bbb3be42e20a0e6c0f7b39dc07dc863d9ffbc07.patch"; + excludes = [ "third_party/*" ]; + hash = "sha256-XYH0Mwvmf8RkXscVo6pAejTbRmVl9tY+lpp1sqbNXa0="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc"; + env.NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc" + # TODO: probably fixed for version > 1.1.2 + + lib.optionalString stdenv.cc.isClang " -Wno-error=character-conversion"; cmakeFlags = [ "-DCRC32C_INSTALL=1" diff --git a/pkgs/by-name/cu/cups/package.nix b/pkgs/by-name/cu/cups/package.nix index 7ca9ce3dfe287..cbb6616f968c7 100644 --- a/pkgs/by-name/cu/cups/package.nix +++ b/pkgs/by-name/cu/cups/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.12"; + version = "2.4.14"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - hash = "sha256-sd3hkaSuJ2DEciDILKYVWijDgnAebBoBWdEFSZAjHVk="; + hash = "sha256-ZgKIAg3W95yveZgRxMGjIHpIaJiZrCCTlZ1wo73Ldpk="; }; outputs = [ diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index a2d1835da18e7..2ce9522d6f4d8 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -34,7 +34,6 @@ http3Support ? false, nghttp3, ngtcp2, - quictls, websocketSupport ? false, idnSupport ? false, libidn2, @@ -85,13 +84,9 @@ assert ]) > 1 ); -let - openssl' = if http3Support then quictls else openssl; -in - stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.14.1"; + version = "8.16.0"; src = fetchurl { urls = [ @@ -100,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-9GGaHiR0xLv+3IinwhkSCcgzS0j6H05T/VhMwS6RIN0="; + hash = "sha256-QMjN28tsxiUcA96kI6Ryps6kA3vmVLpc9d7G6y0i/x0="; }; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion @@ -137,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ # See https://github.com/curl/curl/pull/16928 - openssl' + openssl ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -156,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional idnSupport libidn2 ++ lib.optional ldapSupport openldap - ++ lib.optional opensslSupport openssl' + ++ lib.optional opensslSupport openssl ++ lib.optional pslSupport libpsl ++ lib.optional rtmpSupport rtmpdump ++ lib.optional scpSupport libssh2 @@ -179,8 +174,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature ldapSupport "ldap") (lib.enableFeature ldapSupport "ldaps") (lib.enableFeature websocketSupport "websockets") - # --with-ca-fallback is only supported for openssl and gnutls https://github.com/curl/curl/blame/curl-8_0_1/acinclude.m4#L1640 - (lib.withFeature (opensslSupport || gnutlsSupport) "ca-fallback") + # --with-ca-fallback is only supported for openssl https://github.com/curl/curl/blame/curl-8_16_0/acinclude.m4#L1258 + (lib.withFeature opensslSupport "ca-fallback") (lib.withFeature http3Support "nghttp3") (lib.withFeature http3Support "ngtcp2") (lib.withFeature rtmpSupport "librtmp") @@ -190,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli)) (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls)) (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2)) - (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl')) + (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl)) (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2)) (lib.withFeatureAs wolfsslSupport "wolfssl" (lib.getDev wolfssl)) ] @@ -255,8 +250,7 @@ stdenv.mkDerivation (finalAttrs: { useThisCurl = attr: attr.override { curl = finalAttrs.finalPackage; }; in { - inherit opensslSupport; - openssl = openssl'; + inherit opensslSupport openssl; tests = { withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index 2d68ac3aeef0c..2859522af3d2f 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -11,7 +11,7 @@ libGL, libpng, openexr, - tbb, + onetbb, xorg, ilmbase, llvmPackages, @@ -45,7 +45,7 @@ stdenv.mkDerivation { libGL libpng openexr - tbb + onetbb xorg.libX11 xorg.libXcursor xorg.libXext diff --git a/pkgs/by-name/cx/cxxopts/package.nix b/pkgs/by-name/cx/cxxopts/package.nix index a00858fb2fff4..ecd195a79cc99 100644 --- a/pkgs/by-name/cx/cxxopts/package.nix +++ b/pkgs/by-name/cx/cxxopts/package.nix @@ -8,15 +8,15 @@ enableUnicodeHelp ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cxxopts"; - version = "3.2.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "jarro2783"; repo = "cxxopts"; - rev = "v${version}"; - sha256 = "sha256-aOF3owz7SIV4trJY0PnMtIcwqoUpDbB3tNxZcsl9dzM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-baM6EX9D0yfrKxuPXyUUV9RqdrVLyygeG6x57xN8lc4="; }; buildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ]; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.spease ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/dh/dht/package.nix b/pkgs/by-name/dh/dht/package.nix index e8df700e31e83..8211314305962 100644 --- a/pkgs/by-name/dh/dht/package.nix +++ b/pkgs/by-name/dh/dht/package.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation { pname = "dht"; - version = "0.27"; + version = "0.27-unstable-2025-05-01"; src = fetchFromGitHub { # Use transmission fork from post-0.27-transmission branch owner = "transmission"; repo = "dht"; - rev = "015585510e402a057ec17142711ba2b568b5fd62"; - sha256 = "m4utcxqE3Mn5L4IQ9UfuJXj2KkXXnqKBGqh7kHHGMJQ="; + rev = "38c9f261d9b58b76b9eaf85f84ec1b35151a1eac"; + hash = "sha256-Y6CQhHnXS0YiL9K2VQtHeksuqgqYj7yvGYQr5nVC+yc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix index 414f8dcf8d5ba..77e4458d10736 100644 --- a/pkgs/by-name/dn/dnf5/package.nix +++ b/pkgs/by-name/dn/dnf5/package.nix @@ -113,8 +113,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "/etc/bash_completion.d" "$out/etc/bash_completion.d" ''; - dontFixCmake = true; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; preVersionCheck = '' diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix index 793a4af00f589..590252b0fdada 100644 --- a/pkgs/by-name/do/doctest/package.nix +++ b/pkgs/by-name/do/doctest/package.nix @@ -8,21 +8,22 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.4.11"; + version = "2.4.12"; src = fetchFromGitHub { owner = "doctest"; repo = "doctest"; - rev = "v${version}"; - sha256 = "sha256-hotO6QVpPn8unYTaQHFgi40A3oLUd++I3aTe293e4Aw="; + tag = "v${version}"; + hash = "sha256-Fxs1EWydhqN9whx+Cn4fnZ4fhCEQvFgL5e9TUiXlnq8="; }; patches = [ - # Suppress unsafe buffer usage warnings with clang 16, which are treated as errors due to `-Werror`. - # https://github.com//doctest/doctest/pull/768 + # Fix the build with Clang. (fetchpatch { - url = "https://github.com/doctest/doctest/commit/9336c9bd86e3fc2e0c36456cad8be3b4e8829a22.patch"; - hash = "sha256-ZFCVk5qvgfixRm7ZFr7hyNCSEvrT6nB01G/CBshq53o="; + name = "doctest-disable-warnings.patch"; + url = "https://github.com/doctest/doctest/commit/c8d9ed2398d45aa5425d913bd930f580560df30d.patch"; + excludes = [ ".github/workflows/main.yml" ]; + hash = "sha256-kOBy0om6MPM2vLXZjNLXiezZqVgNr/viBI7mXrOZts8="; }) ]; @@ -30,6 +31,18 @@ stdenv.mkDerivation rec { doCheck = true; + # Fix the build with LLVM 21 / GCC 15. + # + # See: + # + # * + # * + # * + env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-Wno-error=nrvo" + "-Wno-error=missing-noreturn" + ]; + meta = with lib; { homepage = "https://github.com/doctest/doctest"; description = "Fastest feature-rich C++11/14/17/20 single-header testing framework"; diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index ad023d50a0d6b..6a95b132b9919 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -17,7 +17,7 @@ curl, enet, ffmpeg, - fmt_10, + fmt, gtest, hidapi, libXdmcp, @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { curl enet ffmpeg - fmt_10 + fmt gtest hidapi libXdmcp diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix index 11e87a0546c0b..a377165483f0b 100644 --- a/pkgs/by-name/do/double-conversion/package.nix +++ b/pkgs/by-name/do/double-conversion/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, enableStatic ? stdenv.hostPlatform.isStatic, }: @@ -17,6 +18,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM="; }; + patches = [ + # Fix the build with CMake 4. + (fetchpatch { + name = "double-conversion-fix-cmake-4-1.patch"; + url = "https://github.com/google/double-conversion/commit/101e1ba89dc41ceb75090831da97c43a76cd2906.patch"; + hash = "sha256-VRmuNXdzt/I+gWbz5mwWkx5IGn8Vsl9WkdwRsuwZdkU="; + }) + (fetchpatch { + name = "double-conversion-fix-cmake-4-2.patch"; + url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch"; + hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional (!enableStatic) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/by-name/dy/dynarmic/package.nix b/pkgs/by-name/dy/dynarmic/package.nix index 446cd544b3462..800e38b15588f 100644 --- a/pkgs/by-name/dy/dynarmic/package.nix +++ b/pkgs/by-name/dy/dynarmic/package.nix @@ -110,10 +110,6 @@ stdenv.mkDerivation (finalAttrs: { oaknut ]; - # This changes `ir/opt` to `ir/var/empty` in `CMakeLists.txt` - # making the build fail, as that path does not exist - dontFixCmake = true; - cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "DYNARMIC_TESTS" finalAttrs.finalPackage.doCheck) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index b3d361149720d..9b1bf57d2051d 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -35,7 +35,7 @@ rubberband, soundtouch, speexdsp, - tbb, + onetbb, wrapGAppsHook4, zam-plugins, zita-convolver, @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { rubberband soundtouch speexdsp' - tbb + onetbb zita-convolver ]; diff --git a/pkgs/by-name/eb/ebook_tools/package.nix b/pkgs/by-name/eb/ebook_tools/package.nix index 8f09811d83fb3..63941366f0cab 100644 --- a/pkgs/by-name/eb/ebook_tools/package.nix +++ b/pkgs/by-name/eb/ebook_tools/package.nix @@ -17,6 +17,16 @@ stdenv.mkDerivation rec { sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; + # Fix the build with CMake 4. + # + # See: + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 2.4.0)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/ec/ecdsautils/package.nix b/pkgs/by-name/ec/ecdsautils/package.nix index ee4560b82c0a6..3c90fcd5c8bae 100644 --- a/pkgs/by-name/ec/ecdsautils/package.nix +++ b/pkgs/by-name/ec/ecdsautils/package.nix @@ -1,7 +1,12 @@ { lib, stdenv, - pkgs, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + doxygen, + libuecc, }: let @@ -11,19 +16,26 @@ in stdenv.mkDerivation { inherit pname version; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "freifunk-gluon"; repo = "ecdsautils"; rev = "v${version}"; sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg="; }; - nativeBuildInputs = with pkgs; [ + patches = [ + (fetchpatch { + url = "https://github.com/freifunk-gluon/ecdsautils/commit/19f096f9c10264f4efe4b926fe83126e85642cba.patch"; + hash = "sha256-oJv47NckFHFONPcG3WfHwgaHRqrz2eWXzbr5SQr+kX4="; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config doxygen ]; - buildInputs = with pkgs; [ libuecc ]; + buildInputs = [ libuecc ]; meta = with lib; { description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; diff --git a/pkgs/by-name/ec/echidna/package.nix b/pkgs/by-name/ec/echidna/package.nix index 9d551e5105356..1a6376cba4a57 100644 --- a/pkgs/by-name/ec/echidna/package.nix +++ b/pkgs/by-name/ec/echidna/package.nix @@ -3,6 +3,7 @@ stdenv, makeWrapper, haskellPackages, + fetchpatch, fetchFromGitHub, # dependencies slither-analyzer, @@ -10,17 +11,26 @@ haskellPackages.mkDerivation rec { pname = "echidna"; - version = "2.2.6"; + version = "2.2.7"; src = fetchFromGitHub { owner = "crytic"; repo = "echidna"; tag = "v${version}"; - sha256 = "sha256-5nzis7MXOqs0bhx2jrEexjZYZI2qY6D0D7AWO+SPs+A="; + sha256 = "sha256-rDtxyUpWfdMvS5BY1y8nydkQk/eCdmtjCqGJ+I4vy0I="; }; isExecutable = true; + patches = [ + # Fix build with GHC 9.10 + # https://github.com/crytic/echidna/pull/1446 + (fetchpatch { + url = "https://github.com/crytic/echidna/commit/1b498bdb8c86d8297aa34de8f48b6dce2f4dd84d.patch"; + hash = "sha256-JeKPv2Q2gIt1XpI81XPFu80/x8QcOI4k1QN/mTf+bqk="; + }) + ]; + buildTools = with haskellPackages; [ hpack ]; diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix index a789749cb5dc4..46e352ef2c680 100644 --- a/pkgs/by-name/ed/ed/package.nix +++ b/pkgs/by-name/ed/ed/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ed"; - version = "1.21.1"; + version = "1.22.2"; src = fetchurl { url = "mirror://gnu/ed/ed-${finalAttrs.version}.tar.lz"; - hash = "sha256-1tDHGSsCsFGckCqTcZBT6GWt5aeEo7Mn2T2IhFeyPEs="; + hash = "sha256-9Y0VJCBW4Vr3bxPzTGDYkPoqLVywq++RwRXk2DeU/+M="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 0eaa0c65fa5f0..2dbf5e9fbb2c8 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2025.04.21.00"; + version = "2025.09.15.00"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookexperimental"; repo = "edencommon"; tag = "v${finalAttrs.version}"; - hash = "sha256-WlLQb4O4rGhXp+bQrJA12CvrwcIS6vzO4W6bX04vKMM="; + hash = "sha256-KyJAosCLGnpEG968GV9BOyOrsoHS7BbRatTfBqzTelU="; }; patches = [ diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix index 42dd8342713bf..4cb6662c086c9 100644 --- a/pkgs/by-name/ed/edgetx/package.nix +++ b/pkgs/by-name/ed/edgetx/package.nix @@ -114,15 +114,12 @@ stdenv.mkDerivation (finalAttrs: { }; dontUseCmakeConfigure = true; - # We invoke cmakeConfigurePhase multiple times, but only need this once. - dontFixCmake = true; inherit targetsToBuild; __structuredAttrs = true; # To pass targetsToBuild as an array. configurePhase = '' runHook preConfigure prependToVar cmakeFlags "-GNinja" - fixCmakeFiles . runHook postConfigure ''; diff --git a/pkgs/by-name/ed/editline/package.nix b/pkgs/by-name/ed/editline/package.nix index 7df7fe83936e3..5942578b48963 100644 --- a/pkgs/by-name/ed/editline/package.nix +++ b/pkgs/by-name/ed/editline/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, autoreconfHook, nix-update-script, - fetchpatch, ncurses ? null, # Enable `termcap` (`ncurses`) support. @@ -17,40 +16,14 @@ assert lib.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "editline"; - version = "1.17.1"; + version = "1.17.1-unstable-2025-05-24"; src = fetchFromGitHub { owner = "troglobit"; repo = "editline"; - rev = finalAttrs.version; - sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g="; + rev = "f735e4d1d566cac3caa4a5e248179d07f0babefd"; + sha256 = "sha256-MUXxSmhpQd8CZdGGC6Ln9eci85E+GBhlNk28VHUvjaU="; }; - patches = [ - (fetchpatch { - name = "fix-for-home-end-in-tmux.patch"; - url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch"; - sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30="; - }) - - # Pending autoconf-2.72 upstream support: - # https://github.com/troglobit/editline/pull/64 - (fetchpatch { - name = "autoconf-2.72.patch"; - url = "https://github.com/troglobit/editline/commit/f444a316f5178b8e20fe31e7b2d979e651da077e.patch"; - hash = "sha256-m3jExTkPvE+ZBwHzf/A+ugzzfbLmeWYn726l7Po7f10="; - }) - - # Recognize `Alt-Left` and `Alt-Right` for navigating by words in more - # terminals/shells/platforms. - # - # See: https://github.com/troglobit/editline/pull/70 - (fetchpatch { - name = "alt-left-alt-right-word-navigation.patch"; - url = "https://github.com/troglobit/editline/commit/fb4d7268de024ed31ad2417f533cc0cbc2cd9b29.diff"; - hash = "sha256-5zMsmpU5zFoffRUwFhI/vP57pEhGotcMPgn9AfI1SNg="; - }) - ]; - configureFlags = [ # Enable SIGSTOP (Ctrl-Z) behavior. (lib.enableFeature true "sigstop") diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix index 54da5b9b3af47..57ced639540a1 100644 --- a/pkgs/by-name/el/ell/package.nix +++ b/pkgs/by-name/el/ell/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.78"; + version = "0.79"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-1kw0oiYkEydoMWrECehI5M6VbcL+Y340Pu5QU2F3sbQ="; + hash = "sha256-5NqzuUDimairQJjHsSy0sbpqiDfNDvrt3BEV9e1bF1E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix index e78ffe1d73205..20731100f670f 100644 --- a/pkgs/by-name/el/elmerfem/package.nix +++ b/pkgs/by-name/el/elmerfem/package.nix @@ -12,7 +12,7 @@ libGLU, opencascade-occt, qt6Packages, - tbb, + onetbb, vtkWithQt6, llvmPackages, }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { libGL libGLU opencascade-occt - tbb + onetbb vtkWithQt6 ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 3e3c27576298a..8c8ae5197fbc2 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -63,7 +63,7 @@ buildFHSEnv { libepoxy lz4 lz4.dev - tbb + onetbb libxkbcommon librealsense boost diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix index e8ead2467c640..ba5a46d034f84 100644 --- a/pkgs/by-name/ex/expat/package.nix +++ b/pkgs/by-name/ex/expat/package.nix @@ -18,7 +18,7 @@ # files. let - version = "2.7.1"; + version = "2.7.2"; tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}"; in stdenv.mkDerivation (finalAttrs: { @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-NUVSVEuPmQEuUGL31XDsd/FLQSo/9cfY0NrmLA0hfDA="; + hash = "sha256-Ibd4s07IN8KsKFrvNA+ftfoGOoEbIepNJBKpcCyImVw="; }; strictDeps = true; diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix index b24c155673d93..f79b09b643c7c 100644 --- a/pkgs/by-name/f3/f3d/package.nix +++ b/pkgs/by-name/f3/f3d/package.nix @@ -8,7 +8,7 @@ gzip, libXt, openusd, - tbb, + onetbb, vtk, autoPatchelfHook, python3Packages, @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withUsd [ libXt openusd - tbb + onetbb ]; cmakeFlags = [ diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index c4b7ca10efaf3..e9a5948fbdc4f 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "8.0.2"; + version = "8.1.0"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-lKEzRYKdpjsqixC9WBoILccqB2ZkUtPUzT4Q4+j0oac="; + hash = "sha256-kTLmk+mxfdN/+vKdyohcaNSeoAkhJf3uesaBOz123ag="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index 834f700df656d..6c5017bde61b2 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.04.21.00"; + version = "2025.09.15.00"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cgr+uuUl+tlyWdAvBCVMK/mInYu+M5N9QLMTvvJ3oEk="; + hash = "sha256-6suO1SE8+WASQiHLtiieu3nrjEYqSPnKxw7nHkQ4br0="; }; patches = [ diff --git a/pkgs/by-name/fb/fbthrift/glog-0.7.patch b/pkgs/by-name/fb/fbthrift/glog-0.7.patch index 23cff743614ca..4828151610126 100644 --- a/pkgs/by-name/fb/fbthrift/glog-0.7.patch +++ b/pkgs/by-name/fb/fbthrift/glog-0.7.patch @@ -1,17 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c6b2b2a810..1813c88e42 100644 +index 492bcccd9a..9c907a87a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -106,7 +106,7 @@ endif () +@@ -108,7 +108,7 @@ # Find required dependencies for thrift/lib if (THRIFT_LIB_ONLY OR build_all) find_package(Gflags REQUIRED) - find_package(Glog REQUIRED) + find_package(Glog CONFIG REQUIRED) - find_package(folly CONFIG REQUIRED) find_package(fizz CONFIG REQUIRED) find_package(wangle CONFIG REQUIRED) -@@ -119,7 +119,6 @@ if (THRIFT_LIB_ONLY OR build_all) + find_package(ZLIB REQUIRED) +@@ -120,7 +120,6 @@ find_package(Threads) include_directories( ${LIBGFLAGS_INCLUDE_DIR} @@ -23,7 +23,7 @@ diff --git a/thrift/example/cpp2/CMakeLists.txt b/thrift/example/cpp2/CMakeLists index afa28dad61..318860b3d6 100644 --- a/thrift/example/cpp2/CMakeLists.txt +++ b/thrift/example/cpp2/CMakeLists.txt -@@ -28,7 +28,7 @@ target_link_libraries( +@@ -28,7 +28,7 @@ thriftcpp2 chatroom-cpp2 ${LIBGFLAGS_LIBRARY} @@ -33,10 +33,10 @@ index afa28dad61..318860b3d6 100644 install( TARGETS example_server diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt -index 6461588a86..8b6ed1b030 100644 +index 2c65e1f0a8..1e80060100 100644 --- a/thrift/lib/cpp/CMakeLists.txt +++ b/thrift/lib/cpp/CMakeLists.txt -@@ -45,7 +45,7 @@ target_link_libraries( +@@ -43,7 +43,7 @@ PUBLIC Folly::folly ${LIBGFLAGS_LIBRARY} @@ -45,7 +45,7 @@ index 6461588a86..8b6ed1b030 100644 ) add_library( -@@ -121,7 +121,7 @@ target_link_libraries( +@@ -121,7 +121,7 @@ Boost::boost Folly::folly wangle::wangle @@ -54,7 +54,7 @@ index 6461588a86..8b6ed1b030 100644 ${OPENSSL_LIBRARIES} ) -@@ -137,7 +137,7 @@ target_link_libraries( +@@ -137,7 +137,7 @@ thriftprotocol transport Folly::folly @@ -64,10 +64,10 @@ index 6461588a86..8b6ed1b030 100644 set(THRIFT1_HEADER_DIRS diff --git a/thrift/lib/cpp2/CMakeLists.txt b/thrift/lib/cpp2/CMakeLists.txt -index f941688ab0..b3609bbc62 100644 +index 03216f5d6f..5f31fc0c64 100644 --- a/thrift/lib/cpp2/CMakeLists.txt +++ b/thrift/lib/cpp2/CMakeLists.txt -@@ -75,7 +75,7 @@ target_link_libraries( +@@ -75,7 +75,7 @@ Folly::folly thriftmetadata thriftprotocol @@ -76,7 +76,7 @@ index f941688ab0..b3609bbc62 100644 ${LIBGFLAGS_LIBRARY} ) -@@ -206,7 +206,7 @@ target_link_libraries( +@@ -207,7 +207,7 @@ thrift Folly::folly wangle::wangle diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index 8d6ab8df0fb0c..71e759c7def15 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.04.21.00"; + version = "2025.09.15.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,25 +39,19 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-W86jBqq0wC8ZYcE7MQ76rV3axPf7efXieEot6ahonUI="; + hash = "sha256-4u3SbbmSgtvnW3/VH3CfQrEddAlkQuUl9dmnGGKL4mE="; }; patches = [ + # Map `$NIX_BUILD_TOP` to `/build` in the Thrift compiler output to + # avoid reproducibility issues on Darwin. + ./scrub-build-directory-from-output.patch + # Remove a line that breaks the build due to the CMake classic of # incorrect path concatenation. ./remove-cmake-install-rpath.patch ./glog-0.7.patch - - # Backport upstream build system fixes. Remove on next update. - (fetchpatch { - url = "https://github.com/facebook/fbthrift/commit/638384afb83e5fae29a6483d20f9443b2342ca0b.patch"; - hash = "sha256-q0VgaQtwAEgDHZ6btOLSnKfkP2cXstFPxPNdX1wcdCg="; - }) - (fetchpatch { - url = "https://github.com/facebook/fbthrift/commit/350955beef40abec1e9d13112c9d2b7f95c29022.patch"; - hash = "sha256-SaCZ0iczj8He2wujWN08QpizsTsK6OhreroOHY9f0BA="; - }) ]; nativeBuildInputs = [ @@ -101,6 +95,33 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_SHARED_LINKER_FLAGS" "-Wl,-undefined,dynamic_lookup") ]; + # Fix a typo introduced by the following commit that causes hundreds + # of pointless rebuilds when installing: + # + postPatch = '' + substituteInPlace ThriftLibrary.cmake \ + --replace-fail .tcch .tcc + ''; + + # Copied from Homebrew; fixes the following build error: + # + # [ERROR:/nix/var/nix/b/5f3kn8spg6j0z0xlags8va6sq7/source/thrift/lib/thrift/RpcMetadata.thrift:1] unordered_map::at: key not found + # + # See: + # + # * + # * + # * + # + # I don’t know why we didn’t need this before the bump to 202 + # to 2025.09.08.00 when we’d been on LLVM 19 for an entire release + # cycle already, or why we’re getting different errors to those + # reports, or why this fixes the build anyway. Most of what I do to + # maintain these packages is copy compilation flags from Homebrew + # that scare me. I don’t have very much fun with these libraries, to + # be honest with you. + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-fno-assume-unique-vtables"; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/fb/fbthrift/scrub-build-directory-from-output.patch b/pkgs/by-name/fb/fbthrift/scrub-build-directory-from-output.patch new file mode 100644 index 0000000000000..9fdfc77f2ead5 --- /dev/null +++ b/pkgs/by-name/fb/fbthrift/scrub-build-directory-from-output.patch @@ -0,0 +1,36 @@ +diff --git a/thrift/compiler/generate/t_mstch_cpp2_generator.cc b/thrift/compiler/generate/t_mstch_cpp2_generator.cc +index d232df5158..96d15efbda 100644 +--- a/thrift/compiler/generate/t_mstch_cpp2_generator.cc ++++ b/thrift/compiler/generate/t_mstch_cpp2_generator.cc +@@ -1116,6 +1116,13 @@ + mstch::node autogen_path() { + std::string path = service_->program()->path(); + std::replace(path.begin(), path.end(), '\\', '/'); ++ // Ensure output reproducibility for Nix builds. ++ if (auto nix_build_top = std::getenv("NIX_BUILD_TOP")) { ++ auto prefix = std::string(nix_build_top) + "/"; ++ if (path.starts_with(prefix)) { ++ path.replace(0, prefix.length(), "/build/"); ++ } ++ } + return path; + } + mstch::node cpp_includes() { +diff --git a/thrift/compiler/generate/t_whisker_generator.cc b/thrift/compiler/generate/t_whisker_generator.cc +index 99a6ac14af..fa91a05247 100644 +--- a/thrift/compiler/generate/t_whisker_generator.cc ++++ b/thrift/compiler/generate/t_whisker_generator.cc +@@ -572,6 +572,13 @@ + // use posix path separators, even on windows, for autogen comment + // to avoid spurious fixture regen diffs + std::replace(path.begin(), path.end(), '\\', '/'); ++ // Ensure output reproducibility for Nix builds. ++ if (auto nix_build_top = std::getenv("NIX_BUILD_TOP")) { ++ auto prefix = std::string(nix_build_top) + "/"; ++ if (path.starts_with(prefix)) { ++ path.replace(0, prefix.length(), "/build/"); ++ } ++ } + return path; + }); + def.property("namespaces", [&](const t_program& self) -> map::ptr { diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index b100518c0e0d8..b56562148195f 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -13,6 +13,7 @@ zstd, gflags, libevent, + darwinMinVersionHook, folly, libsodium, @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.04.21.00"; + version = "2025.09.15.00"; outputs = [ "bin" @@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-khaUbxcD8+9zznH0DE/BpweZeDKafTnr4EqPbmOpckU="; + hash = "sha256-8j8Nt8XCbMGui7bELhvP+o8E2bqYobkXLhvZVkzCMzU="; }; patches = [ @@ -56,6 +57,9 @@ stdenv.mkDerivation (finalAttrs: { zstd gflags libevent + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (darwinMinVersionHook "13.3") ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix index cde0b245e18d6..28c8b9ef066fa 100644 --- a/pkgs/by-name/fl/fluidsynth/package.nix +++ b/pkgs/by-name/fl/fluidsynth/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluidsynth"; - version = "2.4.7"; + version = "2.4.8"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; tag = "v${finalAttrs.version}"; - hash = "sha256-z7DIX8KpPdtEHEMoxH7ewW32aXm27gfmWPZawwITyRQ="; + hash = "sha256-rOPoRV0NWrlFZohqQ76gnXvt4/ryEI4nSlX+mNW+qf8="; }; outputs = [ diff --git a/pkgs/by-name/fo/folly/fix-__type_pack_element.patch b/pkgs/by-name/fo/folly/fix-__type_pack_element.patch new file mode 100644 index 0000000000000..8a43c6805b2a1 --- /dev/null +++ b/pkgs/by-name/fo/folly/fix-__type_pack_element.patch @@ -0,0 +1,34 @@ +From acccee8947977178f36d117cd9d3240cbdb5f018 Mon Sep 17 00:00:00 2001 +From: ihb2032 <1355790728@qq.com> +Date: Wed, 10 Sep 2025 17:31:41 +0800 +Subject: [PATCH] fix(folly): Replace `__type_pack_element` in + `ForeachTest.cpp` to support GCC 14 + +The use of the `__type_pack_element` compiler builtin directly in function signatures in `folly/container/test/ForeachTest.cpp` causes a build failure with GCC 14. This is because the builtin is not intended for use in contexts that affect name mangling. + +This commit resolves the issue by replacing the direct usage of `__type_pack_element_t` with `std::tuple_element_t`. This is a standards-compliant library trait that provides the same functionality and is safe to use in function signatures. + +This change ensures that `ForeachTest` continues to compile successfully with newer versions of GCC, maintaining compiler compatibility. + +Signed-off-by: lyd1992 + +Signed-off-by: ihb2032 <1355790728@qq.com> +--- + folly/container/test/ForeachTest.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/folly/container/test/ForeachTest.cpp b/folly/container/test/ForeachTest.cpp +index c055f26effe..3adec1a7371 100644 +--- a/folly/container/test/ForeachTest.cpp ++++ b/folly/container/test/ForeachTest.cpp +@@ -314,8 +314,8 @@ TEST(ForEach, FetchTestPreferIterator) { + template + struct LargeTuple {}; + template +-type_pack_element_t& get(LargeTuple&) { +- static type_pack_element_t elem; ++std::tuple_element_t>& get(LargeTuple&) { ++ static std::tuple_element_t> elem; + return elem; + } + namespace std { diff --git a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch b/pkgs/by-name/fo/folly/fix-stdexcept-include.patch new file mode 100644 index 0000000000000..c13632abf599a --- /dev/null +++ b/pkgs/by-name/fo/folly/fix-stdexcept-include.patch @@ -0,0 +1,22 @@ +From dc06cc3162afb148c19cd0931d8fe489d639217a Mon Sep 17 00:00:00 2001 +From: Uilian Ries +Date: Tue, 9 Sep 2025 16:48:26 +0200 +Subject: [PATCH] Add missing header for std::runtime_error + +Signed-off-by: Uilian Ries +--- + folly/hash/Checksum.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/folly/hash/Checksum.cpp b/folly/hash/Checksum.cpp +index 1d42d6a6e5f..aeafdb20b1b 100644 +--- a/folly/hash/Checksum.cpp ++++ b/folly/hash/Checksum.cpp +@@ -17,6 +17,7 @@ + #include + + #include ++#include + + #include + diff --git a/pkgs/by-name/fo/folly/install-test-certs.patch b/pkgs/by-name/fo/folly/install-test-certs.patch new file mode 100644 index 0000000000000..59b981d2dbd88 --- /dev/null +++ b/pkgs/by-name/fo/folly/install-test-certs.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ecc11a7961..67a2b82b4b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -489,8 +489,12 @@ + ${FOLLY_DIR}/test/DeterministicSchedule.cpp + ${FOLLY_DIR}/json/JsonTestUtil.cpp + ) ++auto_sources(test_certs "*.pem" "${FOLLY_DIR}/io/async/test/certs") ++install(FILES ${test_certs} ++ DESTINATION "${LIB_INSTALL_DIR}/folly/test-certs" ++) + target_compile_definitions(folly_test_util PUBLIC +- FOLLY_CERTS_DIR="${FOLLY_DIR}/io/async/test/certs" ++ FOLLY_CERTS_DIR="${LIB_INSTALL_DIR}/folly/test-certs" + ) + set_property(TARGET folly_test_util PROPERTY VERSION ${PACKAGE_VERSION}) + target_link_libraries(folly_test_util diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 569696bf9f7ea..cce2c4aee1c93 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -21,10 +21,12 @@ zstd, libiberty, libunwind, + darwinMinVersionHook, boost, - fmt_11, - jemalloc, + fmt, + + ctestCheckHook, gtest, @@ -39,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2025.04.21.00"; + version = "2025.09.15.00"; # split outputs to reduce downstream closure sizes outputs = [ @@ -51,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "folly"; tag = "v${finalAttrs.version}"; - hash = "sha256-P2saSFVRBWt5xjAWlKmcPJT9MFV9CXFmA18dIDCO84o="; + hash = "sha256-//gx081nMFXAcUgkHQToiFHhECfLW22Fl0eXEsObxUs="; }; nativeBuildInputs = [ @@ -75,16 +77,19 @@ stdenv.mkDerivation (finalAttrs: { zstd libiberty libunwind + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (darwinMinVersionHook "13.3") ]; propagatedBuildInputs = [ # `folly-config.cmake` pulls these in. boost - fmt_11 - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - # jemalloc headers are required in include/folly/portability/Malloc.h - jemalloc + fmt + ]; + + nativeCheckInputs = [ + ctestCheckHook ]; checkInputs = [ @@ -121,7 +126,14 @@ stdenv.mkDerivation (finalAttrs: { || stdenv.hostPlatform.isPower64 || stdenv.hostPlatform.isRiscV64; + dontUseNinjaCheck = true; + patches = [ + # Install the certificate files used by `libfolly_test_util` rather + # than leaving a dangling reference to the build directory in the + # `dev` output’s CMake files. + ./install-test-certs.patch + # The base template for std::char_traits has been removed in LLVM 19 # https://releases.llvm.org/19.1.0/projects/libcxx/docs/ReleaseNotes.html ./char_traits.patch @@ -132,6 +144,30 @@ stdenv.mkDerivation (finalAttrs: { url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-cmake-find-glog.patch?h=folly&id=4b68f47338d4b20111e3ffa1291433120bb899f0"; hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE="; }) + + # Fix an upstream regression with libstdc++. + # + # See: + # + # * + # * + # * + # * + ./fix-stdexcept-include.patch + + # Fix a GCC‐incompatible use of a private trait. + # + # Per Folly’s own documentation: + # + # /// Under gcc, the builtin is available but does not mangle. Therefore, this + # /// trait must not be used anywhere it might be subject to mangling, such as in + # /// a return-type expression. + # + # See: + # + # * + # * + ./fix-__type_pack_element.patch ]; # https://github.com/NixOS/nixpkgs/issues/144170 @@ -145,53 +181,42 @@ stdenv.mkDerivation (finalAttrs: { '@CMAKE_INSTALL_FULL_INCLUDEDIR@' ''; - # TODO: Figure out why `GTEST_FILTER` doesn’t work to skip these. - checkPhase = '' - runHook preCheck - - ctest -j $NIX_BUILD_CORES --output-on-failure --exclude-regex ${ - lib.escapeShellArg ( - lib.concatMapStringsSep "|" (test: "^${lib.escapeRegex test}$") ( - [ - "concurrency_concurrent_hash_map_test.*/ConcurrentHashMapTest/*.StressTestReclamation" - "io_async_ssl_session_test.SSLSessionTest.BasicTest" - "io_async_ssl_session_test.SSLSessionTest.NullSessionResumptionTest" - "singleton_thread_local_test.SingletonThreadLocalDeathTest.Overload" - - # very strict timing constraints, will fail under load - "io_async_hh_wheel_timer_test.HHWheelTimerTest.CancelTimeout" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.DefaultTimeout" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.DeleteWheelInTimeout" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.DestroyTimeoutSet" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.FireOnce" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.GetTimeRemaining" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.IntrusivePtr" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.Level1" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.NegativeTimeout" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.ReschedTest" - "io_async_hh_wheel_timer_test.HHWheelTimerTest.SlowFast" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - "concurrency_cache_locality_test.CacheLocality.BenchmarkSysfs" - "concurrency_cache_locality_test.CacheLocality.LinuxActual" - "futures_future_test.Future.NoThrow" - "futures_retrying_test.RetryingTest.largeRetries" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "buffered_atomic_test.BufferedAtomic.singleThreadUnguardedAccess" - "io_async_notification_queue_test.NotificationQueueTest.UseAfterFork" - "container_heap_vector_types_test.HeapVectorTypes.SimpleSetTes" - ] - ) - ) - } - - runHook postCheck - ''; + disabledTests = [ + "io_async_ssl_session_test.SSLSessionTest.BasicTest" + "io_async_ssl_session_test.SSLSessionTest.NullSessionResumptionTest" + "singleton_thread_local_test.SingletonThreadLocalDeathTest.Overload" + + # very strict timing constraints, will fail under load + "io_async_hh_wheel_timer_test.HHWheelTimerTest.CancelTimeout" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.DefaultTimeout" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.DeleteWheelInTimeout" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.DestroyTimeoutSet" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.FireOnce" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.GetTimeRemaining" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.IntrusivePtr" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.Level1" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.NegativeTimeout" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.ReschedTest" + "io_async_hh_wheel_timer_test.HHWheelTimerTest.SlowFast" + + # In file included from /build/source/folly/lang/test/BitsTest.cpp:17: + # In member function 'constexpr bool folly::get_bit_at_fn::operator()(const Uint*, std::size_t) const [with Uint = short unsigned int]', + # inlined from 'void folly::BitsAllUintsTest_GetBitAtLE_Test::TestBody() [with gtest_TypeParam_ = short unsigned int]' at /build/source/folly/lang/test/BitsTest.cpp:640:5: + # /build/source/folly/lang/Bits.h:494:10: warning: 'in' is used uninitialized [-Wuninitialized] + "lang_bits_test.BitsAllUintsTest/*.GetBitAtLE" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "concurrency_cache_locality_test.CacheLocality.BenchmarkSysfs" + "concurrency_cache_locality_test.CacheLocality.LinuxActual" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # No idea why these fail. + "logging_xlog_test.XlogTest.perFileCategoryHandling" + "futures_future_test.Future.makeFutureFromMoveOnlyException" + ]; passthru = { - inherit boost; - fmt = fmt_11; + inherit boost fmt; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fo/foundationdb/fix-toml11-4.0.patch b/pkgs/by-name/fo/foundationdb/fix-toml11-4.0.patch new file mode 100644 index 0000000000000..320a2eff7bf29 --- /dev/null +++ b/pkgs/by-name/fo/foundationdb/fix-toml11-4.0.patch @@ -0,0 +1,39 @@ +From d4b022955e049793a5eac573f6eb2931686a81ab Mon Sep 17 00:00:00 2001 +From: Emily +Date: Mon, 15 Sep 2025 22:09:00 +0100 +Subject: [PATCH] Fix the build with toml11 4.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In toml11 3.0, comments were discarded by default, so this declaration +was redundant. In toml11 ≥ 4.0, they are preserved by default, +but opting out is more baroque. It doesn’t seem clear to me why +discarding comments is specifically relevant here, so I’ve opted +to simplify the code by using the default uniformly, but a version +conditional would be possible if this is important. + +Many major Linux distributions have already moved to toml11 ≥ 4.0, +so this simplifies packaging. + +(cherry picked from commit 432a9562573828cc45e3475e53feba48c79a8342) +--- + fdbserver/SimulatedCluster.actor.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp +index 89d4508ad..4cc11a7bf 100644 +--- a/fdbserver/SimulatedCluster.actor.cpp ++++ b/fdbserver/SimulatedCluster.actor.cpp +@@ -116,7 +116,7 @@ bool destructed = false; + // environment details + class TestConfig : public BasicTestConfig { + class ConfigBuilder { +- using value_type = toml::basic_value; ++ using value_type = toml::value; + using base_variant = std:: + variant, std::vector, ConfigDBType>; + using types = +-- +2.51.0 + diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix index 06fb2e1d85f0f..4e7b7ee201ab9 100644 --- a/pkgs/by-name/fo/foundationdb/package.nix +++ b/pkgs/by-name/fo/foundationdb/package.nix @@ -28,7 +28,7 @@ let isOdd patch; in stdenv.mkDerivation rec { - name = "foundationdb"; + pname = "foundationdb"; version = "7.3.42"; src = fetchFromGitHub { @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { patches = [ ./disable-flowbench.patch ./don-t-use-static-boost-libs.patch + # + ./fix-toml11-4.0.patch # GetMsgpack: add 4+ versions of upstream # https://github.com/apple/foundationdb/pull/10935 (fetchpatch { @@ -92,7 +94,6 @@ stdenv.mkDerivation rec { ]; separateDebugInfo = true; - dontFixCmake = true; cmakeFlags = [ "-DFDB_RELEASE=TRUE" diff --git a/pkgs/by-name/fr/freeglut/package.nix b/pkgs/by-name/fr/freeglut/package.nix index 5a1ef392ff063..e112d25a82fe8 100644 --- a/pkgs/by-name/fr/freeglut/package.nix +++ b/pkgs/by-name/fr/freeglut/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, libICE, libXext, libXi, @@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-nD1NZRb7+gKA7ck8d2mPtzA+RDwaqvN9Jp4yiKbD6lI="; }; + patches = [ + (fetchpatch { + name = "freeglut-fix-cmake-4.patch"; + url = "https://github.com/freeglut/freeglut/commit/2294389397912c9a6505a88221abb7dca0a4fb79.patch"; + hash = "sha256-buNhlVUbDekklnar6KFWN/GUKE+jMEqTGrY3LY0LwVs="; + }) + ]; + outputs = [ "out" "dev" diff --git a/pkgs/by-name/gd/gdbm/freebsd-patch-src-lock-c.patch b/pkgs/by-name/gd/gdbm/freebsd-patch-src-lock-c.patch deleted file mode 100644 index 4312cf998d601..0000000000000 --- a/pkgs/by-name/gd/gdbm/freebsd-patch-src-lock-c.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/freebsd/freebsd-ports/blob/e198aef78afa4fd78ddc62fb5d0f7caa1b076bb0/databases/gdbm/files/patch-src_lock.c - ---- a/src/lock.c.orig 2025-03-06 16:24:09 UTC -+++ b/src/lock.c -@@ -73,15 +73,10 @@ try_lock_flock (GDBM_FILE dbf, int nb) - { - return TRY_LOCK_OK; - } -- else if (errno == EWOULDBLOCK) -+ else if (errno == EWOULDBLOCK || errno == EINTR) - { - return TRY_LOCK_FAIL; - } -- else if (errno == EINTR) -- { -- errno = ETIME; -- return TRY_LOCK_FAIL; -- } - #endif - return TRY_LOCK_NEXT; - } -@@ -116,7 +111,6 @@ try_lock_lockf (GDBM_FILE dbf, int nb) - switch (errno) - { - case EINTR: -- errno = ETIME; - case EACCES: - case EAGAIN: - case EDEADLK: -@@ -162,7 +156,6 @@ try_lock_fcntl (GDBM_FILE dbf, int nb) - switch (errno) - { - case EINTR: -- errno = ETIME; - case EACCES: - case EAGAIN: - case EDEADLK: diff --git a/pkgs/by-name/gd/gdbm/package.nix b/pkgs/by-name/gd/gdbm/package.nix index 67fe4953ed206..a31390c4ea3b9 100644 --- a/pkgs/by-name/gd/gdbm/package.nix +++ b/pkgs/by-name/gd/gdbm/package.nix @@ -1,7 +1,6 @@ { lib, fetchurl, - fetchpatch, stdenv, testers, updateAutotoolsGnuConfigScriptsHook, @@ -9,23 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdbm"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "mirror://gnu/gdbm/gdbm-${finalAttrs.version}.tar.gz"; - hash = "sha256-0C2zxZJu2Hf4gXuBzR+S9T73TKjG21Q/u6AnGzTzk+w="; + hash = "sha256-aiRQShTeSnRBA9y5Nr6Xbfb76IzP8mBl5UwcR5RvSl4="; }; - patches = [ - # Remove on next release. - ./upstream-darwin-clock-nanosleep-fix.patch - ./upstream-lockwait-test-fixes.patch - ./upstream-musl-ssize_t-fix.patch - ] - ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ - ./freebsd-patch-src-lock-c.patch - ]; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; hardeningDisable = [ "strictflexarrays3" ]; diff --git a/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch b/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch deleted file mode 100644 index cbc1045305b7a..0000000000000 --- a/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ed0a865345681982ea02c6159c0f3d7702c928a1 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Thu, 27 Mar 2025 20:29:10 +0200 -Subject: Use nanosleep instead of clock_nanosleep - -The latter is not available on macOS ---- - src/lock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lock.c b/src/lock.c -index a43d9c3..cf28478 100644 ---- a/src/lock.c -+++ b/src/lock.c -@@ -291,7 +291,7 @@ _gdbm_lockwait_retry (GDBM_FILE dbf, struct timespec const *ts, - if (timespec_cmp (&ttw, iv) < 0) - break; - timespec_sub (&ttw, iv); -- if (clock_nanosleep (CLOCK_REALTIME, 0, iv, &r)) -+ if (nanosleep (iv, &r)) - { - if (errno == EINTR) - timespec_add (&ttw, &r); --- -cgit v1.2.3 - diff --git a/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch b/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch deleted file mode 100644 index 1bf42fde28fb1..0000000000000 --- a/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 5be83b4c5da7c6a68817908b19f8925af09e9b2c Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Thu, 10 Apr 2025 17:31:56 +0300 -Subject: Fix timeout calculation in lockwait signal test. - -* tests/t_lockwait.c (runtest_signal): mark start time right -after setting alarm, not before it. ---- - tests/t_lockwait.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c -index a5e74c8..3547af7 100644 ---- a/tests/t_lockwait.c -+++ b/tests/t_lockwait.c -@@ -323,9 +323,6 @@ runtest_signal (struct timespec *ts) - struct sigaction act; - struct timeval now; - -- gettimeofday (&now, NULL); -- start = tv_to_ms (&now); -- - if (pipe (sig_fd)) - { - perror ("pipe"); -@@ -341,6 +338,8 @@ runtest_signal (struct timespec *ts) - return -1; - } - alarm (ts_to_ms (&ts[1]) / MILLI); -+ gettimeofday (&now, NULL); -+ start = tv_to_ms (&now); - } - - op.lock_wait = GDBM_LOCKWAIT_SIGNAL; --- -cgit v1.2.3 - -From 6f165a8e1745dbd9b88f6fb6882dff7997cfdf74 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Thu, 10 Apr 2025 21:07:41 +0300 -Subject: More fixes to lockwait test - -* tests/t_lockwait.c (sighan): Close fd. -(runtest_signal): compensate for alarm(2) second precision ---- - tests/t_lockwait.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c -index 3547af7..b378819 100644 ---- a/tests/t_lockwait.c -+++ b/tests/t_lockwait.c -@@ -170,6 +170,7 @@ static void - sighan (int sig) - { - write (sig_fd[1], &sig, sizeof (sig)); -+ close (sig_fd[1]); - } - - static int runtest_retry (struct timespec *ts); -@@ -364,7 +365,8 @@ runtest_signal (struct timespec *ts) - - pfd.fd = sig_fd[0]; - pfd.events = POLLIN; -- switch (poll (&pfd, 1, ts_to_ms (&ts[1]) - tv_to_ms (&now) + start)) { -+ switch (poll (&pfd, 1, -+ ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI)) { - case 1: - break; - --- -cgit v1.2.3 - -From aa9baca52ad155ae501ba586ff7b08f4b08e5434 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Fri, 11 Apr 2025 07:53:58 +0300 -Subject: Adjust timeouts for setitimer interface in lockwait test. - -* tests/t_lockwait.c: Setitimer (at least on some systems) restarts -the timer set by alarm(2). To calculate the ETA of SIGALRM, call -alarm after gdbm_open_ext returns. ---- - tests/t_lockwait.c | 66 ++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 39 insertions(+), 27 deletions(-) - -diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c -index b378819..dfae838 100644 ---- a/tests/t_lockwait.c -+++ b/tests/t_lockwait.c -@@ -322,7 +322,6 @@ runtest_signal (struct timespec *ts) - if (!(ts[1].tv_sec == 0 && ts[1].tv_nsec == 0)) - { - struct sigaction act; -- struct timeval now; - - if (pipe (sig_fd)) - { -@@ -338,9 +337,6 @@ runtest_signal (struct timespec *ts) - fprintf (stderr, "%s: sigaction: %s", progname, strerror (errno)); - return -1; - } -- alarm (ts_to_ms (&ts[1]) / MILLI); -- gettimeofday (&now, NULL); -- start = tv_to_ms (&now); - } - - op.lock_wait = GDBM_LOCKWAIT_SIGNAL; -@@ -354,42 +350,58 @@ runtest_signal (struct timespec *ts) - } - gdbm_close (dbf); - -- if (start > 0) -+ if (!(ts[1].tv_sec == 0 && ts[1].tv_nsec == 0)) - { - struct pollfd pfd; - struct timeval now; -- int sig; -+ int n, t, sig; - -- restart: -+ alarm (ts_to_ms (&ts[1]) / MILLI); - gettimeofday (&now, NULL); -+ start = tv_to_ms (&now); - - pfd.fd = sig_fd[0]; - pfd.events = POLLIN; -- switch (poll (&pfd, 1, -- ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI)) { -- case 1: -- break; - -- case 0: -- fprintf (stderr, "%s: failed waiting for alarm\n", progname); -- return 1; -- -- default: -- if (errno == EINTR) goto restart; -- fprintf (stderr, "%s: poll: %s\n", progname, strerror (errno)); -- return 1; -- } -- -- if (read (sig_fd[0], &sig, sizeof (sig)) != sizeof (sig)) -+ do - { -- fprintf (stderr, "%s: read: %s\n", progname, strerror (errno)); -- return 1; -+ gettimeofday (&now, NULL); -+ t = ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI; -+ if (t < 0) -+ { -+ n = 0; -+ break; -+ } - } -- close (sig_fd[0]); -- if (sig != SIGALRM) -+ while ((n = poll (&pfd, 1, t)) == -1 && errno == EINTR); -+ -+ switch (n) - { -- fprintf (stderr, "%s: unexpected data read\n", progname); -+ case 1: -+ if (read (sig_fd[0], &sig, sizeof (sig)) != sizeof (sig)) -+ { -+ fprintf (stderr, "%s: read: %s\n", progname, strerror (errno)); -+ return 1; -+ } -+ close (sig_fd[0]); -+ if (sig != SIGALRM) -+ { -+ fprintf (stderr, "%s: unexpected data read\n", progname); -+ return 1; -+ } -+ break; -+ -+ case 0: -+ fprintf (stderr, "%s: failed waiting for alarm\n", progname); - return 1; -+ -+ default: -+ if (errno != EINTR) -+ { -+ fprintf (stderr, "%s: poll: %s\n", -+ progname, strerror (errno)); -+ return 1; -+ } - } - } - --- -cgit v1.2.3 - diff --git a/pkgs/by-name/gd/gdbm/upstream-musl-ssize_t-fix.patch b/pkgs/by-name/gd/gdbm/upstream-musl-ssize_t-fix.patch deleted file mode 100644 index 79f5b3b16eefa..0000000000000 --- a/pkgs/by-name/gd/gdbm/upstream-musl-ssize_t-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 39ef0347f78ef691c9ad815360198f577043ce4c Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Mon, 24 Mar 2025 07:56:00 +0200 -Subject: Add missing include - -* tools/gdbmapp.h: Include sys/types.h ---- - tools/gdbmapp.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/gdbmapp.h b/tools/gdbmapp.h -index 3ea826b..e20253a 100644 ---- a/tools/gdbmapp.h -+++ b/tools/gdbmapp.h -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #include "gettext.h" - #ifdef HAVE_LOCALE_H - # include --- -cgit v1.1 - diff --git a/pkgs/by-name/ge/gerbera/package.nix b/pkgs/by-name/ge/gerbera/package.nix index 9d0fa9389025c..53b70d0495886 100644 --- a/pkgs/by-name/ge/gerbera/package.nix +++ b/pkgs/by-name/ge/gerbera/package.nix @@ -13,7 +13,7 @@ spdlog, sqlite, zlib, - fmt_11, + fmt, # options enableMysql ? false, libmysqlclient, @@ -161,7 +161,7 @@ stdenv.mkDerivation rec { spdlog sqlite zlib - fmt_11 + fmt ] ++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options)); diff --git a/pkgs/by-name/gf/gflags/package.nix b/pkgs/by-name/gf/gflags/package.nix index b01b862804e3f..331aa60873327 100644 --- a/pkgs/by-name/gf/gflags/package.nix +++ b/pkgs/by-name/gf/gflags/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, enableShared ? !stdenv.hostPlatform.isStatic, }: @@ -17,6 +18,15 @@ stdenv.mkDerivation rec { sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0"; }; + patches = [ + # Fix the build with CMake 4. + (fetchpatch { + name = "gflags-fix-cmake-4.patch"; + url = "https://github.com/gflags/gflags/commit/70c01a642f08734b7bddc9687884844ca117e080.patch"; + hash = "sha256-TYdroBbF27Wvvm/rOahBEvhezuKCcxbtgh/ZhpA5ESo="; + }) + ]; + nativeBuildInputs = [ cmake ]; # This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin) diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index 9fac60a8c5f74..70512dcc9f653 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -64,13 +64,13 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.05.1"; + version = "10.06.0"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${ lib.replaceStrings [ "." ] [ "" ] version }/ghostscript-${version}.tar.xz"; - hash = "sha256-IvK9yhXCiDDJcVzdxcKW6maJi/2rC2BKTgvP6wOvbK0="; + hash = "sha256-ZDUmSMLAgcip+xoS3Bll4B6tfFf1i3LRtU9u8c7zxWE="; }; patches = [ @@ -82,6 +82,13 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/ghostscript/-/raw/01e895fea033cc35054d1b68010de9818fa4a8fc/debian/patches/2010_add_build_timestamp_setting.patch"; hash = "sha256-XTKkFKzMR2QpcS1YqoxzJnyuGk/l/Y2jdevsmbMtCXA="; }) + ] + ++ lib.optionals stdenv.hostPlatform.is32bit [ + # 32 bit compat. conditional as to not cause rebuilds + (fetchpatch2 { + url = "https://github.com/ArtifexSoftware/ghostpdl/commit/3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f.patch?full_index=1"; + hash = "sha256-NrL4lI19x+OHaSIwV93Op/I9k2MWXxSWgbkwSGU7R6A="; + }) ]; outputs = [ diff --git a/pkgs/by-name/gj/gjs/disable-umlaut-test.patch b/pkgs/by-name/gj/gjs/disable-umlaut-test.patch new file mode 100644 index 0000000000000..b4f4be0f16aad --- /dev/null +++ b/pkgs/by-name/gj/gjs/disable-umlaut-test.patch @@ -0,0 +1,13 @@ +diff --git a/installed-tests/js/testGIMarshalling.js b/installed-tests/js/testGIMarshalling.js +index b94aa7c8..8f79fe71 100644 +--- a/installed-tests/js/testGIMarshalling.js ++++ b/installed-tests/js/testGIMarshalling.js +@@ -2931,7 +2931,7 @@ describe('Filename tests', function () { + }); + + it('various types of path existing', function () { +- const paths = ['foo-2', 'öäü-3']; ++ const paths = ['foo-2']; + for (const path of paths) { + const file = workdir.get_child(path); + const stream = file.create(Gio.FileCreateFlags.NONE, null); diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index 691575c5a93c3..f9b1f3c1ffa38 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -64,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: { # Disable introspection test in installed tests # (minijasmine:1317): GLib-GIO-WARNING **: 17:33:39.556: Error creating IO channel for /proc/self/mountinfo: No such file or directory (g-io-error-quark, 1) ./disable-introspection-test.patch + + # The reason is unclear, but a test that creates a file named "öäü-3" fails only on ZFS filesystems: + # 24/78 gjs:JS / GIMarshalling FAIL 0.59s 726/727 subtests passed + # not ok 796 Filename tests various types of path existing + # Message: Error opening file “/build/.UGHEA3/öäü-3”: Invalid or incomplete multibyte or wide character in /build/gjs-1.84.2/build/../installed-tests/js/testGIMarshalling.js (line 2937) + ./disable-umlaut-test.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix index 988151f91b129..17f0b7daea278 100644 --- a/pkgs/by-name/gn/gn/package.nix +++ b/pkgs/by-name/gn/gn/package.nix @@ -11,11 +11,11 @@ version ? # This is a workaround for update-source-version to be able to update this let - _version = "0-unstable-2025-06-19"; + _version = "0-unstable-2025-07-29"; in _version, - rev ? "97b68a0bb62b7528bc3491c7949d6804223c2b82", - hash ? "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE=", + rev ? "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee", + hash ? "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw=", }: stdenv.mkDerivation { diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index b114dfc8e4261..d30a09c70ea82 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGo125Module rec { pname = "goreleaser"; - version = "2.12.0"; + version = "2.12.5"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-z3yYC6NQ6Y5NbsFsvYnx/+X1rU7Gs8dSXaQZ0KCyiis="; + hash = "sha256-EHJ1ARzk6BD5D121u+1UTe90oLOovKKD+LQWLIj81Jk="; }; - vendorHash = "sha256-GcG/VkX9XkAkNAwt5XX14FWAZutSuSOOyl7/Yjwxrfk="; + vendorHash = "sha256-J/OwvPxC8wz/91sWWUBNkW5E71m8EPjTq3h/MOxT/3k="; ldflags = [ "-s" diff --git a/pkgs/by-name/gp/gperftools/package.nix b/pkgs/by-name/gp/gperftools/package.nix index 5875bf80311cd..5dc08804834a4 100644 --- a/pkgs/by-name/gp/gperftools/package.nix +++ b/pkgs/by-name/gp/gperftools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gperftools"; - version = "2.17"; + version = "2.17.2"; src = fetchFromGitHub { owner = "gperftools"; repo = "gperftools"; tag = "gperftools-${finalAttrs.version}"; - sha256 = "sha256-Tm+sYKwFSHAxOALgr9UGv7vBMlWqUymXsvNu7Sku6Kk="; + hash = "sha256-WCEuiSjNIX/KhEBWndyVhrKlWs7H60mcHoPlWd7YWC4="; }; patches = [ diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index 71eda06acd598..f52a2cdfb1a53 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -25,7 +25,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.74.0"; # N.B: if you change this, please update: + version = "1.75.0"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; tag = "v${version}"; - hash = "sha256-97+llHIubNYwULSD0KxEcGN+T8bQWufaEH6QT9oTgwg="; + hash = "sha256-2SeL/O6FaAnrPXMHAPKCSzx3hlcKLuC5y+ljJ1gewkE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/gs/gsm/package.nix b/pkgs/by-name/gs/gsm/package.nix index 85dc7b187ce50..3cefc80a637a6 100644 --- a/pkgs/by-name/gs/gsm/package.nix +++ b/pkgs/by-name/gs/gsm/package.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "gsm"; - version = "1.0.22"; + version = "1.0.23"; src = fetchurl { url = "https://www.quut.com/gsm/${pname}-${version}.tar.gz"; - sha256 = "sha256-8Acukfa7hah4svbb9KC3yFDE3rgEnVVMZTQLO/ad8Kw="; + sha256 = "sha256-i3WRqFrJrc6FjyBTAF5rLrIMI7i4qGjf+ylpZF+jI8A="; }; patchPhase = '' diff --git a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix index 94ce06940e98f..70ee0c052552f 100644 --- a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix +++ b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { name = "hledger-check-fancyassertion-${version}.hs"; url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs"; - sha256 = "0lyyz8dqkknd9d073l613kdkaqd9r6ymdw94d7mwp17pxvfr17wf"; + hash = "sha256-p1JvPHSB5hkfZsTq1sSL0mxCRkhZu1zkpXTELVNFE64="; }; dontUnpack = true; diff --git a/pkgs/by-name/hm/hm/package.nix b/pkgs/by-name/hm/hm/package.nix index 4870331c11004..fc3f01a56a66e 100644 --- a/pkgs/by-name/hm/hm/package.nix +++ b/pkgs/by-name/hm/hm/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.cc.isClang [ "-Wno-error=bitwise-instead-of-logical" "-Wno-error=missing-braces" + "-Wno-error=nontrivial-memcall" ] ); diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index a0e7c9a723b39..0efde52722336 100644 --- a/pkgs/by-name/ho/houdini/package.nix +++ b/pkgs/by-name/ho/houdini/package.nix @@ -36,7 +36,7 @@ buildFHSEnv { libdrm libxkbcommon libudev0-shim - tbb + onetbb xwayland qt5.qtwayland net-tools # needed by licensing tools diff --git a/pkgs/by-name/hp/hpipm/package.nix b/pkgs/by-name/hp/hpipm/package.nix index 534697dd19831..d818a4c051407 100644 --- a/pkgs/by-name/hp/hpipm/package.nix +++ b/pkgs/by-name/hp/hpipm/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpipm"; #version = "0.1.3"; not building, use master instead - version = "0-unstable-2024-07-30"; + version = "0.1.3-unstable-2025-07-25"; src = fetchFromGitHub { owner = "giaf"; repo = "hpipm"; - rev = "3ab7d6059d9d7da31ec9ff6a8ca84fd8ec5ab5e2"; - hash = "sha256-TRNHjW2/YDfGJHTG9sy2nmHyk6+HlBGIabPm87TETE8="; + rev = "00c2a084e059e2e1b79877f668e282d0c4282110"; + hash = "sha256-Lg7po7xTs9jc8FiYFMbNFJooTjOpzBFiyd5f+TPMWQA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ht/html-tidy/package.nix b/pkgs/by-name/ht/html-tidy/package.nix index c75bfdbb1f7e8..fa5c7f20a9655 100644 --- a/pkgs/by-name/ht/html-tidy/package.nix +++ b/pkgs/by-name/ht/html-tidy/package.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-Q2GjinNBWLL+HXUtslzDJ7CJSTflckbjweiSMCnIVwg="; } ); + # https://github.com/htacg/tidy-html5/issues/1139 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'cmake_minimum_required (VERSION 2.8.12)' 'cmake_minimum_required(VERSION 3.5)' + ''; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ht/https-dns-proxy/package.nix b/pkgs/by-name/ht/https-dns-proxy/package.nix index a37168689b581..31a4462f349ef 100644 --- a/pkgs/by-name/ht/https-dns-proxy/package.nix +++ b/pkgs/by-name/ht/https-dns-proxy/package.nix @@ -5,13 +5,10 @@ cmake, gtest, c-ares, - curlHTTP3, + curl, libev, }: -let - curl' = curlHTTP3; -in stdenv.mkDerivation rec { pname = "https-dns-proxy"; # there are no stable releases (yet?) @@ -38,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ c-ares - curl' + curl libev ]; diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index 729918d9f25db..b0a26d17b0919 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hwdata"; - version = "0.398"; + version = "0.399"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${finalAttrs.version}"; - hash = "sha256-rHpXkltESdfBDZ/dySzPgoLPs3l5jyBfNFaZYlALfnk="; + hash = "sha256-7IhOMl0o5dyevklvOSZrTbNMkMy/Sp/MtxaPdeqpHJg="; }; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix index 20f5519a6d7d8..655d43a187d31 100644 --- a/pkgs/by-name/in/inetutils/package.nix +++ b/pkgs/by-name/in/inetutils/package.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + ] + # FIXME: apply unconditionally + ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ./tests-libls.sh.patch ]; strictDeps = true; diff --git a/pkgs/by-name/in/inetutils/tests-libls.sh.patch b/pkgs/by-name/in/inetutils/tests-libls.sh.patch new file mode 100644 index 0000000000000..d3fc7c68fae53 --- /dev/null +++ b/pkgs/by-name/in/inetutils/tests-libls.sh.patch @@ -0,0 +1,12 @@ +tests: Remove bogus test for unsorted file listing + +Minimized from what Debian applies: +https://git.hadrons.org/cgit/debian/pkgs/inetutils.git/tree/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch?id=8ab7f49fe5cf194e989ae6ae6a78eb65397c5778 +--- a/tests/libls.sh ++++ b/tests/libls.sh +@@ -91,1 +91,0 @@ +-REPLY_Cf=`$LS -Cf $LSDIR` +@@ -130,3 +129,0 @@ +-test x"$REPLY_C" != x"$REPLY_Cf" || +- { errno=1; echo >&2 'Failed to disable sorting with "-f".'; } +- diff --git a/pkgs/by-name/in/intel-media-driver/cmake4.patch b/pkgs/by-name/in/intel-media-driver/cmake4.patch new file mode 100644 index 0000000000000..9cd8cdb82bcec --- /dev/null +++ b/pkgs/by-name/in/intel-media-driver/cmake4.patch @@ -0,0 +1,156 @@ +diff --git a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt +index 2c72d282d2b..025b9354254 100644 +--- a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt ++++ b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(IntelGenDmyHexTool) + add_compile_options(-std=c++11) + +diff --git a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt +index cc586ba766d..519ca954d33 100644 +--- a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt ++++ b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + + project(GenKrnBin) + +diff --git a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt +index 713d08600ec..91eacf15d8b 100644 +--- a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt ++++ b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(IntelKernelBinToSourceTool) + add_compile_options(-std=c++11) + +diff --git a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt +index a3cb7341c6e..e2bfde5e884 100644 +--- a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt ++++ b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(KrnToHexTool) + add_compile_options(-std=c++11) + +diff --git a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt +index af622be19cb..40e4eba171e 100644 +--- a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt ++++ b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + + project(KrnToHex_IGA) + +diff --git a/cmrtlib/CMakeLists.txt b/cmrtlib/CMakeLists.txt +index 9ecb1e4e10a..54f907b3772 100644 +--- a/cmrtlib/CMakeLists.txt ++++ b/cmrtlib/CMakeLists.txt +@@ -19,7 +19,7 @@ + # OTHER DEALINGS IN THE SOFTWARE. + + set(BUILD_ALL $ENV{BUILD_ALL}) +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(CM_RT) + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/linux) + +diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt +index b066138d9df..df02bab2a69 100644 +--- a/cmrtlib/linux/CMakeLists.txt ++++ b/cmrtlib/linux/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + include (${CMAKE_CURRENT_LIST_DIR}/cmrt_utils.cmake) + + +diff --git a/media_driver/linux/ult/CMakeLists.txt b/media_driver/linux/ult/CMakeLists.txt +index 9fb5b39ee42..f06b490110b 100644 +--- a/media_driver/linux/ult/CMakeLists.txt ++++ b/media_driver/linux/ult/CMakeLists.txt +@@ -17,7 +17,7 @@ + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + if ("${BUILD_TYPE}" STREQUAL "debug") + set(CMAKE_BUILD_TYPE "Debug") +diff --git a/media_driver/linux/ult/libdrm_mock/CMakeLists.txt b/media_driver/linux/ult/libdrm_mock/CMakeLists.txt +index 438715a91c3..e5d2c88ed5b 100644 +--- a/media_driver/linux/ult/libdrm_mock/CMakeLists.txt ++++ b/media_driver/linux/ult/libdrm_mock/CMakeLists.txt +@@ -17,7 +17,7 @@ + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + + project(libdrm_mock) + +diff --git a/media_driver/linux/ult/ult_app/CMakeLists.txt b/media_driver/linux/ult/ult_app/CMakeLists.txt +index 1b24fed7fc5..64217b9fe65 100644 +--- a/media_driver/linux/ult/ult_app/CMakeLists.txt ++++ b/media_driver/linux/ult/ult_app/CMakeLists.txt +@@ -17,7 +17,7 @@ + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + project(devult) + +diff --git a/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt b/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt +index 6b1f7433596..bba044a97d8 100644 +--- a/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt ++++ b/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt +@@ -17,7 +17,7 @@ + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + + project(devult) + +diff --git a/os_release_info.cmake b/os_release_info.cmake +index b4a84e2c5cb..a3b879d8545 100644 +--- a/os_release_info.cmake ++++ b/os_release_info.cmake +@@ -29,7 +29,7 @@ set(_os_release_info TRUE) + # of the local cmake environment. + + # Set cmake policies for at least this level: +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + + + # Function get_os_release_info - Determine and return OS name and version diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix index cfd020f9ec277..c6e2bc6f8e449 100644 --- a/pkgs/by-name/in/intel-media-driver/package.nix +++ b/pkgs/by-name/in/intel-media-driver/package.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/7376a99f060c26d6be8e56674da52a61662617b9/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; hash = "sha256-57yePuHWYb3XXrB4MjYO2h6jbqfs4SGTLlLG91el8M4="; }) + + # cmake 4 compatibility, upstream PR: https://github.com/intel/media-driver/pull/1919 + ./cmake4.patch ]; cmakeFlags = [ diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix index 99e0d9d6f710f..3d0b3dc76cf17 100644 --- a/pkgs/by-name/is/ispc/package.nix +++ b/pkgs/by-name/is/ispc/package.nix @@ -10,7 +10,7 @@ flex, llvmPackages, ncurses, - tbb, + onetbb, # the default test target is sse4, but that is not supported by all Hydra agents testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { pname = "ispc"; version = "1.28.2"; - dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566 - src = fetchFromGitHub { owner = "ispc"; repo = "ispc"; @@ -40,7 +38,7 @@ stdenv.mkDerivation rec { flex python3 llvmPackages.libllvm.dev - tbb + onetbb ]; buildInputs = with llvmPackages; [ diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix index 1478f46feae73..b16e876364249 100644 --- a/pkgs/by-name/ja/jansson/package.nix +++ b/pkgs/by-name/ja/jansson/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "jansson"; - version = "2.14"; + version = "2.14.1"; outputs = [ "dev" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "akheron"; repo = "jansson"; rev = "v${finalAttrs.version}"; - hash = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4="; + hash = "sha256-ct/EzRDrHkZrCcm98XGCbjbOM2h3AAMldPoTWA5+dAE="; }; nativeBuildInputs = [ @@ -33,6 +33,12 @@ stdenv.mkDerivation (finalAttrs: { # networkmanager relies on libjansson.so: # https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453 "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + + # Fix the build with CMake 4. + # + # Remove on next release; upstream fix is coupled with additional + # changes in . + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ]; postFixup = '' diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 1e761aadda71a..90972a50e03d9 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasper"; - version = "4.2.6"; + version = "4.2.8"; src = fetchFromGitHub { owner = "jasper-software"; repo = "jasper"; rev = "version-${finalAttrs.version}"; - hash = "sha256-tq27ANDDRdP224E12UeQnvE6BFZRk7KczH4Dq+yt0nY="; + hash = "sha256-p/xqDsYivhG/21808hdMKFMWl4DfQ0huAHiftVjOdJM="; }; outputs = [ diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix index 1c40b4fca43d2..fc197af49aae0 100644 --- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix +++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix @@ -1,6 +1,7 @@ { ffmpeg_7-full, fetchFromGitHub, + fetchpatch2, lib, }: @@ -26,7 +27,13 @@ in ]; # Clobber upstream patches as they don't apply to the Jellyfin fork - patches = [ ]; + patches = [ + (fetchpatch2 { + name = "lcevcdec-4.0.0-compat.patch"; + url = "https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/fa23202cc7baab899894e8d22d82851a84967848.patch"; + hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ="; + }) + ]; postPatch = '' for file in $(cat debian/patches/series); do diff --git a/pkgs/by-name/ji/jitterentropy/package.nix b/pkgs/by-name/ji/jitterentropy/package.nix index bf5a6409a6f50..0c23a9204a98c 100644 --- a/pkgs/by-name/ji/jitterentropy/package.nix +++ b/pkgs/by-name/ji/jitterentropy/package.nix @@ -3,6 +3,7 @@ stdenv, cmake, fetchFromGitHub, + fetchpatch, }: stdenv.mkDerivation rec { @@ -16,6 +17,14 @@ stdenv.mkDerivation rec { hash = "sha256-A7a0kg9JRiNNKJbLJu5Fbu6ZgCwv3+3oDhZr3jwNXmM="; }; + patches = [ + # cmake 4 compatibility + (fetchpatch { + url = "https://github.com/smuellerDD/jitterentropy-library/commit/047beb1bf9ef7a14e63f3e4f2d4e79f673baa7ec.patch"; + hash = "sha256-m/cfI7s7sdjkZjkKL/w/rNZzP/t3eimbVryMW5+crw4="; + }) + ]; + nativeBuildInputs = [ cmake ]; outputs = [ diff --git a/pkgs/by-name/js/json-glib/package.nix b/pkgs/by-name/js/json-glib/package.nix index 465138840e90c..1d94f5c32aecf 100644 --- a/pkgs/by-name/js/json-glib/package.nix +++ b/pkgs/by-name/js/json-glib/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "json-glib"; - version = "1.10.6"; + version = "1.10.8"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-d/S8v5M5Uo8Wa4BzRYaT8KILd7cFnbwtthdGoZKLApM="; + hash = "sha256-VcXBQaVkJFuPj752mGY8h6RaczPCosVvBvgRq3OyEt0="; }; patches = [ diff --git a/pkgs/by-name/js/json_c/package.nix b/pkgs/by-name/js/json_c/package.nix index b224da20070fd..04022602426d1 100644 --- a/pkgs/by-name/js/json_c/package.nix +++ b/pkgs/by-name/js/json_c/package.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_APPS" false) + ]; + meta = with lib; { description = "JSON implementation in C"; longDescription = '' diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index bd44c3ccebc2d..c376c56ad1d4c 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, fetchurl, - fmt_10, + fmt, nlohmann_json, cli11, microsoft-gsl, @@ -63,12 +63,7 @@ stdenv.mkDerivation rec { # Dependencies of just cli11 - # Using fmt 10 because this is the same version upstream currently - # uses for bundled builds - # For future updates: The currently used version can be found in the file - # etc/repos.in.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.in.json - # under the key .repositories.fmt - fmt_10 + fmt microsoft-gsl nlohmann_json diff --git a/pkgs/by-name/ka/kaminpar/package.nix b/pkgs/by-name/ka/kaminpar/package.nix index 9b9cfac2a4742..b93eea19c8dbd 100644 --- a/pkgs/by-name/ka/kaminpar/package.nix +++ b/pkgs/by-name/ka/kaminpar/package.nix @@ -7,7 +7,7 @@ numactl, mpi, sparsehash, - tbb_2022, + onetbb, gtest, mpiCheckPhaseHook, }: @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ mpi sparsehash - tbb_2022 + onetbb ]; cmakeFlags = [ diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix index 75e20132fe869..5e89ce36d19b6 100644 --- a/pkgs/by-name/kb/kbd/package.nix +++ b/pkgs/by-name/kb/kbd/package.nix @@ -23,16 +23,16 @@ withVlock ? true, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "kbd"; - version = "2.8.0-unstable-2025-08-12"; + version = "2.9.0"; __structuredAttrs = true; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; - rev = "46295167a55643e941c8cdcfd2cb76bd138c851c"; - hash = "sha256-m1aVfsEme/BnyJogOPvGcOrSJfli8B/TrGxOm4POt0w="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uUECxFdm/UhoHKLHLFe6/ygCQ+4mrQOZExKl+ReaTNw="; }; # vlock is moved into its own output, since it depends on pam. This @@ -146,4 +146,4 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ davidak ]; }; -} +}) diff --git a/pkgs/by-name/ko/kompute/package.nix b/pkgs/by-name/ko/kompute/package.nix index a0598a6326269..8724169b5c9ad 100644 --- a/pkgs/by-name/ko/kompute/package.nix +++ b/pkgs/by-name/ko/kompute/package.nix @@ -6,7 +6,7 @@ cmake, vulkan-headers, vulkan-loader, - fmt_10, + fmt, spdlog, glslang, ninja, @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { url = "https://github.com/KomputeProject/kompute/commit/299b11fb4b8a7607c5d2c27e2735f26b06ae8e29.patch"; sha256 = "sha256-JuoTQ+VjIdyF+I1IcT1ofbBjRS0Ibm2w6F2jrRJlx40="; }) + + # Fix the build with fmt ≥ 11. + (fetchpatch { + url = "https://github.com/KomputeProject/kompute/commit/e7985da9950bf75f00799f73b0e1d4ea7c24f0b2.patch"; + hash = "sha256-sZf1lazaGaiRzry0Y+KE6z3FKm79gVKoSFyW0GN3TMM="; + }) ]; nativeBuildInputs = [ @@ -50,7 +56,7 @@ stdenv.mkDerivation rec { ninja ]; buildInputs = [ - fmt_10 + fmt spdlog ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix index 6ca495b217182..29c6acb14aae6 100644 --- a/pkgs/by-name/lc/lcevcdec/package.nix +++ b/pkgs/by-name/lc/lcevcdec/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lcevcdec"; - version = "3.3.8"; + version = "4.0.1"; outputs = [ "out" @@ -26,16 +26,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "v-novaltd"; repo = "LCEVCdec"; tag = finalAttrs.version; - hash = "sha256-s7gY3l5ML+7T7i6DsstC75XXgxQgTWyITfa+8OhHl+w="; + hash = "sha256-azY4xle2wwopT9qEHa4+nXPkGzscWz9tYof1qN7Nw8c="; }; - patches = [ - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/010-lcevcdec-fix-pkgconfig-libs.patch?h=lcevcdec&id=a3470fad7d64dfc9d5ebd7ed0c09cb1fb5e2488f"; - hash = "sha256-z65W3k2OA/QDX0jJu4nmXtpi8kTcUFN7cK82PsI4jrQ="; - }) - ]; - postPatch = '' substituteInPlace cmake/tools/version_files.py \ --replace-fail "args.git_version" '"${finalAttrs.version}"' \ @@ -43,20 +36,11 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "args.git_date" '"1970-01-01"' substituteInPlace cmake/templates/lcevc_dec.pc.in \ --replace-fail "@GIT_SHORT_VERSION@" "${finalAttrs.version}" - - '' - + lib.optionalString (!stdenv.hostPlatform.avxSupport) '' - substituteInPlace cmake/modules/Compiler/GNU.cmake \ - --replace-fail "-mavx" "" - - substituteInPlace src/core/decoder/src/common/simd.c \ - --replace-fail "((_xgetbv(kControlRegister) & kOSXSaveMask) == kOSXSaveMask)" "false" ''; env = { includedir = "${placeholder "dev"}/include"; libdir = "${placeholder "out"}/lib"; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-variable"; }; nativeBuildInputs = [ @@ -78,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "VN_CORE_AVX2" stdenv.hostPlatform.avx2Support) # Requires avx for checking on runtime (lib.cmakeBool "VN_CORE_SSE" stdenv.hostPlatform.avxSupport) + (lib.cmakeBool "VN_SDK_SIMD" stdenv.hostPlatform.avxSupport) ]; passthru = { diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 54355735828ef..c6e5c7cff9692 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -6,6 +6,7 @@ fetchFromGitHub, libtapi, llvm, + libxml2, meson, ninja, openssl, @@ -113,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ llvm + libxml2 openssl xar ]; diff --git a/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch index c03f5f5a2fb28..70756685c2f7e 100644 --- a/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch +++ b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch @@ -299,7 +299,7 @@ index 0000000..067a69c + install : true, + sources : [ + configure_h, -+ 'UnwindDump.cpp', ++ 'unwinddump.cpp', + ], +) +install_man(meson.global_source_root() / 'doc/man/man1/unwinddump.1') diff --git a/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch b/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch index df3190da1bd72..d7876def7715f 100644 --- a/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch +++ b/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch @@ -50,9 +50,9 @@ index 0000000..9cd1dcc +llvm_dep = dependency( + 'llvm', + modules : [ -+ 'Demangle', -+ 'TargetParser', -+ 'TextAPI', ++ 'demangle', ++ 'targetparser', ++ 'textapi', + ], + static : true, + version : '>=19.1' diff --git a/pkgs/by-name/ld/ldacbt/package.nix b/pkgs/by-name/ld/ldacbt/package.nix index f92c1f564af8e..0de3e7468a4b3 100644 --- a/pkgs/by-name/ld/ldacbt/package.nix +++ b/pkgs/by-name/ld/ldacbt/package.nix @@ -31,6 +31,16 @@ stdenv.mkDerivation rec { "-DINSTALL_INCLUDEDIR=${placeholder "dev"}/include" ]; + # Fix the build with CMake 4. + # + # See: + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 3.0)' \ + 'cmake_minimum_required(VERSION 3.0...3.10)' + ''; + meta = with lib; { description = "AOSP libldac dispatcher"; homepage = "https://github.com/EHfive/ldacBT"; diff --git a/pkgs/by-name/le/lensfun/package.nix b/pkgs/by-name/le/lensfun/package.nix index c6d058c55b676..d59644ce0c730 100644 --- a/pkgs/by-name/le/lensfun/package.nix +++ b/pkgs/by-name/le/lensfun/package.nix @@ -45,6 +45,16 @@ stdenv.mkDerivation { mkdir -p data/db tar xvf $TMPDIR/db/version_1.tar -C data/db date +%s > data/db/timestamp.txt + '' + # Backport CMake 4 support + # This is already on master, but not yet in a stable release: + # https://github.com/lensfun/lensfun/issues/2520 + # https://github.com/lensfun/lensfun/commit/011de2e85813ff496a85404b30891352555de077 + + '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR )' \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 3.12 FATAL_ERROR)' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix index 54090fdda1da3..813138971444b 100644 --- a/pkgs/by-name/li/lib3mf/package.nix +++ b/pkgs/by-name/li/lib3mf/package.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/3MFConsortium/lib3mf/pull/421/commits/6d7b5709a4a1cf9bd55ae8b4ae999c9ca014f62c.patch?full_index=1"; hash = "sha256-rGOyXZUZglRNMu1/oVhgSpRdi0pUa/wn5SFHCS9jVOY="; }) + (fetchpatch { + name = "lib3mf-fix-cmake-4.patch"; + url = "https://github.com/3MFConsortium/lib3mf/commit/01325a73de25d2ad49e992b5b6294beb32298c92.patch"; + hash = "sha256-8vv2ydnDgvSKkGjpmk5ng1BGKK0okTMOeAoGwlKcziY="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix index 31e4997172247..d549f7a83074a 100644 --- a/pkgs/by-name/li/libapparmor/package.nix +++ b/pkgs/by-name/li/libapparmor/package.nix @@ -32,13 +32,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libapparmor"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitLab { owner = "apparmor"; repo = "apparmor"; tag = "v${finalAttrs.version}"; - hash = "sha256-f9FgowlV4lZKKuddGCirqbajhIGyTUQc7IFHSvqY6eQ="; + hash = "sha256-CwWNfH2Ykv4e+8ONytdM7J+aItAMVrq0yYrYzRXAe1w="; }; sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor"; diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix index 9e63c725c93b7..0356c862aa65b 100644 --- a/pkgs/by-name/li/libappimage/package.nix +++ b/pkgs/by-name/li/libappimage/package.nix @@ -37,6 +37,23 @@ stdenv.mkDerivation rec { url = "https://github.com/AppImageCommunity/libappimage/commit/1e0515b23b90588ce406669134feca56ddcbbe43.patch"; hash = "sha256-WIMvXNqC1stgPiBTRpXHWq3edIRnQomtRSW2qO52TRo="; }) + + # we really just want this for cmake 4 compatibility + (fetchpatch { + name = "libappimage-use-system-gtest.patch"; + url = "https://github.com/AppImageCommunity/libappimage/commit/7b83b7247fd2d86c330e09f534c9cec1b03f649f.patch"; + excludes = [ + "ci/*" + "lib/gtest" + "tests/*" + ]; + hash = "sha256-H+ph5TfKJPFcAzw2c7pzmqvB9R50HtZP/DbroOxLTVU="; + }) + (fetchpatch { + name = "libappimage-fix-cmake-4.patch"; + url = "https://github.com/AppImageCommunity/libappimage/commit/e5f6ea562611d534dc8e899a12ddf15c50e820be.patch"; + hash = "sha256-P6fPoiqVX3TrKGrU2EXIMBpQLGl7xNcy41Iq7vRM+n8="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index ada016a4383e0..e9aa977186280 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -4,7 +4,7 @@ cmake, fetchFromGitHub, fetchpatch, - tbb_2022, + onetbb, useTBB ? true, }: @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; propagatedBuildInputs = lib.optionals useTBB [ - tbb_2022 + onetbb ]; cmakeFlags = [ diff --git a/pkgs/by-name/li/libcbor/package.nix b/pkgs/by-name/li/libcbor/package.nix index a38b9cafac55d..3c48f2b52977c 100644 --- a/pkgs/by-name/li/libcbor/package.nix +++ b/pkgs/by-name/li/libcbor/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcbor"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "PJK"; repo = "libcbor"; rev = "v${finalAttrs.version}"; - hash = "sha256-13iwjc1vrTgBhWRg4vpLmlrEoxA9DSuXIOz4R9cXXEc="; + hash = "sha256-ePgVR7VHXWKqOShuAEQG3BJ08W2aZS/vfcPUCqTw7X4="; }; outputs = [ @@ -35,9 +35,9 @@ stdenv.mkDerivation (finalAttrs: { cmocka # cmake expects cmocka module ]; - # BUILD file already exists in the source - # TODO: make unconditional on staging. - cmakeBuildDir = if stdenv.isDarwin then "build.dir" else null; + # BUILD file already exists in the source; this causes issues on + # case‐insensitive Darwin systems. + cmakeBuildDir = "build.dir"; cmakeFlags = lib.optional finalAttrs.finalPackage.doCheck "-DWITH_TESTS=ON" diff --git a/pkgs/by-name/li/libccd/package.nix b/pkgs/by-name/li/libccd/package.nix index 8040dd7adcd6d..7e5263de362df 100644 --- a/pkgs/by-name/li/libccd/package.nix +++ b/pkgs/by-name/li/libccd/package.nix @@ -26,6 +26,14 @@ stdenv.mkDerivation rec { }) ]; + # fix for CMake v4 + # ref https://github.com/danfis/libccd/pull/82, not merged yet + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8.11)" \ + "cmake_minimum_required(VERSION 3.12)" + ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/by-name/li/libcue/package.nix b/pkgs/by-name/li/libcue/package.nix index b2daf4d239be6..f3d92b40afc2b 100644 --- a/pkgs/by-name/li/libcue/package.nix +++ b/pkgs/by-name/li/libcue/package.nix @@ -24,6 +24,14 @@ stdenv.mkDerivation rec { flex ]; + # Fix the build with CMake 4. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)' \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)' + ''; + doCheck = true; meta = with lib; { diff --git a/pkgs/by-name/li/libebml/package.nix b/pkgs/by-name/li/libebml/package.nix index e6bd5d29bca29..54b01be9dfc8b 100644 --- a/pkgs/by-name/li/libebml/package.nix +++ b/pkgs/by-name/li/libebml/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, }: @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-PIVBePTWceMgiENdaL9lvXIL/RQIrtg7l0OG2tO0SU8="; }; + patches = [ + (fetchpatch { + name = "libebml-fix-cmake-4.patch"; + url = "https://github.com/Matroska-Org/libebml/commit/6725c5f0169981cb0bd2ee124fbf0d8ca30b762d.patch"; + hash = "sha256-q62EWnJmQzBtra1xL0N7rC4RARJZQ/HAVyorzvB7XFY="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/li/libebur128/package.nix b/pkgs/by-name/li/libebur128/package.nix index c992560630379..283d0dd432d30 100644 --- a/pkgs/by-name/li/libebur128/package.nix +++ b/pkgs/by-name/li/libebur128/package.nix @@ -28,6 +28,20 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace ebur128/libebur128.pc.cmake \ --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + '' + # Fix the build with CMake 4. + # + # See: + # + # * + # * + + '' + for file in CMakeLists.txt test/CMakeLists.txt; do + substituteInPlace "$file" \ + --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.12' \ + 'cmake_minimum_required(VERSION 3.10' + done ''; meta = with lib; { diff --git a/pkgs/by-name/li/libff/package.nix b/pkgs/by-name/li/libff/package.nix index da6ee91db8070..6aee73ce3b69e 100644 --- a/pkgs/by-name/li/libff/package.nix +++ b/pkgs/by-name/li/libff/package.nix @@ -29,7 +29,10 @@ stdenv.mkDerivation rec { "-DUSE_ASM=OFF" ]; - postPatch = lib.optionalString (!enableStatic) '' + postPatch = '' + substituteInPlace CMakeLists.txt --replace "VERSION 2.8" "VERSION 3.10" + '' + + lib.optionalString (!enableStatic) '' substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED" ''; diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix index 19af33a686ad4..9296282389895 100644 --- a/pkgs/by-name/li/libgcrypt/package.nix +++ b/pkgs/by-name/li/libgcrypt/package.nix @@ -17,11 +17,11 @@ assert enableCapabilities -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - hash = "sha256-JOkckSOkbFToNx86OiUC8RmPKJP7+/Wa+VvBwhSZsA4="; + hash = "sha256-a6Wd0ZInDowdIt20GgfZXc28Hw+wLQPEtUsjWBQzCqw="; }; outputs = [ diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix index 0d5e976c27ff9..2ac0eb645df04 100644 --- a/pkgs/by-name/li/libheif/package.nix +++ b/pkgs/by-name/li/libheif/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.19.8"; + version = "1.20.2"; outputs = [ "bin" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - hash = "sha256-p+VkIJrX/aN2ohSiDmev+6fbS9Lc7Jh14YwW5vLIjJw="; + hash = "sha256-PVfdX3/Oe3DXpYU5WMnCSi2p9X4fPszq2X3uuyh8RVU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix index e287ee6cdcd2d..18b8779ad7d30 100644 --- a/pkgs/by-name/li/libid3tag/package.nix +++ b/pkgs/by-name/li/libid3tag/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitea, + fetchpatch, cmake, gperf, zlib, @@ -24,6 +25,15 @@ stdenv.mkDerivation rec { hash = "sha256-6/49rk7pmIpJRj32WmxC171NtdIOaMNhX8RD7o6Jbzs="; }; + patches = [ + # Fix the build with CMake 4. + (fetchpatch { + name = "libid3tag-fix-cmake-4.patch"; + url = "https://codeberg.org/tenacityteam/libid3tag/commit/eee94b22508a066f7b9bc1ae05d2d85982e73959.patch"; + hash = "sha256-OAdMapNr8qpvXZqNOZ3LUHQ1H79zD1rvzrVksqmz6dU="; + }) + ]; + postPatch = '' substituteInPlace packaging/id3tag.pc.in \ --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" diff --git a/pkgs/by-name/li/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock index ff75c4e1d8edf..eaed4b693bfe0 100644 --- a/pkgs/by-name/li/libimagequant/Cargo.lock +++ b/pkgs/by-name/li/libimagequant/Cargo.lock @@ -101,7 +101,7 @@ dependencies = [ [[package]] name = "imagequant" -version = "4.3.4" +version = "4.4.0" dependencies = [ "arrayvec", "lodepng", @@ -113,7 +113,7 @@ dependencies = [ [[package]] name = "imagequant-sys" -version = "4.0.4" +version = "4.1.0" dependencies = [ "bitflags", "imagequant", diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix index b9a4acaf44fe1..10be02e685e6a 100644 --- a/pkgs/by-name/li/libimagequant/package.nix +++ b/pkgs/by-name/li/libimagequant/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.3.4"; + version = "4.4.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "libimagequant"; rev = version; - hash = "sha256-2P8FiRfOuCHxJrB+rnDDOFsrFjPv5GMBK/5sq7eb32w="; + hash = "sha256-c9j0wVwTWtNrPy9UUsc0Gxbe6lP82C3DMXe+k/ZBYEw="; }; cargoLock = { diff --git a/pkgs/by-name/li/libipt/package.nix b/pkgs/by-name/li/libipt/package.nix index 33e01b9d7a838..022f765c09540 100644 --- a/pkgs/by-name/li/libipt/package.nix +++ b/pkgs/by-name/li/libipt/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, freebsd, }: @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-rO2Mf2/BfKlPh1wHe0qTuyQAyqpSB/j3Q+JWpNDyNm0="; }; + patches = [ + (fetchpatch { + name = "libipt-fix-cmake-4.patch"; + url = "https://github.com/intel/libipt/commit/fa7d42de25be526da532284cc8b771fdeb384f81.patch"; + hash = "sha256-/jTyoGyKw29Nu27bAXmStpjOdTeGdQYpEX2rb29vSSQ="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD freebsd.libstdthreads; diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix index 1499c1378e83e..e30ee22edbd5e 100644 --- a/pkgs/by-name/li/libjpeg_turbo/package.nix +++ b/pkgs/by-name/li/libjpeg_turbo/package.nix @@ -32,13 +32,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both stdenv.mkDerivation (finalAttrs: { pname = "libjpeg-turbo"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; tag = finalAttrs.version; - hash = "sha256-yGCMtAa0IjyeSBv3HxCQfYDSbNSbscj3choU6D2dlp8="; + hash = "sha256-tmeWLJxieV42f9ljSpKJoLER4QOYQLsLFC7jW54YZAk="; }; patches = @@ -111,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libjpeg-turbo.org/"; description = "Faster (using SIMD) libjpeg implementation"; license = lib.licenses.ijg; # and some parts under other BSD-style licenses + changelog = "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/${finalAttrs.version}"; pkgConfigModules = [ "libjpeg" "libturbojpeg" diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix index b1154d5bc69b5..af5041e2ca5bd 100644 --- a/pkgs/by-name/li/libjxl/package.nix +++ b/pkgs/by-name/li/libjxl/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, brotli, cmake, giflib, @@ -139,6 +140,17 @@ stdenv.mkDerivation rec { rm -rf third_party/!(sjpeg)/ shopt -u extglob + # Fix the build with CMake 4. + # + # See: + # + # * + # * + substituteInPlace third_party/sjpeg/CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.7)' \ + 'cmake_minimum_required(VERSION 3.5...3.10)' + substituteInPlace plugins/gdk-pixbuf/jxl.thumbnailer \ --replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl" substituteInPlace CMakeLists.txt \ diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix index 31e68c17dd7c4..83c66c1bd5780 100644 --- a/pkgs/by-name/li/libloot/package.nix +++ b/pkgs/by-name/li/libloot/package.nix @@ -14,11 +14,11 @@ python3Packages, boost, - fmt_11, + fmt, gtest, icu, spdlog, - tbb_2022, + onetbb, }: stdenv.mkDerivation (finalAttrs: { @@ -65,11 +65,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - fmt_11 + fmt gtest icu - (spdlog.override { fmt = fmt_11; }) - tbb_2022 + spdlog + onetbb finalAttrs.passthru.libloadorder finalAttrs.passthru.esplugin diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index 7b17f8d312fcc..55645cd648dbf 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -3,7 +3,7 @@ lib, stdenv, cmake, - fmt_11, + fmt, spdlog, tl-expected, nlohmann_json, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - fmt_11 + fmt spdlog tl-expected nlohmann_json diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix index 8de6786dfa649..70d8eff99a4df 100644 --- a/pkgs/by-name/li/libmatroska/package.nix +++ b/pkgs/by-name/li/libmatroska/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, libebml, nix-update-script, @@ -27,6 +28,14 @@ stdenv.mkDerivation rec { hash = "sha256-hfu3Q1lIyMlWFWUM2Pu70Hie0rlQmua7Kq8kSIWnfHE="; }; + patches = [ + (fetchpatch { + name = "libmatroska-fix-cmake-4.patch"; + url = "https://github.com/Matroska-Org/libmatroska/commit/dc80e194e93e6f0e25c8ad3e015d83aca2a99e10.patch"; + hash = "sha256-2dKRJ6z5rOrLJ5agvXQ6k8TPi5rTMA3H1wCO2F5tBbc="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix index f4277216bd575..20b43867566d1 100644 --- a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix +++ b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { hash = "sha256-NqfJPUoQ0doqLmY2dVnZF0GqDwNivArpQxcc8XcfZhU="; }; + postPatch = '' + sed '/^cmake_minimum_required/Is/VERSION [0-9]\.[0-9]/VERSION 3.5/' \ + -i ./cdk/extra/protobuf/CMakeLists.txt \ + -i ./cdk/extra/lz4/CMakeLists.txt \ + -i ./cdk/extra/zstd/CMakeLists.txt + ''; + nativeBuildInputs = [ cmake mysql80 diff --git a/pkgs/by-name/li/libnoise/package.nix b/pkgs/by-name/li/libnoise/package.nix index c71de90dabb1e..14f847fd59005 100644 --- a/pkgs/by-name/li/libnoise/package.nix +++ b/pkgs/by-name/li/libnoise/package.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-coazd4yedH69b+TOSTFV1CEzN0ezjoGyOaYR9QBhp2E="; }; + # cmake 4 compatibility + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix index 2eece1e4d8a34..599b70009c178 100644 --- a/pkgs/by-name/li/libopenmpt/package.nix +++ b/pkgs/by-name/li/libopenmpt/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.8.2"; + version = "0.8.3"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-hE5P+Y29mUK75KEEgib5H4vFtGC3vsZInmfO2z4KrDc="; + hash = "sha256-JdSGpNqXKIGSdO0JWf15ocY1iVRxDVTBQEfGRXyMqKw="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix index c00c819de5282..c317887a65b90 100644 --- a/pkgs/by-name/li/liboqs/package.nix +++ b/pkgs/by-name/li/liboqs/package.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation (finalAttrs: { "-DOQS_BUILD_ONLY_LIB=ON" ]; - dontFixCmake = true; # fix CMake file will give an error - outputs = [ "out" "dev" diff --git a/pkgs/by-name/li/libproxy/hardcode-gsettings.patch b/pkgs/by-name/li/libproxy/hardcode-gsettings.patch index f3c8f3c61e8b3..d535bf4bfa93e 100644 --- a/pkgs/by-name/li/libproxy/hardcode-gsettings.patch +++ b/pkgs/by-name/li/libproxy/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c -index 6d9bc65..7566c6d 100644 +index d4cea85..9940761 100644 --- a/src/backend/plugins/config-gnome/config-gnome.c +++ b/src/backend/plugins/config-gnome/config-gnome.c -@@ -85,11 +85,60 @@ px_config_gnome_init (PxConfigGnome *self) +@@ -86,11 +86,60 @@ px_config_gnome_init (PxConfigGnome *self) if (!self->available) return; @@ -69,7 +69,7 @@ index 6d9bc65..7566c6d 100644 static void diff --git a/tests/config-gnome-test.c b/tests/config-gnome-test.c -index 315ef1b..1ede670 100644 +index f1cde61..a046208 100644 --- a/tests/config-gnome-test.c +++ b/tests/config-gnome-test.c @@ -60,11 +60,60 @@ static void diff --git a/pkgs/by-name/li/libproxy/package.nix b/pkgs/by-name/li/libproxy/package.nix index f9a6dda577d27..f0f9985a85a39 100644 --- a/pkgs/by-name/li/libproxy/package.nix +++ b/pkgs/by-name/li/libproxy/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libproxy"; - version = "0.5.10"; + version = "0.5.11"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libproxy"; repo = "libproxy"; rev = finalAttrs.version; - hash = "sha256-40GcyH4Oe9xQh9kXe8HohigtCGmIgqFmSV6/j9yolV4="; + hash = "sha256-CSI6GrTDBoYR6RFAQvgNjwzkMk8oXatEMpsv5FYB5eE="; }; patches = [ diff --git a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix index caff75ff35b1d..3bed42f3d3244 100644 --- a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix +++ b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/client"; + # cmake 4 compatibility + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ qt6.qtbase ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix index 3fd49e8885d42..fde58ccc80a48 100644 --- a/pkgs/by-name/li/librsvg/package.nix +++ b/pkgs/by-name/li/librsvg/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.60.0"; + version = "2.61.1"; outputs = [ "out" @@ -61,13 +61,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-C2/8zfbnCvyYdogvXSzp/88scTy6rxrZAXDap1Lh7sM="; + hash = "sha256-vBu81BkSCwmNsovqVTNdneJHDU5qn27pcge0EPwVhn0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-DMkYsskjw6ARQsaHDRautT0oy8VqW/BJBfBVErxUe88="; + hash = "sha256-3DAFyY7uNB5cP8ry28v12QsFdxHtpr1nyLtzhojBq7c="; dontConfigure = true; }; diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index 563f7ed66f67e..233d65da68de0 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -13,7 +13,6 @@ libgcrypt, perl, pkg-config, - unittest-cpp, xa, }: @@ -53,8 +52,6 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt ]; - checkInputs = [ unittest-cpp ]; - enableParallelBuilding = true; configureFlags = [ diff --git a/pkgs/by-name/li/libsoundio/package.nix b/pkgs/by-name/li/libsoundio/package.nix index b7c1167cd72cc..cfc5a6292000f 100644 --- a/pkgs/by-name/li/libsoundio/package.nix +++ b/pkgs/by-name/li/libsoundio/package.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x"; }; + # cmake 4 compatibility + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/by-name/li/libspatialaudio/package.nix b/pkgs/by-name/li/libspatialaudio/package.nix index ef7275e2076e0..d3ff33fb2eab3 100644 --- a/pkgs/by-name/li/libspatialaudio/package.nix +++ b/pkgs/by-name/li/libspatialaudio/package.nix @@ -3,6 +3,7 @@ stdenv, cmake, fetchFromGitHub, + fetchpatch, libmysofa, zlib, }: @@ -18,6 +19,16 @@ stdenv.mkDerivation rec { hash = "sha256-sPnQPD41AceXM4uGqWXMYhuQv0TUkA6TZP8ChxUFIoI="; }; + # Fix the build with CMake 4. + # + # See: + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 3.1)' \ + 'cmake_minimum_required(VERSION 3.5)' + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ libmysofa @@ -33,7 +44,7 @@ stdenv.mkDerivation rec { description = "Ambisonic encoding / decoding and binauralization library in C++"; homepage = "https://github.com/videolabs/libspatialaudio"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ krav ]; }; } diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix index ed4aedfd29650..99b19b71e871e 100644 --- a/pkgs/by-name/li/libssh/package.nix +++ b/pkgs/by-name/li/libssh/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.11.2"; + version = "0.11.3"; src = fetchurl { url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz"; - hash = "sha256-aVKfwY9bYB8Lrw5aRQGivCbfXi8Rb1+PB/Gfr6ptBOc="; + hash = "sha256-fYoTYbsJTsP1EZZOeKWk26aJtZhuESr6vk9NDWxhJcM="; }; outputs = [ diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 77c4ab63d1bfc..7bbb163283448 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, nix-update-script, cmake, @@ -39,42 +38,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtiff"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; rev = "v${finalAttrs.version}"; - hash = "sha256-SuK9/a6OUAumEe1kz1itFJGKxJzbmHkBVLMnyXhIwmQ="; + hash = "sha256-UiC6s86i7UavW86EKm74oPVlEacvoKmwW7KETjpnNaI="; }; patches = [ - # Fix test_directory test on big-endian - # https://gitlab.com/libtiff/libtiff/-/issues/652 - (fetchpatch { - name = "0001-Update-test_directory-not-to-fail-on-big-endian-machines"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/e8233c42f2e0a0ea7260c3cc7ebbaec8e5cb5e07.patch"; - hash = "sha256-z5odG66j4U+WoUjTUuBIhcVUCGK1GYdvW/cVucawNZI="; - }) - # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch - (fetchpatch { - name = "CVE-2024-13978_1.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/7be20ccaab97455f192de0ac561ceda7cd9e12d1.patch"; - hash = "sha256-cpsQyIvyP6LkGeQTlLX73iNd1AcPkvZ6Xqfns7G3JBc="; - }) - (fetchpatch { - name = "CVE-2024-13978_2.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/2ebfffb0e8836bfb1cd7d85c059cd285c59761a4.patch"; - hash = "sha256-cZlLTeB7/nvylf5SLzKF7g91aBERhZxpV5fmWEJVrX4="; - }) - (fetchpatch { - name = "CVE-2025-9165.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/ed141286a37f6e5ddafb5069347ff5d587e7a4e0.patch"; - hash = "sha256-DIsk8trbHMMTrj6jP5Ae8ciRjHV4CPHdWCN+VbeFnFo="; - }) ]; postPatch = '' diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix index 1c18d91862d1b..b20425cebfd8d 100644 --- a/pkgs/by-name/li/libtirpc/package.nix +++ b/pkgs/by-name/li/libtirpc/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libtirpc"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${ lib.replaceStrings [ "." ] [ "-" ] version };sf=tgz"; - hash = "sha256-pTUfqnfHOQKCV0svKF/lo4hq1GlD/+YFjXP2CNygx9I="; + hash = "sha256-VGftEr3xzCp8O3oqCjIZozlq599gxN5IsHBRaG37GP4="; name = "${pname}-${version}.tar.gz"; }; diff --git a/pkgs/by-name/li/libuchardet/package.nix b/pkgs/by-name/li/libuchardet/package.nix index 321a1d0425763..b2645715dced3 100644 --- a/pkgs/by-name/li/libuchardet/package.nix +++ b/pkgs/by-name/li/libuchardet/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, cmake, }: @@ -21,6 +22,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-6Xpgz8AKHBR6Z0sJe7FCKr2fp4otnOPz/cwueKNKxfA="; }; + patches = [ + # Fix the build with CMake 4. + (fetchpatch { + name = "uchardet-cmake-4.patch"; + url = "https://gitlab.freedesktop.org/uchardet/uchardet/-/commit/6e163c978a7c13a6d3ff64a1e3dd4ba81d2d9e09.patch"; + hash = "sha256-WXIQEoIpT7b5vELAfQJFEt2hiYrlnGCjV7ILCmd9kqY="; + }) + ]; + nativeBuildInputs = [ cmake ]; doCheck = !stdenv.hostPlatform.isi686; # tests fail on i686 diff --git a/pkgs/by-name/li/libuecc/package.nix b/pkgs/by-name/li/libuecc/package.nix index eebb0f2a01c4c..becafcf39c36e 100644 --- a/pkgs/by-name/li/libuecc/package.nix +++ b/pkgs/by-name/li/libuecc/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchgit, + fetchpatch, cmake, }: @@ -15,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs"; }; + patches = [ + # Backport CMake 4 support + (fetchpatch { + url = "https://github.com/neocturne/libuecc/commit/b3812bf5ab1777193c4b85863311c33997d141f9.patch"; + hash = "sha256-3h+LC5JlSXNiJlEQxSQzC7+5s+nMp+ll2NQQC5HzTf0="; + }) + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/by-name/li/libuvc/package.nix b/pkgs/by-name/li/libuvc/package.nix index 2d8a991914711..720105974359e 100644 --- a/pkgs/by-name/li/libuvc/package.nix +++ b/pkgs/by-name/li/libuvc/package.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation { sha256 = "0kranb0x1k5qad8rwxnn1w9963sbfj2cfzdgpfmlivb04544m2j7"; }; + # Upstream doesn't yet support CMake 4, remove once fixed + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.5)" + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix index 85e83d0b04606..b4c94caccdbbd 100644 --- a/pkgs/by-name/li/libvncserver/package.nix +++ b/pkgs/by-name/li/libvncserver/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, libjpeg, openssl, @@ -34,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # fix generated pkg-config files ./pkgconfig.patch + + (fetchpatch { + name = "libvncserver-fix-cmake-4.patch"; + url = "https://github.com/LibVNC/libvncserver/commit/e64fa928170f22a2e21b5bbd6d46c8f8e7dd7a96.patch"; + hash = "sha256-AAZ3H34+nLqQggb/sNSx2gIGK96m4zatHX3wpyjNLOA="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix index 928764569233c..5e5b1d3dda89c 100644 --- a/pkgs/by-name/li/libwebsockets/package.nix +++ b/pkgs/by-name/li/libwebsockets/package.nix @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { hash = "sha256-KOAhIVn4G5u0A1TE75Xv7iYO3/i8foqWYecH0kJHdBM="; }; + # Updating to 4.4.1 would bring some errors, and the patch doesn't apply cleanly + # https://github.com/warmcat/libwebsockets/commit/47efb8c1c2371fa309f85a32984e99b2cc1d614a + postPatch = '' + for f in $(find . -name CMakeLists.txt); do + sed '/^cmake_minimum_required/Is/VERSION [0-9]\.[0-9]/VERSION 3.5/' -i "$f" + done + ''; + outputs = [ "out" "dev" diff --git a/pkgs/by-name/li/libxcb-cursor/package.nix b/pkgs/by-name/li/libxcb-cursor/package.nix new file mode 100644 index 0000000000000..8f8a61d6e5d7f --- /dev/null +++ b/pkgs/by-name/li/libxcb-cursor/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + m4, + libxcb, + libxcb-image, + libxcb-render-util, + xorgproto, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxcb-cursor"; + version = "0.1.5"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/xcb-util-cursor-${finalAttrs.version}.tar.xz"; + hash = "sha256-DK+ZsNYJcPgc5Bx7ppTl6q+DMie7LLzbL23JZmpmPFc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + m4 + ]; + + buildInputs = [ + libxcb + libxcb-image + libxcb-render-util + xorgproto + ]; + + propagatedBuildInputs = [ libxcb ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname xcb-util-cursor \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "XCB port of libXcursor"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"; + license = lib.licenses.x11; + maintainers = with lib.maintainers; [ lovek323 ]; + pkgConfigModules = [ "xcb-cursor" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix index f611cae060d9d..868c2dbb9d7d9 100644 --- a/pkgs/by-name/li/libxmlb/package.nix +++ b/pkgs/by-name/li/libxmlb/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.23"; + version = "0.3.24"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - hash = "sha256-hdF1yce9/ztXVV6BYocPGVAjoxJancID77rnHBJsKmM="; + hash = "sha256-3Yxq0KZMV9GRmNjZ19eIqGq+UJS4PGyVPS6HBcMEbHo="; }; patches = [ diff --git a/pkgs/by-name/li/listres/package.nix b/pkgs/by-name/li/listres/package.nix new file mode 100644 index 0000000000000..b473b29f671f0 --- /dev/null +++ b/pkgs/by-name/li/listres/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libxaw, + libxmu, + xorgproto, + libxt, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "listres"; + version = "1.0.6"; + + src = fetchurl { + url = "mirror://xorg/individual/app/listres-${finalAttrs.version}.tar.xz"; + hash = "sha256-TRxT79abplTyh34Vd+mUx4h0sFEvobBmbP/PRSruQ8o="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libxaw + libxmu + xorgproto + libxt + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Utility to list X resources for a widget written using a toolkit based on libXt"; + homepage = "https://gitlab.freedesktop.org/xorg/app/listres"; + license = lib.licenses.x11; + mainProgram = "listres"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 1c6a8c92341f9..6263363954938 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -12,7 +12,7 @@ rocmSupport ? config.rocmSupport, rocmPackages ? { }, - rocmGpuTargets ? builtins.concatStringsSep ";" rocmPackages.clr.gpuTargets, + rocmGpuTargets ? rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets, openclSupport ? false, clblast, @@ -150,7 +150,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ] ++ optionals rocmSupport [ (cmakeFeature "CMAKE_HIP_COMPILER" "${rocmPackages.clr.hipClangPath}/clang++") - (cmakeFeature "CMAKE_HIP_ARCHITECTURES" rocmGpuTargets) + (cmakeFeature "CMAKE_HIP_ARCHITECTURES" (builtins.concatStringsSep ";" rocmGpuTargets)) ] ++ optionals metalSupport [ (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") diff --git a/pkgs/by-name/lo/lokinet/package.nix b/pkgs/by-name/lo/lokinet/package.nix index 71814f6431be3..84b2008f4eef5 100644 --- a/pkgs/by-name/lo/lokinet/package.nix +++ b/pkgs/by-name/lo/lokinet/package.nix @@ -10,20 +10,12 @@ nlohmann_json, pkg-config, spdlog, - fmt_9, sqlite, systemd, unbound, zeromq, }: -let - # Upstream has received reports of incompatibilities with fmt, and other - # dependencies, see: https://github.com/oxen-io/lokinet/issues/2200. - spdlog' = spdlog.override { - fmt = fmt_9; - }; -in stdenv.mkDerivation rec { pname = "lokinet"; version = "0.9.13"; @@ -55,7 +47,7 @@ stdenv.mkDerivation rec { libuv libsodium nlohmann_json - spdlog' + spdlog sqlite systemd unbound @@ -69,6 +61,10 @@ stdenv.mkDerivation rec { ]; meta = { + # Upstream has received reports of incompatibilities with fmt, and other + # dependencies, see: https://github.com/oxen-io/lokinet/issues/2200. + # But our version of spdlog doesn't support fmt_9 + broken = true; description = "Anonymous, decentralized and IP based overlay network for the internet"; homepage = "https://lokinet.org/"; changelog = "https://github.com/oxen-io/lokinet/releases/tag/v${version}"; diff --git a/pkgs/by-name/lz/lzfse/package.nix b/pkgs/by-name/lz/lzfse/package.nix index ce89b500accd7..9facc49afec3f 100644 --- a/pkgs/by-name/lz/lzfse/package.nix +++ b/pkgs/by-name/lz/lzfse/package.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; + # Fix the build with CMake 4. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.6)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; + meta = { homepage = "https://github.com/lzfse/lzfse"; description = "Reference C implementation of the LZFSE compressor"; diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix index f3182f0b6eda8..c4b854eaa9643 100644 --- a/pkgs/by-name/ma/magma/package.nix +++ b/pkgs/by-name/ma/magma/package.nix @@ -4,6 +4,7 @@ cmake, cudaPackages, cudaSupport ? config.cudaSupport, + fetchpatch, fetchurl, gfortran, gpuTargets ? [ ], # Non-CUDA targets, that is HIP @@ -126,6 +127,15 @@ stdenv.mkDerivation (finalAttrs: { "test" ]; + patches = [ + (fetchpatch { + # [PATCH] Drop CMP0037 to fix cmake 4.0 build error + name = "drop-cmp0037-old.patch"; + url = "https://github.com/icl-utk-edu/magma/commit/2fecaf3f0c811344363f713669c1fe30f6879acd.patch"; + hash = "sha256-Dfzq2gqoLSByCLWV5xvY/lXZeVa/yQ67lDSoIAa9jUU="; + }) + ]; + postPatch = '' # For rocm version script invoked by cmake patchShebangs tools/ @@ -170,6 +180,10 @@ stdenv.mkDerivation (finalAttrs: { ] ); + env.CFLAGS = "-DADD_" + lib.optionalString rocmSupport " -fopenmp"; + env.CXXFLAGS = finalAttrs.env.CFLAGS; + env.FFLAGS = "-DADD_"; + cmakeFlags = [ (strings.cmakeFeature "GPU_TARGET" gpuTargetString) (strings.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport) @@ -179,9 +193,6 @@ stdenv.mkDerivation (finalAttrs: { # otherwise not be set in NVCC_FLAGS or DEVCCFLAGS (which we cannot modify). # See https://github.com/NixOS/nixpkgs/issues/281656#issuecomment-1902931289 (strings.cmakeBool "USE_FORTRAN" true) - (strings.cmakeFeature "CMAKE_C_FLAGS" "-DADD_") - (strings.cmakeFeature "CMAKE_CXX_FLAGS" "-DADD_") - (strings.cmakeFeature "FORTRAN_CONVENTION" "-DADD_") ] ++ lists.optionals cudaSupport [ (strings.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) @@ -192,8 +203,8 @@ stdenv.mkDerivation (finalAttrs: { # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}") - (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc") - (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc") + (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/clang") + (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/clang++") ]; # Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU. diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 10a3dd62ae49c..78a0e727b8813 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -6,7 +6,7 @@ clipper2, gtest, glm, - tbb_2022, + onetbb, python3Packages, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest glm - tbb_2022 + onetbb ]; propagatedBuildInputs = [ clipper2 ]; @@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tbb = tbb_2022; tests = { python = python3Packages.manifold3d; }; diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 1a5a7472b87a4..7defb66efee73 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-VhL4nKXyONXbxriEHta0vCnWY1j82oDOLoxVigaggSc="; + hash = "sha256-dZIcUaHPdXNgzUhSUld2TAKJVfktRahc7OtOwYRlKSQ="; }; - cargoHash = "sha256-Iom4GoTBFJ9P5UQnYF5JbeQeO2Eh1MwKOwbo+PhgtQM="; + cargoHash = "sha256-tmImZOGERNvAI4I8H4nuJAdrMrMyOYza43+SVdyjFNc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix index 7339be6b5e8bd..7df8e2b3955eb 100644 --- a/pkgs/by-name/me/mercurial/package.nix +++ b/pkgs/by-name/me/mercurial/package.nix @@ -34,15 +34,17 @@ let pygit2 pygments setuptools + setuptools-scm + pip ; self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.9.4"; + version = "7.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-fqDoOeyDRSd90Z0HJQtEJhNNxdZoL/iAqGorCbTjjs0="; + hash = "sha256-6NkgyDw4xHXY6XO+YHYKSdw1w3ldZL1oduVq26Yi5cs="; }; format = "other"; @@ -54,7 +56,7 @@ let rustPlatform.fetchCargoVendor { inherit src; name = "mercurial-${version}"; - hash = "sha256-k/K1BupCqnlB++2T7hJxu82yID0jG8HwLNmb2eyx29o="; + hash = "sha256-REMgZ1TiVTDbvT8TCd4EeHfYT/xMJfC4E6weLJFT6Rw="; sourceRoot = "mercurial-${version}/rust"; } else @@ -70,6 +72,8 @@ let gettext installShellFiles setuptools + setuptools-scm + pip ] ++ lib.optionals rustSupport [ rustPlatform.cargoSetupHook diff --git a/pkgs/by-name/me/meshlab-unstable/package.nix b/pkgs/by-name/me/meshlab-unstable/package.nix index 8f298db432015..00468e6a08011 100644 --- a/pkgs/by-name/me/meshlab-unstable/package.nix +++ b/pkgs/by-name/me/meshlab-unstable/package.nix @@ -18,7 +18,7 @@ boost, mpfr, xercesc, - tbb, + onetbb, embree, libigl, corto, @@ -82,7 +82,7 @@ stdenv.mkDerivation { boost mpfr xercesc - tbb + onetbb embree libigl corto diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix index f28060f23ab02..dedae59c8c345 100644 --- a/pkgs/by-name/me/meshlab/package.nix +++ b/pkgs/by-name/me/meshlab/package.nix @@ -18,7 +18,7 @@ boost, mpfr, xercesc, - tbb, + onetbb, embree, vcg, libigl, @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { boost mpfr xercesc - tbb + onetbb embree libigl corto diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index dc7bafcb96246..debc8ee2ff992 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -52,9 +52,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - # Source has a path "session/usr/local/...", don't break references to that - dontFixCmake = true; - nativeBuildInputs = [ cmake makeWrapper diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix index 6e1a0e394e2d1..88e592debefb8 100644 --- a/pkgs/by-name/mi/miriway/package.nix +++ b/pkgs/by-name/mi/miriway/package.nix @@ -33,9 +33,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - # Source has a path "systemd/usr/{libexec,lib}/...", don't break references to that - dontFixCmake = true; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/mi/mirtk/package.nix b/pkgs/by-name/mi/mirtk/package.nix index e1fbd437fef05..04710e107ec51 100644 --- a/pkgs/by-name/mi/mirtk/package.nix +++ b/pkgs/by-name/mi/mirtk/package.nix @@ -10,18 +10,18 @@ fltk, vtk, zlib, - tbb, + onetbb, }: stdenv.mkDerivation { pname = "mirtk"; - version = "unstable-2022-07-22"; + version = "2.0.0-unstable-2025-02-27"; src = fetchFromGitHub { owner = "BioMedIA"; repo = "MIRTK"; - rev = "973ce2fe3f9508dec68892dbf97cca39067aa3d6"; - hash = "sha256-vKgkDrbyGOcbaYlxys1duC8ZNG0Y2nqh3TtSQ06Ox0Q="; + rev = "ef71a176c120447b3f95291901af7af8b4f00544"; + hash = "sha256-77Om/+qApt9AiSYbaPc2QNh+RKcYajobD7VDhvPtf/I="; fetchSubmodules = true; }; @@ -41,6 +41,13 @@ stdenv.mkDerivation { # unclear if specific to Nixpkgs doCheck = false; + postPatch = '' + # Their old `FindTBB` module conflicts with others. + rm CMake/Modules/FindTBB.cmake + substituteInPlace CMake/Modules/CMakeLists.txt \ + --replace-fail '"FindTBB.cmake"' "" + ''; + postInstall = '' install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk ''; @@ -54,7 +61,7 @@ stdenv.mkDerivation { fltk libGLU python3 - tbb + onetbb vtk zlib ]; diff --git a/pkgs/by-name/mm/mmtf-cpp/package.nix b/pkgs/by-name/mm/mmtf-cpp/package.nix index 99f2287a20f26..80e30d7438a91 100644 --- a/pkgs/by-name/mm/mmtf-cpp/package.nix +++ b/pkgs/by-name/mm/mmtf-cpp/package.nix @@ -3,7 +3,7 @@ lib, fetchFromGitHub, cmake, - msgpack, + msgpack-cxx, }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +19,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ msgpack ]; + propagatedBuildInputs = [ msgpack-cxx ]; + + # Fix the build with msgpack-cxx ≥ 6.0. + # + # Upstream is unmaintained and does not plan to fix this; see + # . + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'find_package(msgpack)' 'find_package(msgpack-cxx)' \ + --replace-fail msgpackc msgpack-cxx + ''; meta = with lib; { description = "Library of exchange-correlation functionals with arbitrary-order derivatives"; diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index ebba33550537e..19d73b4ac2f20 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -7,7 +7,7 @@ cmake, mimalloc, ninja, - tbb_2022, + onetbb, zlib, zstd, @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - tbb_2022 + onetbb zlib zstd ] diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index f030fca0be29c..a854164749f20 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -99,7 +99,6 @@ stdenv.mkDerivation (finalAttrs: { "-DQT_LUPDATE_EXECUTABLE=${qt6.qttools.dev}/bin/lupdate" "-DQT_LRELEASE_EXECUTABLE=${qt6.qttools.dev}/bin/lrelease" ]; - dontFixCmake = true; qtWrapperArgs = [ "--prefix" diff --git a/pkgs/by-name/ms/msgpack-cxx/package.nix b/pkgs/by-name/ms/msgpack-cxx/package.nix index aae71ad83ce1d..613ac38e322e5 100644 --- a/pkgs/by-name/ms/msgpack-cxx/package.nix +++ b/pkgs/by-name/ms/msgpack-cxx/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = [ + propagatedBuildInputs = [ boost ]; diff --git a/pkgs/by-name/ms/msgpack/generic.nix b/pkgs/by-name/ms/msgpack/generic.nix deleted file mode 100644 index 0e966b6c63ffb..0000000000000 --- a/pkgs/by-name/ms/msgpack/generic.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - stdenv, - cmake, - version, - src, - patches ? [ ], - ... -}: - -stdenv.mkDerivation { - pname = "msgpack"; - inherit version; - - inherit src patches; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = lib.optional ( - stdenv.hostPlatform != stdenv.buildPlatform - ) "-DMSGPACK_BUILD_EXAMPLES=OFF"; - - meta = with lib; { - description = "MessagePack implementation for C and C++"; - homepage = "https://msgpack.org"; - license = licenses.asl20; - maintainers = with maintainers; [ redbaron ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/by-name/ms/msgpack/package.nix b/pkgs/by-name/ms/msgpack/package.nix deleted file mode 100644 index 24ab0a74a5113..0000000000000 --- a/pkgs/by-name/ms/msgpack/package.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage, fetchFromGitHub, ... }@args: - -callPackage ./generic.nix ( - args - // rec { - version = "3.3.0"; - - src = fetchFromGitHub { - owner = "msgpack"; - repo = "msgpack-c"; - rev = "cpp-${version}"; - sha256 = "02dxgzxlwn8g9ca2j4m0rjvdq1k2iciy6ickj615daz5w8pcjajd"; - }; - } -) diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index 3451f94296151..3acbbe9e1fc2a 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -7,7 +7,7 @@ glfw, glm, spdlog, - cereal_1_3_2, + cereal, python3Packages, }: @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { # non-numerical spdlog - cereal_1_3_2 + cereal glfw ]; diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix index d59930818d716..503ab3da92362 100644 --- a/pkgs/by-name/mu/multimarkdown/package.nix +++ b/pkgs/by-name/mu/multimarkdown/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, perl, pkg-config, @@ -18,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-b6yCn0NFpONI7WwfjDOc0d2nCKMIiUXi+rsnytiNc0Q="; }; + patches = [ + (fetchpatch { + name = "multimarkdown-fix-cmake-4.patch"; + url = "https://github.com/fletcher/MultiMarkdown-6/commit/655c0908155758e7c94858af2fb99dc992709075.patch"; + hash = "sha256-d1b5NcBQDVnbmTvVnPyiTS8aSx/VGgRLHD0nSs+JksI="; + }) + ]; + postPatch = '' patchShebangs tools/enumsToPerl.pl ''; diff --git a/pkgs/by-name/mu/multipass/multipassd.nix b/pkgs/by-name/mu/multipass/multipassd.nix index 332c4ec66e7f3..a2b6fece2e09d 100644 --- a/pkgs/by-name/mu/multipass/multipassd.nix +++ b/pkgs/by-name/mu/multipass/multipassd.nix @@ -6,7 +6,7 @@ cmake, dnsmasq, fetchFromGitHub, - fmt_11, + fmt, git, grpc, gtest, @@ -96,7 +96,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DMULTIPASS_ENABLE_FLUTTER_GUI=false" ]; buildInputs = [ - fmt_11 + fmt grpc gtest libapparmor diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 97a5c42ab113a..4536e8724de07 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -57,17 +57,25 @@ let rev = "13ae6aa2c2f9a7b4266fc2e6116c876237f40477"; hash = "sha256-0fuE0lm9rlAaok2Qe0V1uUrgP4AjMWgp3eTbw8G6PMM="; }; + + patches = [ ]; + + # cmake 4 compatibility, upstream is dead + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)" + ''; }); in stdenv.mkDerivation rec { - version = "1.26.1"; + version = "1.26.8"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - hash = "sha256-vc4BfHdnRMKIsCECl37gN4y0NseN+BJ6I/KB8TYEBv0="; + hash = "sha256-6NJIpmbSOG9KIBTWgLbojeXOn9jIR7DidMvswSTzPMc="; }; patches = [ @@ -276,7 +284,7 @@ stdenv.mkDerivation rec { }; updateScript = gitUpdater { - url = "https://git.ghostscript.com/mupdf.git"; + url = "https://cgit.ghostscript.com/cgi-bin/cgit.cgi/mupdf.git"; ignoredVersions = ".rc.*"; }; }; @@ -284,7 +292,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://mupdf.com"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; - changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; + changelog = "https://cgit.ghostscript.com/cgi-bin/cgit.cgi/mupdf.git/plain/CHANGES?h=refs/tags/${version}"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ fpletz ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index b5e2341283403..01a9af81b1c86 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -13,6 +13,8 @@ fizz, + ctestCheckHook, + gtest, nix-update-script, @@ -20,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.04.21.00"; + version = "2025.09.15.00"; outputs = [ "bin" @@ -32,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-/84smnZ2L1zDmkO1w9VQzVhXKt/S5azQr7Xpr8/dOA4="; + hash = "sha256-ZgzqkR72xtO5VVd2cyMM3vSsUWdW6HEvu9T1sM+cPi8="; }; patches = [ @@ -54,6 +56,10 @@ stdenv.mkDerivation (finalAttrs: { fizz ]; + nativeCheckInputs = [ + ctestCheckHook + ]; + checkInputs = [ gtest ]; @@ -84,41 +90,30 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + dontUseNinjaCheck = true; + postPatch = '' # Make sure the libraries the `tperf` binary uses are installed. printf 'install(TARGETS mvfst_test_utils)\n' >> quic/common/test/CMakeLists.txt printf 'install(TARGETS mvfst_dsr_backend)\n' >> quic/dsr/CMakeLists.txt ''; - checkPhase = '' - runHook preCheck - - ctest -j $NIX_BUILD_CORES --output-on-failure ${ - lib.optionalString stdenv.hostPlatform.isLinux ( - lib.escapeShellArgs [ - "--exclude-regex" - (lib.concatMapStringsSep "|" (test: "^${lib.escapeRegex test}$") [ - "*/QuicClientTransportIntegrationTest.NetworkTest/*" - "*/QuicClientTransportIntegrationTest.FlowControlLimitedTest/*" - "*/QuicClientTransportIntegrationTest.NetworkTestConnected/*" - "*/QuicClientTransportIntegrationTest.SetTransportSettingsAfterStart/*" - "*/QuicClientTransportIntegrationTest.TestZeroRttSuccess/*" - "*/QuicClientTransportIntegrationTest.ZeroRttRetryPacketTest/*" - "*/QuicClientTransportIntegrationTest.NewTokenReceived/*" - "*/QuicClientTransportIntegrationTest.UseNewTokenThenReceiveRetryToken/*" - "*/QuicClientTransportIntegrationTest.TestZeroRttRejection/*" - "*/QuicClientTransportIntegrationTest.TestZeroRttNotAttempted/*" - "*/QuicClientTransportIntegrationTest.TestZeroRttInvalidAppParams/*" - "*/QuicClientTransportIntegrationTest.ChangeEventBase/*" - "*/QuicClientTransportIntegrationTest.ResetClient/*" - "*/QuicClientTransportIntegrationTest.TestStatelessResetToken/*" - ]) - ] - ) - } - - runHook postCheck - ''; + disabledTests = [ + "*/QuicClientTransportIntegrationTest.NetworkTest/*" + "*/QuicClientTransportIntegrationTest.FlowControlLimitedTest/*" + "*/QuicClientTransportIntegrationTest.NetworkTestConnected/*" + "*/QuicClientTransportIntegrationTest.SetTransportSettingsAfterStart/*" + "*/QuicClientTransportIntegrationTest.TestZeroRttSuccess/*" + "*/QuicClientTransportIntegrationTest.ZeroRttRetryPacketTest/*" + "*/QuicClientTransportIntegrationTest.NewTokenReceived/*" + "*/QuicClientTransportIntegrationTest.UseNewTokenThenReceiveRetryToken/*" + "*/QuicClientTransportIntegrationTest.TestZeroRttRejection/*" + "*/QuicClientTransportIntegrationTest.TestZeroRttNotAttempted/*" + "*/QuicClientTransportIntegrationTest.TestZeroRttInvalidAppParams/*" + "*/QuicClientTransportIntegrationTest.ChangeEventBase/*" + "*/QuicClientTransportIntegrationTest.ResetClient/*" + "*/QuicClientTransportIntegrationTest.TestStatelessResetToken/*" + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 9dcf95e287526..b804f38bec7f8 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -11,7 +11,7 @@ pkg-config, python3, sphinx, - tbb_2022, + onetbb, buildPackages, nix-update-script, }: @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { boost capnproto # cmake modules flex # include dir - tbb_2022 + onetbb python3 ]; diff --git a/pkgs/by-name/na/nanoboyadvance/fix-toml11-4.0.patch b/pkgs/by-name/na/nanoboyadvance/fix-toml11-4.0.patch new file mode 100644 index 0000000000000..a430bcf497641 --- /dev/null +++ b/pkgs/by-name/na/nanoboyadvance/fix-toml11-4.0.patch @@ -0,0 +1,381 @@ +From 41aa0b0c81d6e7b604c1646d52d8418ed2d8d99a Mon Sep 17 00:00:00 2001 +From: Emily +Date: Mon, 15 Sep 2025 20:45:57 +0100 +Subject: [PATCH] Platform: Core: Update to toml11 4.4.0 + +Comments are now preserved by default, and the APi gets a bit +simpler. Many Linux distributions have already moved to the new major +version, so this eases packaging. +--- + src/platform/core/CMakeLists.txt | 4 +- + src/platform/core/include/platform/config.hpp | 4 +- + src/platform/core/src/config.cpp | 176 ++++++++---------- + src/platform/qt/src/config.cpp | 88 ++++----- + src/platform/qt/src/config.hpp | 4 +- + 5 files changed, 121 insertions(+), 155 deletions(-) + +diff --git a/src/platform/core/CMakeLists.txt b/src/platform/core/CMakeLists.txt +index ddb4241f..02a97420 100644 +--- a/src/platform/core/CMakeLists.txt ++++ b/src/platform/core/CMakeLists.txt +@@ -35,11 +35,11 @@ glad_add_library(glad_gl_core_33 STATIC + ) + + if(USE_SYSTEM_TOML11) +- find_package(toml11 3.7 REQUIRED) ++ find_package(toml11 4.0 REQUIRED) + else() + FetchContent_Declare(toml11 + GIT_REPOSITORY https://github.com/ToruNiina/toml11.git +- GIT_TAG d4eb5f3c9d8557b3820c80d55c41068839341b27 # v3.8.1 ++ GIT_TAG be08ba2be2a964edcdb3d3e3ea8d100abc26f286 # v4.4.0 + ) + set(toml11_INSTALL OFF CACHE BOOL "" FORCE) + FetchContent_MakeAvailable(toml11) +diff --git a/src/platform/core/include/platform/config.hpp b/src/platform/core/include/platform/config.hpp +index 89c6278a..7b0233d4 100644 +--- a/src/platform/core/include/platform/config.hpp ++++ b/src/platform/core/include/platform/config.hpp +@@ -47,9 +47,7 @@ struct PlatformConfig : Config { + + protected: + virtual void LoadCustomData(toml::value const& data) {} +- virtual void SaveCustomData( +- toml::basic_value& data +- ) {}; ++ virtual void SaveCustomData(toml::value& data) {} + }; + + } // namespace nba +diff --git a/src/platform/core/src/config.cpp b/src/platform/core/src/config.cpp +index be382c94..e6a8e221 100644 +--- a/src/platform/core/src/config.cpp ++++ b/src/platform/core/src/config.cpp +@@ -29,124 +29,108 @@ void PlatformConfig::Load(std::string const& path) { + } + + if(data.contains("general")) { +- auto general_result = toml::expect(data.at("general")); +- +- if(general_result.is_ok()) { +- auto general = general_result.unwrap(); +- this->bios_path = toml::find_or(general, "bios_path", "bios.bin"); +- this->skip_bios = toml::find_or(general, "bios_skip", false); +- this->save_folder = toml::find_or(general, "save_folder", ""); +- } ++ auto general = data.at("general"); ++ this->bios_path = toml::find_or(general, "bios_path", "bios.bin"); ++ this->skip_bios = toml::find_or(general, "bios_skip", false); ++ this->save_folder = toml::find_or(general, "save_folder", ""); + } + + if(data.contains("cartridge")) { +- auto cartridge_result = toml::expect(data.at("cartridge")); +- +- if(cartridge_result.is_ok()) { +- auto cartridge = cartridge_result.unwrap(); +- auto save_type = toml::find_or(cartridge, "save_type", "detect"); +- +- const std::map save_types{ +- { "detect", Config::BackupType::Detect }, +- { "none", Config::BackupType::None }, +- { "sram", Config::BackupType::SRAM }, +- { "flash64", Config::BackupType::FLASH_64 }, +- { "flash128", Config::BackupType::FLASH_128 }, +- { "eeprom512", Config::BackupType::EEPROM_4 }, +- { "eeprom8192", Config::BackupType::EEPROM_64 } +- }; +- +- auto match = save_types.find(save_type); +- +- if(match == save_types.end()) { +- Log("Config: backup type '{0}' is not valid, defaulting to auto-detect.", save_type); +- this->cartridge.backup_type = Config::BackupType::Detect; +- } else { +- this->cartridge.backup_type = match->second; +- } +- +- this->cartridge.force_rtc = toml::find_or(cartridge, "force_rtc", false); +- this->cartridge.force_solar_sensor = toml::find_or(cartridge, "force_solar_sensor", false); +- this->cartridge.solar_sensor_level = toml::find_or(cartridge, "solar_sensor_level", 156); ++ auto cartridge = data.at("cartridge"); ++ auto save_type = toml::find_or(cartridge, "save_type", "detect"); ++ ++ const std::map save_types{ ++ { "detect", Config::BackupType::Detect }, ++ { "none", Config::BackupType::None }, ++ { "sram", Config::BackupType::SRAM }, ++ { "flash64", Config::BackupType::FLASH_64 }, ++ { "flash128", Config::BackupType::FLASH_128 }, ++ { "eeprom512", Config::BackupType::EEPROM_4 }, ++ { "eeprom8192", Config::BackupType::EEPROM_64 } ++ }; ++ ++ auto match = save_types.find(save_type); ++ ++ if(match == save_types.end()) { ++ Log("Config: backup type '{0}' is not valid, defaulting to auto-detect.", save_type); ++ this->cartridge.backup_type = Config::BackupType::Detect; ++ } else { ++ this->cartridge.backup_type = match->second; + } ++ ++ this->cartridge.force_rtc = toml::find_or(cartridge, "force_rtc", false); ++ this->cartridge.force_solar_sensor = toml::find_or(cartridge, "force_solar_sensor", false); ++ this->cartridge.solar_sensor_level = toml::find_or(cartridge, "solar_sensor_level", 156); + } + + if(data.contains("video")) { +- auto video_result = toml::expect(data.at("video")); +- +- if(video_result.is_ok()) { +- auto video = video_result.unwrap(); ++ auto video = data.at("video"); + +- const std::map filters{ +- { "nearest", Video::Filter::Nearest }, +- { "linear", Video::Filter::Linear }, +- { "sharp", Video::Filter::Sharp }, +- { "xbrz", Video::Filter::xBRZ }, +- { "lcd1x", Video::Filter::Lcd1x } +- }; +- +- const std::map color_corrections{ +- { "none", Video::Color::No }, +- { "higan", Video::Color::higan }, +- { "agb", Video::Color::AGB } +- }; +- +- auto filter = toml::find_or(video, "filter", "nearest"); +- auto filter_match = filters.find(filter); +- if(filter_match != filters.end()) { +- this->video.filter = filter_match->second; +- } +- +- auto color_correction = toml::find_or(video, "color_correction", "ags"); +- auto color_correction_match = color_corrections.find(color_correction); +- if(color_correction_match != color_corrections.end()) { +- this->video.color = color_correction_match->second; +- } +- +- this->video.lcd_ghosting = toml::find_or(video, "lcd_ghosting", true); ++ const std::map filters{ ++ { "nearest", Video::Filter::Nearest }, ++ { "linear", Video::Filter::Linear }, ++ { "sharp", Video::Filter::Sharp }, ++ { "xbrz", Video::Filter::xBRZ }, ++ { "lcd1x", Video::Filter::Lcd1x } ++ }; ++ ++ const std::map color_corrections{ ++ { "none", Video::Color::No }, ++ { "higan", Video::Color::higan }, ++ { "agb", Video::Color::AGB } ++ }; ++ ++ auto filter = toml::find_or(video, "filter", "nearest"); ++ auto filter_match = filters.find(filter); ++ if(filter_match != filters.end()) { ++ this->video.filter = filter_match->second; + } ++ ++ auto color_correction = toml::find_or(video, "color_correction", "ags"); ++ auto color_correction_match = color_corrections.find(color_correction); ++ if(color_correction_match != color_corrections.end()) { ++ this->video.color = color_correction_match->second; ++ } ++ ++ this->video.lcd_ghosting = toml::find_or(video, "lcd_ghosting", true); + } + + if(data.contains("audio")) { +- auto audio_result = toml::expect(data.at("audio")); +- +- if(audio_result.is_ok()) { +- auto audio = audio_result.unwrap(); +- auto resampler = toml::find_or(audio, "resampler", "cosine"); +- +- const std::map resamplers{ +- { "cosine", Config::Audio::Interpolation::Cosine }, +- { "cubic", Config::Audio::Interpolation::Cubic }, +- { "sinc64", Config::Audio::Interpolation::Sinc_64 }, +- { "sinc128", Config::Audio::Interpolation::Sinc_128 }, +- { "sinc256", Config::Audio::Interpolation::Sinc_256 } +- }; +- +- auto match = resamplers.find(resampler); +- +- if(match == resamplers.end()) { +- Log("Config: unknown resampling algorithm: {} (defaulting to cosine).", resampler); +- this->audio.interpolation = Config::Audio::Interpolation::Cosine; +- } else { +- this->audio.interpolation = match->second; +- } +- +- this->audio.volume = toml::find_or(audio, "volume", 100); +- this->audio.mp2k_hle_enable = toml::find_or(audio, "mp2k_hle_enable", false); +- this->audio.mp2k_hle_cubic = toml::find_or(audio, "mp2k_hle_cubic", true); +- this->audio.mp2k_hle_force_reverb = toml::find_or(audio, "mp2k_hle_force_reverb", true); ++ auto audio = data.at("audio"); ++ auto resampler = toml::find_or(audio, "resampler", "cosine"); ++ ++ const std::map resamplers{ ++ { "cosine", Config::Audio::Interpolation::Cosine }, ++ { "cubic", Config::Audio::Interpolation::Cubic }, ++ { "sinc64", Config::Audio::Interpolation::Sinc_64 }, ++ { "sinc128", Config::Audio::Interpolation::Sinc_128 }, ++ { "sinc256", Config::Audio::Interpolation::Sinc_256 } ++ }; ++ ++ auto match = resamplers.find(resampler); ++ ++ if(match == resamplers.end()) { ++ Log("Config: unknown resampling algorithm: {} (defaulting to cosine).", resampler); ++ this->audio.interpolation = Config::Audio::Interpolation::Cosine; ++ } else { ++ this->audio.interpolation = match->second; + } ++ ++ this->audio.volume = toml::find_or(audio, "volume", 100); ++ this->audio.mp2k_hle_enable = toml::find_or(audio, "mp2k_hle_enable", false); ++ this->audio.mp2k_hle_cubic = toml::find_or(audio, "mp2k_hle_cubic", true); ++ this->audio.mp2k_hle_force_reverb = toml::find_or(audio, "mp2k_hle_force_reverb", true); + } + + LoadCustomData(data); + } + + void PlatformConfig::Save(std::string const& path) { +- toml::basic_value data; ++ toml::value data; + + if(std::filesystem::exists(path)) { + try { +- data = toml::parse(path); ++ data = toml::parse(path); + } catch (std::exception& ex) { + Log("Config: error while parsing TOML configuration: {0}", ex.what()); + return; +diff --git a/src/platform/qt/src/config.cpp b/src/platform/qt/src/config.cpp +index 7fbc712b..7a658fca 100644 +--- a/src/platform/qt/src/config.cpp ++++ b/src/platform/qt/src/config.cpp +@@ -9,66 +9,52 @@ + + void QtConfig::LoadCustomData(toml::value const& data) { + if(data.contains("input")) { +- auto input_result = toml::expect(data.at("input")); +- +- if(input_result.is_ok()) { +- using Map = Input::Map; +- +- auto input_ = input_result.unwrap(); +- +- input.controller_guid = toml::find_or(input_, "controller_guid", ""); +- input.hold_fast_forward = toml::find_or(input_, "hold_fast_forward", true); +- +- const auto get_map = [&](toml::value const& value, std::string key) { +- return Map::FromArray(toml::find_or>(value, key, {0, -1, -1, -1, 0})); +- }; +- +- input.fast_forward = get_map(input_, "fast_forward"); +- +- if(input_.contains("gba")) { +- auto gba_result = toml::expect(input_.at("gba")); +- +- if(gba_result.is_ok()) { +- auto gba = gba_result.unwrap(); +- +- input.gba[0] = get_map(gba, "a"); +- input.gba[1] = get_map(gba, "b"); +- input.gba[2] = get_map(gba, "select"); +- input.gba[3] = get_map(gba, "start"); +- input.gba[4] = get_map(gba, "right"); +- input.gba[5] = get_map(gba, "left"); +- input.gba[6] = get_map(gba, "up"); +- input.gba[7] = get_map(gba, "down"); +- input.gba[8] = get_map(gba, "r"); +- input.gba[9] = get_map(gba, "l"); +- } +- } ++ using Map = Input::Map; ++ ++ auto input_ = data.at("input"); ++ ++ input.controller_guid = toml::find_or(input_, "controller_guid", ""); ++ input.hold_fast_forward = toml::find_or(input_, "hold_fast_forward", true); ++ ++ const auto get_map = [&](toml::value const& value, std::string key) { ++ return Map::FromArray(toml::find_or>(value, key, {0, -1, -1, -1, 0})); ++ }; ++ ++ input.fast_forward = get_map(input_, "fast_forward"); ++ ++ if(input_.contains("gba")) { ++ auto gba = input_.at("gba"); ++ ++ input.gba[0] = get_map(gba, "a"); ++ input.gba[1] = get_map(gba, "b"); ++ input.gba[2] = get_map(gba, "select"); ++ input.gba[3] = get_map(gba, "start"); ++ input.gba[4] = get_map(gba, "right"); ++ input.gba[5] = get_map(gba, "left"); ++ input.gba[6] = get_map(gba, "up"); ++ input.gba[7] = get_map(gba, "down"); ++ input.gba[8] = get_map(gba, "r"); ++ input.gba[9] = get_map(gba, "l"); + } + } + + if(data.contains("window")) { +- auto window_result = toml::expect(data.at("window")); +- +- if(window_result.is_ok()) { +- auto window_ = window_result.unwrap(); +- +- window.scale = toml::find_or(window_, "scale", 2); +- window.maximum_scale = toml::find_or(window_, "maximum_scale", 0); +- window.fullscreen = toml::find_or(window_, "fullscreen", false); +- window.fullscreen_show_menu = toml::find_or(window_, "fullscreen_show_menu", false); +- window.lock_aspect_ratio = toml::find_or(window_, "lock_aspect_ratio", true); +- window.use_integer_scaling = toml::find_or(window_, "use_integer_scaling", false); +- window.show_fps = toml::find_or(window_, "show_fps", false); +- window.pause_emulator_when_inactive = toml::find_or(window_, "pause_emulator_when_inactive", true); +- } ++ auto window_ = data.at("window"); ++ ++ window.scale = toml::find_or(window_, "scale", 2); ++ window.maximum_scale = toml::find_or(window_, "maximum_scale", 0); ++ window.fullscreen = toml::find_or(window_, "fullscreen", false); ++ window.fullscreen_show_menu = toml::find_or(window_, "fullscreen_show_menu", false); ++ window.lock_aspect_ratio = toml::find_or(window_, "lock_aspect_ratio", true); ++ window.use_integer_scaling = toml::find_or(window_, "use_integer_scaling", false); ++ window.show_fps = toml::find_or(window_, "show_fps", false); ++ window.pause_emulator_when_inactive = toml::find_or(window_, "pause_emulator_when_inactive", true); + } + + recent_files = toml::find_or>(data, "recent_files", {}); + } + +-void QtConfig::SaveCustomData( +- toml::basic_value& data +-) { ++void QtConfig::SaveCustomData(toml::value& data) { + data["input"]["controller_guid"] = input.controller_guid; + data["input"]["fast_forward"] = input.fast_forward.Array(); + data["input"]["hold_fast_forward"] = input.hold_fast_forward; +diff --git a/src/platform/qt/src/config.hpp b/src/platform/qt/src/config.hpp +index 91af8291..b305bf79 100644 +--- a/src/platform/qt/src/config.hpp ++++ b/src/platform/qt/src/config.hpp +@@ -117,9 +117,7 @@ struct QtConfig final : nba::PlatformConfig { + protected: + void LoadCustomData(toml::value const& data) override; + +- void SaveCustomData( +- toml::basic_value& data +- ) override; ++ void SaveCustomData(toml::value& data) override; + + private: + auto GetConfigPath() const -> std::string { diff --git a/pkgs/by-name/na/nanoboyadvance/package.nix b/pkgs/by-name/na/nanoboyadvance/package.nix index c5c3abcb7686b..dc23f2c877ffb 100644 --- a/pkgs/by-name/na/nanoboyadvance/package.nix +++ b/pkgs/by-name/na/nanoboyadvance/package.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IH2X0B3HwEG0/wvKacLVPBQad14W0HBy5VFHjk8vgJk="; }; + patches = [ + # + ./fix-toml11-4.0.patch + ]; + nativeBuildInputs = [ cmake python3Packages.jinja2 diff --git a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix index 84bd4936ad786..611204838fc0e 100644 --- a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix @@ -5,9 +5,9 @@ fetchFromGitHub, cmake, doxygen, - msgpack, + msgpack-c, neovim, - python3Packages, + python3, }: stdenv.mkDerivation (finalAttrs: { @@ -30,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: { cmake doxygen libsForQt5.wrapQtAppsHook + (python3.withPackages (ps: [ + ps.jinja2 + ps.msgpack + ])) ]; buildInputs = [ neovim.unwrapped # only used to generate help tags at build time libsForQt5.qtbase libsForQt5.qtsvg - ] - ++ (with python3Packages; [ - jinja2 - python - msgpack - ]); + msgpack-c + ]; preCheck = '' # The GUI tests require a running X server, disable them diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 3b9debb93967e..23ab00db9754a 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -113,8 +113,6 @@ stdenv.mkDerivation ( ./system_rplugin_manifest.patch ]; - dontFixCmake = true; - inherit lua; treesitter-parsers = treesitter-parsers diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index 6163536434a34..a3a62ffa0e5c4 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -18,7 +18,6 @@ enableHttp3 ? false, ngtcp2, nghttp3, - quictls, enableJemalloc ? false, jemalloc, enablePython ? false, @@ -46,11 +45,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.66.0"; + version = "1.67.1"; src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - hash = "sha256-HUhK03NU35/KuXCBTpOl3KkaUyVug/T1jdcxGcYyEBc="; + hash = "sha256-37cg1CQ6eVBYn6JjI3i+te6a1ELpS3lLO44soowdfio="; }; outputs = [ @@ -68,15 +67,14 @@ stdenv.mkDerivation rec { c-aresMinimal libev zlib + openssl ] - ++ lib.optionals (enableApp && !enableHttp3) [ openssl ] ++ lib.optionals enableGetAssets [ libxml2 ] ++ lib.optionals enableHpack [ jansson ] ++ lib.optionals enableJemalloc [ jemalloc ] ++ lib.optionals enableHttp3 [ ngtcp2 nghttp3 - quictls ] ++ lib.optionals enablePython [ python3 ]; diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix index b1127feff371f..3b9b0098765a7 100644 --- a/pkgs/by-name/ng/nghttp3/package.nix +++ b/pkgs/by-name/ng/nghttp3/package.nix @@ -1,21 +1,18 @@ { lib, stdenv, - fetchFromGitHub, + fetchurl, cmake, - curlHTTP3, + curl, }: stdenv.mkDerivation (finalAttrs: { pname = "nghttp3"; version = "1.11.0"; - src = fetchFromGitHub { - owner = "ngtcp2"; - repo = "nghttp3"; - tag = "v${finalAttrs.version}"; - hash = "sha256-8WQfXzzF3K0IJNectrE1amQ6Njq4pZslrcVun6Uhi6E="; - fetchSubmodules = true; + src = fetchurl { + url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2"; + hash = "sha256-AAKlyoVtsFmqbcac9zL7sA2aHnPteISPXUjyYh8gyoo="; }; outputs = [ @@ -26,19 +23,26 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - (lib.cmakeBool "ENABLE_STATIC_LIB" false) - ]; + cmakeFlags = + if stdenv.hostPlatform.isStatic then + [ + (lib.cmakeBool "ENABLE_SHARED_LIB" false) + (lib.cmakeBool "ENABLE_STATIC_LIB" true) + ] + else + [ + (lib.cmakeBool "ENABLE_STATIC_LIB" false) + ]; doCheck = true; passthru.tests = { - inherit curlHTTP3; + inherit curl; }; meta = { homepage = "https://github.com/ngtcp2/nghttp3"; - changelog = "https://github.com/ngtcp2/nghttp3/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/ngtcp2/nghttp3/releases/tag/v${finalAttrs.version}"; description = "Implementation of HTTP/3 mapping over QUIC and QPACK in C"; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ni/ninja/0001-spawn-sh-instead-of-bin-sh.patch b/pkgs/by-name/ni/ninja/0001-spawn-sh-instead-of-bin-sh.patch new file mode 100644 index 0000000000000..452f4deb69f44 --- /dev/null +++ b/pkgs/by-name/ni/ninja/0001-spawn-sh-instead-of-bin-sh.patch @@ -0,0 +1,27 @@ +From cf438f7a3ab2e70b06ec12653d1111e35084733f Mon Sep 17 00:00:00 2001 +From: Max +Date: Fri, 8 Aug 2025 18:20:48 +0200 +Subject: [PATCH] spawn sh instead of /bin/sh + +--- + src/subprocess-posix.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/subprocess-posix.cc b/src/subprocess-posix.cc +index 0e62b3b..c1c31aa 100644 +--- a/src/subprocess-posix.cc ++++ b/src/subprocess-posix.cc +@@ -129,8 +129,8 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) { + if (err != 0) + Fatal("posix_spawnattr_setflags: %s", strerror(err)); + +- const char* spawned_args[] = { "/bin/sh", "-c", command.c_str(), NULL }; +- err = posix_spawn(&pid_, "/bin/sh", &action, &attr, ++ const char* spawned_args[] = { "sh", "-c", command.c_str(), NULL }; ++ err = posix_spawnp(&pid_, "sh", &action, &attr, + const_cast(spawned_args), environ); + if (err != 0) + Fatal("posix_spawn: %s", strerror(err)); +-- +2.50.1 + diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix index 2be38addad58a..b2d143cbc63de 100644 --- a/pkgs/by-name/ni/ninja/package.nix +++ b/pkgs/by-name/ni/ninja/package.nix @@ -52,8 +52,11 @@ stdenv.mkDerivation (finalAttrs: { libxslt.bin ]; + patches = [ + ./0001-spawn-sh-instead-of-bin-sh.patch + ] # TODO: remove together with ninja 1.11 - patches = lib.optionals (lib.versionOlder finalAttrs.version "1.12") [ + ++ lib.optionals (lib.versionOlder finalAttrs.version "1.12") [ (fetchpatch { name = "ninja1.11-python3.13-compat.patch"; url = "https://github.com/ninja-build/ninja/commit/9cf13cd1ecb7ae649394f4133d121a01e191560b.patch"; diff --git a/pkgs/by-name/ni/nix-serve/package.nix b/pkgs/by-name/ni/nix-serve/package.nix index 943b3f76f863d..0f7d81484843b 100644 --- a/pkgs/by-name/ni/nix-serve/package.nix +++ b/pkgs/by-name/ni/nix-serve/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, bzip2, nix, + perl, makeWrapper, nixosTests, }: @@ -11,6 +12,7 @@ let rev = "a7e046db4b29d422fc9aac60ea6b82b31399951a"; sha256 = "sha256-6ZQ0OLijq6UtOtUqRdFC19+helhU0Av6MvGCZf6XmcQ="; + inherit (nix.libs) nix-perl-bindings; in stdenv.mkDerivation { @@ -31,11 +33,11 @@ stdenv.mkDerivation { install -Dm0755 nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi makeWrapper ${ - nix.perl-bindings.perl.withPackages (p: [ + perl.withPackages (p: [ p.DBDSQLite p.Plack p.Starman - nix.perl-bindings + nix-perl-bindings ]) }/bin/starman $out/bin/nix-serve \ --prefix PATH : "${ diff --git a/pkgs/by-name/nl/nlohmann_json/make-tests-build-clang-19.diff b/pkgs/by-name/nl/nlohmann_json/make-tests-build-clang-19.diff deleted file mode 100644 index ceb8692514695..0000000000000 --- a/pkgs/by-name/nl/nlohmann_json/make-tests-build-clang-19.diff +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/tests/src/unit-bson.cpp b/tests/src/unit-bson.cpp -index 13216f2..fdfc350 100644 ---- a/tests/src/unit-bson.cpp -+++ b/tests/src/unit-bson.cpp -@@ -621,7 +621,7 @@ TEST_CASE("BSON input/output_adapters") - { - SECTION("std::ostringstream") - { -- std::basic_ostringstream ss; -+ std::basic_ostringstream ss; - json::to_bson(json_representation, ss); - json j3 = json::from_bson(ss.str()); - CHECK(json_representation == j3); -diff --git a/tests/src/unit-cbor.cpp b/tests/src/unit-cbor.cpp -index be94d2f..2b396b7 100644 ---- a/tests/src/unit-cbor.cpp -+++ b/tests/src/unit-cbor.cpp -@@ -1881,7 +1881,7 @@ TEST_CASE("single CBOR roundtrip") - { - SECTION("std::ostringstream") - { -- std::basic_ostringstream ss; -+ std::basic_ostringstream ss; - json::to_cbor(j1, ss); - json j3 = json::from_cbor(ss.str()); - CHECK(j1 == j3); -diff --git a/tests/src/unit-deserialization.cpp b/tests/src/unit-deserialization.cpp -index 3bc161f..e4918b0 100644 ---- a/tests/src/unit-deserialization.cpp -+++ b/tests/src/unit-deserialization.cpp -@@ -1131,13 +1131,11 @@ TEST_CASE("deserialization") - } - } - -+ - TEST_CASE_TEMPLATE("deserialization of different character types (ASCII)", T, -- char, unsigned char, signed char, -+ char, - wchar_t, -- char16_t, char32_t, -- std::uint8_t, std::int8_t, -- std::int16_t, std::uint16_t, -- std::int32_t, std::uint32_t) -+ char16_t, char32_t) - { - std::vector const v = {'t', 'r', 'u', 'e'}; - CHECK(json::parse(v) == json(true)); -@@ -1163,7 +1161,7 @@ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-8)", T, - } - - TEST_CASE_TEMPLATE("deserialization of different character types (UTF-16)", T, -- char16_t, std::uint16_t) -+ char16_t) - { - // a star emoji - std::vector const v = {static_cast('"'), static_cast(0x2b50), static_cast(0xfe0f), static_cast('"')}; -@@ -1176,7 +1174,7 @@ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-16)", T, - } - - TEST_CASE_TEMPLATE("deserialization of different character types (UTF-32)", T, -- char32_t, std::uint32_t) -+ char32_t) - { - // a star emoji - std::vector const v = {static_cast('"'), static_cast(0x2b50), static_cast(0xfe0f), static_cast('"')}; -diff --git a/tests/src/unit-msgpack.cpp b/tests/src/unit-msgpack.cpp -index 61162af..cfbb1fa 100644 ---- a/tests/src/unit-msgpack.cpp -+++ b/tests/src/unit-msgpack.cpp -@@ -1604,7 +1604,7 @@ TEST_CASE("single MessagePack roundtrip") - { - SECTION("std::ostringstream") - { -- std::basic_ostringstream ss; -+ std::basic_ostringstream ss; - json::to_msgpack(j1, ss); - json j3 = json::from_msgpack(ss.str()); - CHECK(j1 == j3); -diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp -index fab9aae..98947c5 100644 ---- a/tests/src/unit-regression2.cpp -+++ b/tests/src/unit-regression2.cpp -@@ -674,6 +674,7 @@ TEST_CASE("regression tests 2") - CHECK(j.dump() == "{}"); - } - -+#if 0 - #ifdef JSON_HAS_CPP_20 - #if __has_include() - SECTION("issue #2546 - parsing containers of std::byte") -@@ -684,6 +685,7 @@ TEST_CASE("regression tests 2") - CHECK(j.dump() == "\"Hello, world!\""); - } - #endif -+#endif - #endif - - SECTION("issue #2574 - Deserialization to std::array, std::pair, and std::tuple with non-default constructable types fails") diff --git a/pkgs/by-name/nl/nlohmann_json/package.nix b/pkgs/by-name/nl/nlohmann_json/package.nix index 4d07976f30217..e11fa98c83730 100644 --- a/pkgs/by-name/nl/nlohmann_json/package.nix +++ b/pkgs/by-name/nl/nlohmann_json/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, }: let @@ -14,24 +15,30 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nlohmann_json"; - version = "3.11.3"; + version = "3.12.0"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${finalAttrs.version}"; - hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg="; + hash = "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY="; }; - patches = lib.optionals stdenv.cc.isClang [ - # tests fail to compile on clang-19 - # https://github.com/nlohmann/json/issues/4490 - ./make-tests-build-clang-19.diff + patches = lib.optionals stdenv.hostPlatform.isMusl [ + # Musl does not support LC_NUMERIC, causing a test failure. + # Turn the error into a warning to make the test succeed. + # https://github.com/nlohmann/json/pull/4770 + (fetchpatch { + url = "https://github.com/nlohmann/json/commit/0a8b48ac6a89131deaeb0d57047c9462a23b34a2.diff"; + hash = "sha256-gOZfRyDRI6USdUIY+sH7cygPrSIKGIo8AWcjqc/GQNI="; + }) ]; nativeBuildInputs = [ cmake ]; cmakeFlags = [ + # .pc file uses INCLUDEDIR as a relative path + "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DJSON_BuildTests=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DJSON_FastTests=ON" "-DJSON_MultipleHeaders=ON" diff --git a/pkgs/by-name/nu/nunicode/package.nix b/pkgs/by-name/nu/nunicode/package.nix index 0025372fb2eb0..e8afc6c0b768b 100644 --- a/pkgs/by-name/nu/nunicode/package.nix +++ b/pkgs/by-name/nu/nunicode/package.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: { # avoid name-clash on case-insensitive filesystems cmakeBuildDir = "build-dir"; + cmakeFlags = [ + # fix compatibility with CMake (https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html) + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "4.0") + ]; + doCheck = true; checkPhase = '' diff --git a/pkgs/by-name/nu/nuspell/package.nix b/pkgs/by-name/nu/nuspell/package.nix new file mode 100644 index 0000000000000..bff48444c8b80 --- /dev/null +++ b/pkgs/by-name/nu/nuspell/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + callPackage, + fetchFromGitHub, + cmake, + ctestCheckHook, + buildPackages, + pkg-config, + icu, + catch2_3, + testers, + enableManpages ? buildPackages.pandoc.compiler.bootstrapAvailable, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nuspell"; + version = "5.1.6"; + + src = fetchFromGitHub { + owner = "nuspell"; + repo = "nuspell"; + tag = "v${finalAttrs.version}"; + hash = "sha256-U/lHSxpKsBnamf4ikE2aIjEPSU5fxjtuSmhZR0jxMAI="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ] + ++ lib.optional enableManpages buildPackages.pandoc; + + strictDeps = true; + buildInputs = [ catch2_3 ]; + + propagatedBuildInputs = [ icu ]; + + cmakeFlags = lib.optional (!enableManpages) "-DBUILD_DOCS=OFF"; + + nativeCheckInputs = [ + ctestCheckHook + ]; + + doCheck = true; + + outputs = [ + "out" + "lib" + "dev" + ]; + + passthru = { + withDicts = callPackage ./wrapper.nix { nuspell = finalAttrs.finalPackage; }; + + tests = { + wrapper = testers.testVersion { + package = finalAttrs.finalPackage.withDicts (d: [ d.en_US ]); + }; + + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + cmake = testers.hasCmakeConfigModules { + moduleNames = [ "Nuspell" ]; + package = finalAttrs.finalPackage; + version = finalAttrs.version; + versionCheck = true; + }; + }; + }; + + meta = { + description = "Free and open source C++ spell checking library"; + mainProgram = "nuspell"; + pkgConfigModules = [ "nuspell" ]; + homepage = "https://nuspell.github.io/"; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.lgpl3Plus; + changelog = "https://github.com/nuspell/nuspell/blob/v${finalAttrs.version}/CHANGELOG.md"; + }; +}) diff --git a/pkgs/by-name/nu/nuspell/wrapper.nix b/pkgs/by-name/nu/nuspell/wrapper.nix new file mode 100644 index 0000000000000..07d0dd104bf11 --- /dev/null +++ b/pkgs/by-name/nu/nuspell/wrapper.nix @@ -0,0 +1,38 @@ +{ + lib, + buildEnv, + nuspell, + hunspellDicts, + makeBinaryWrapper, +}: + +lib.makeOverridable ( + dicts: f: + buildEnv { + inherit (lib.appendToName "with-dicts" nuspell) name version; + + paths = f dicts; + + pathsToLink = [ "/share/hunspell" ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = '' + makeWrapper ${lib.getExe nuspell} $out/bin/nuspell \ + --prefix DICPATH : $out/share/hunspell + ''; + + meta = { + inherit (nuspell.meta) + description + longDescription + homepage + changelog + license + maintainers + mainProgram + platforms + ; + }; + } +) hunspellDicts diff --git a/pkgs/by-name/ob/obexftp/package.nix b/pkgs/by-name/ob/obexftp/package.nix index 9b1a0186cfc59..584e86f2d405f 100644 --- a/pkgs/by-name/ob/obexftp/package.nix +++ b/pkgs/by-name/ob/obexftp/package.nix @@ -26,11 +26,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openobex ]; - # https://sourceforge.net/p/openobex/bugs/66/ postPatch = '' + # cmake 4 compatibility, upstream is dead substituteInPlace CMakeLists.txt \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + --replace-fail "cmake_minimum_required( VERSION 3.1 FATAL_ERROR )" "cmake_minimum_required( VERSION 3.10 FATAL_ERROR )" \ + --replace-fail "cmake_policy ( VERSION 3.1 )" "cmake_policy ( VERSION 3.10 )" + + # https://sourceforge.net/p/openobex/bugs/66/ + substituteInPlace CMakeLists.txt \ + --replace-fail '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace-fail '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} ''; # There's no such thing like "bluetooth" library; possibly they meant "bluez" but it links correctly without this. diff --git a/pkgs/by-name/oc/ocl-icd/package.nix b/pkgs/by-name/oc/ocl-icd/package.nix index 9be8bfc2c38a6..fb0df289ef62c 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.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "OCL-dev"; repo = "ocl-icd"; rev = "v${version}"; - sha256 = "sha256-pt2ISb+xROgkBnbRvESsuaqzBIRKB1NCzAauRW15L8M="; + sha256 = "sha256-7q5+33oWMA/PQOz6awC+LOBVTKeXNluHxDNAq8bJPYU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ol/olm/package.nix b/pkgs/by-name/ol/olm/package.nix index c52415b43dc52..e1eece8062060 100644 --- a/pkgs/by-name/ol/olm/package.nix +++ b/pkgs/by-name/ol/olm/package.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { substituteInPlace olm.pc.in \ --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 3.4)' \ + 'cmake_minimum_required(VERSION 3.10)' '' # Clang 19 has become more strict about assigning to const variables # Patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281497 diff --git a/pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch b/pkgs/by-name/on/onetbb/fix-32-bit-powerpc-build.patch similarity index 100% rename from pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch rename to pkgs/by-name/on/onetbb/fix-32-bit-powerpc-build.patch diff --git a/pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch b/pkgs/by-name/on/onetbb/fix-libtbbmalloc-dlopen.patch similarity index 100% rename from pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch rename to pkgs/by-name/on/onetbb/fix-libtbbmalloc-dlopen.patch diff --git a/pkgs/by-name/tb/tbb_2022/fix-musl-build.patch b/pkgs/by-name/on/onetbb/fix-musl-build.patch similarity index 100% rename from pkgs/by-name/tb/tbb_2022/fix-musl-build.patch rename to pkgs/by-name/on/onetbb/fix-musl-build.patch diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/on/onetbb/package.nix similarity index 70% rename from pkgs/by-name/tb/tbb_2022/package.nix rename to pkgs/by-name/on/onetbb/package.nix index 807ca45e90380..6cebaf75422c1 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/on/onetbb/package.nix @@ -2,13 +2,14 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, ctestCheckHook, }: stdenv.mkDerivation (finalAttrs: { - pname = "tbb"; + pname = "onetbb"; version = "2022.2.0"; outputs = [ @@ -36,6 +37,18 @@ stdenv.mkDerivation (finalAttrs: { # # ./fix-libtbbmalloc-dlopen.patch + + # Only enable fcf-protection on x86 based processors + # + # + (fetchpatch { + url = "https://github.com/uxlfoundation/oneTBB/commit/65d46656f56200a7e89168824c4dbe4943421ff9.patch?full_index=1"; + hash = "sha256-hhHDuvUsWSqs7AJ5smDYUP1yYZmjV2VISBeKHcFAfG4="; + }) + (fetchpatch { + url = "https://github.com/uxlfoundation/oneTBB/commit/e57411968661ab1205322ba1c84fc1cd90a306c6.patch"; + hash = "sha256-PFixW4lYqA5oy4LSwewvxgJbjVKJceRHnp8mgW9zBF0="; + }) ]; nativeBuildInputs = [ @@ -73,16 +86,14 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Intel Thread Building Blocks C++ Library"; - homepage = "http://threadingbuildingblocks.org/"; + description = "oneAPI Threading Building Blocks"; + homepage = "https://uxlfoundation.github.io/oneTBB/"; license = lib.licenses.asl20; longDescription = '' - Intel Threading Building Blocks offers a rich and complete approach to - expressing parallelism in a C++ program. It is a library that helps you - take advantage of multi-core processor performance without having to be a - threading expert. Intel TBB is not just a threads-replacement library. It - represents a higher-level, task-based parallelism that abstracts platform - details and threading mechanisms for scalability and performance. + oneAPI Threading Building Blocks (oneTBB) is a runtime-based + parallel programming model for C++ code that uses tasks. The + template-based runtime library can help you harness the latent + performance of multi-core processors. ''; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix index d1aa5645ddce6..65a359429b7d1 100644 --- a/pkgs/by-name/op/opencascade-occt/package.nix +++ b/pkgs/by-name/op/opencascade-occt/package.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation rec { (lib.cmakeBool "USE_RAPIDJSON" true) # Enable exception handling for release builds. (lib.cmakeBool "BUILD_RELEASE_DISABLE_EXCEPTIONS" false) + # cmake 4 compatibility, old versions upstream need like 3 patches to get to a + # supported version, so just use the big hammer + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ] ++ lib.optionals withVtk [ (lib.cmakeBool "USE_VTK" true) diff --git a/pkgs/by-name/op/openhmd/package.nix b/pkgs/by-name/op/openhmd/package.nix index 01fc1d072edf5..6795d1aa85635 100644 --- a/pkgs/by-name/op/openhmd/package.nix +++ b/pkgs/by-name/op/openhmd/package.nix @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg"; }; + # substitute for CMake 4 compat + # "OpenHMD is currently NOT ACTIVELY MAINTAINED" in upstream README + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index f666529ede71c..193f518bf4975 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -8,7 +8,7 @@ lib, python3, stdenv, - tbb, + onetbb, xcodebuild, }: @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; buildInputs = [ - tbb + onetbb ] ++ lib.optionals cudaSupport [ @@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport) - (lib.cmakeFeature "TBB_INCLUDE_DIR" "${tbb.dev}/include") - (lib.cmakeFeature "TBB_ROOT" "${tbb}") + (lib.cmakeFeature "TBB_INCLUDE_DIR" "${onetbb.dev}/include") + (lib.cmakeFeature "TBB_ROOT" "${onetbb}") ]; meta = { diff --git a/pkgs/by-name/op/openobex/package.nix b/pkgs/by-name/op/openobex/package.nix index e590a556ce2b3..d673c83451427 100644 --- a/pkgs/by-name/op/openobex/package.nix +++ b/pkgs/by-name/op/openobex/package.nix @@ -30,15 +30,18 @@ stdenv.mkDerivation rec { doInstallCheck = true; - configureFlags = [ "--enable-apps" ]; - patchPhase = '' sed -i "s!/lib/udev!$out/lib/udev!" udev/CMakeLists.txt sed -i "/if ( PKGCONFIG_UDEV_FOUND )/,/endif ( PKGCONFIG_UDEV_FOUND )/d" udev/CMakeLists.txt + + # cmake 4 compatibility, upstream is dead + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required ( VERSION 3.1 FATAL_ERROR )" "cmake_minimum_required ( VERSION 3.10 FATAL_ERROR )" + # https://sourceforge.net/p/openobex/bugs/66/ substituteInPlace CMakeLists.txt \ - --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/op/openpgl/package.nix b/pkgs/by-name/op/openpgl/package.nix index 4dde88f62eaba..e0f1a6561a44c 100644 --- a/pkgs/by-name/op/openpgl/package.nix +++ b/pkgs/by-name/op/openpgl/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, ninja, stdenv, - tbb, + onetbb, }: stdenv.mkDerivation (finalAttrs: { @@ -24,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - tbb + onetbb ]; cmakeFlags = [ "-DOPENPGL_BUILD_STATIC=OFF" - "-DTBB_ROOT=${tbb.out}" + "-DTBB_ROOT=${onetbb.out}" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString ( diff --git a/pkgs/by-name/op/openresolv/package.nix b/pkgs/by-name/op/openresolv/package.nix index 752bed7ffb1d4..c8ff669f88051 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.16.5"; + version = "3.17.0"; src = fetchFromGitHub { owner = "NetworkConfiguration"; repo = "openresolv"; rev = "v${version}"; - sha256 = "sha256-EkplO5XWWqABzCSrmTxWSxX6PawpcVZAeKZG5l1FTUE="; + sha256 = "sha256-blWfUXTBPkAYj5o2/lqAfMV4mOHUW1wpPGiUx93Bfyo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 95a5bdc796092..b5d73abc4b0ec 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -34,7 +34,7 @@ mesa, mpfr, python3, - tbb_2022, + onetbb, wayland, wayland-protocols, wrapGAppsHook3, @@ -79,7 +79,7 @@ clangStdenv.mkDerivation rec { [ clipper2 glm - tbb_2022 + onetbb mimalloc boost cairo diff --git a/pkgs/by-name/op/openscenegraph/package.nix b/pkgs/by-name/op/openscenegraph/package.nix index 9fddd9562b7ae..ee4b53ae8057a 100644 --- a/pkgs/by-name/op/openscenegraph/package.nix +++ b/pkgs/by-name/op/openscenegraph/package.nix @@ -135,6 +135,13 @@ stdenv.mkDerivation rec { }) ]; + # ref. https://github.com/openscenegraph/OpenSceneGraph/pull/1373 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)" \ + "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" + ''; + cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index dc99acef47770..b682efc1bc1e9 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -1,6 +1,7 @@ { buildGoModule, fetchFromGitHub, + fetchpatch, protobuf, go-protobuf, pkg-config, @@ -43,6 +44,20 @@ buildGoModule (finalAttrs: { hash = "sha256-XAR7yZjAzbMxIVGSV82agpAGwlejkILGgDI6iRicZuQ="; }; + patches = [ + (fetchpatch { + # https://github.com/evilsocket/opensnitch/pull/1418 + # allow configuring the audit socket path + url = "https://github.com/evilsocket/opensnitch/commit/f9358a464f204068359bf5174e6ff43288f12c7e.patch?full_index=1"; + hash = "sha256-s9CM1CyGpfJZXEtihXCM7nfPhBY8XuwubynTotqtf3E="; + }) + (fetchpatch { + # add missing colon in test definition + url = "https://github.com/evilsocket/opensnitch/commit/4b38ca1260295d2e0f8c4a7313529f83dcca4554.patch?full_index=1"; + hash = "sha256-/z3iFRpcv75FyarVnpK8/PTU2fcFHS+SNbHn7M5Etk8="; + }) + ]; + postPatch = '' # Allow configuring Version at build time substituteInPlace daemon/core/version.go --replace-fail "const " "var " diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index b0a96fd5f650f..347232c44f90b 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -17,7 +17,7 @@ spectra, stdenv, swig, - tbb, + onetbb, # Boolean flags runTests ? false, # tests take an hour to build on a 48-core machine enablePython ? false, @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { pagmo2 spectra swig - tbb + onetbb ] ++ lib.optionals enablePython [ python3Packages.dill diff --git a/pkgs/by-name/op/openvdb/package.nix b/pkgs/by-name/op/openvdb/package.nix index 68e58f3d4990d..14f9a8a11fc1c 100644 --- a/pkgs/by-name/op/openvdb/package.nix +++ b/pkgs/by-name/op/openvdb/package.nix @@ -6,7 +6,7 @@ boost, jemalloc, c-blosc, - tbb, + onetbb, zlib, }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost - tbb + onetbb jemalloc c-blosc zlib diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 9d4d36ac61495..81eb194a5fb92 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -28,7 +28,7 @@ protobuf, pugixml, snappy, - tbb_2022, + onetbb, cudaPackages, }: @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { opencv pugixml snappy - tbb_2022 + onetbb ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 244ac7fcd3c75..136c1760dd8b2 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -34,7 +34,7 @@ opencv, pcre, systemd, - tbb_2022, + onetbb, webkitgtk_4_1, wxGTK31, xorg, @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { opencascade-occt_7_6 openvdb pcre - tbb_2022 + onetbb webkitgtk_4_1 wxGTK' xorg.libX11 @@ -196,6 +196,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "LIBNOISE_INCLUDE_DIR" "${libnoise}/include/noise") (lib.cmakeFeature "LIBNOISE_LIBRARY" "${libnoise}/lib/libnoise-static.a") "-Wno-dev" + + # cmake 4 compatibility, remove in next update + # see: https://github.com/SoftFever/OrcaSlicer/commit/883607e1d4a0b2bb719f2f4bcd9fd72f8c2174fa + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.13") ]; # Generate translation files diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix index 333037b469068..c61a4a842e3ec 100644 --- a/pkgs/by-name/os/osm2pgsql/package.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, expat, - fmt_11, + fmt, proj, bzip2, cli11, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 cli11 expat - fmt_11 + fmt libosmium libpq nlohmann_json diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix index db8e0cba01d85..f3b57201f121b 100644 --- a/pkgs/by-name/os/osrm-backend/package.nix +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -10,14 +10,11 @@ boost, lua, luabind, - tbb_2022, + onetbb, expat, nixosTests, }: -let - tbb = tbb_2022; -in stdenv.mkDerivation rec { pname = "osrm-backend"; version = "6.0.0"; @@ -41,7 +38,7 @@ stdenv.mkDerivation rec { boost lua luabind - tbb + onetbb expat ]; diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index 20cb2cb206cf0..23c18565c4992 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -240,7 +240,6 @@ stdenv.mkDerivation (final: { done # Patches for ovftool binary - change_args+=(-change /usr/lib/libc++.1.dylib ${stdenv.cc.libcxx}/lib/libc++.1.dylib) change_args+=(-change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib) change_args+=(-change /usr/lib/libxml2.2.dylib ${libxml2}/lib/libxml2.2.dylib) change_args+=(-change /usr/lib/libz.1.dylib ${zlib}/lib/libz.1.dylib) diff --git a/pkgs/by-name/pa/pagmo2/package.nix b/pkgs/by-name/pa/pagmo2/package.nix index 0d214f5588431..8d603f38bf5d3 100644 --- a/pkgs/by-name/pa/pagmo2/package.nix +++ b/pkgs/by-name/pa/pagmo2/package.nix @@ -7,7 +7,7 @@ nlopt, ipopt, boost, - tbb, + onetbb, # tests pass but take 30+ minutes runTests ? false, }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { eigen nlopt boost - tbb + onetbb ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt; diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix index 1bb3efa814f72..0aac8f0dade39 100644 --- a/pkgs/by-name/pa/papilo/package.nix +++ b/pkgs/by-name/pa/papilo/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, boost, - tbb_2022, + onetbb, }: stdenv.mkDerivation (finalAttrs: { @@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost cmake - tbb_2022 + onetbb ]; - propagatedBuildInputs = [ tbb_2022 ]; + propagatedBuildInputs = [ onetbb ]; strictDeps = true; diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index 94b114e535bf2..62408e84b2c88 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -8,7 +8,7 @@ qt6, wrapGAppsHook3, openjpeg, - tbb_2022, + onetbb, blend2d, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtspeech lcms openjpeg - tbb_2022 + onetbb blend2d ]; diff --git a/pkgs/by-name/pi/picoscope/package.nix b/pkgs/by-name/pi/picoscope/package.nix index 9841f081e969a..d1c04fda0f14a 100644 --- a/pkgs/by-name/pi/picoscope/package.nix +++ b/pkgs/by-name/pi/picoscope/package.nix @@ -16,7 +16,7 @@ patchelf, stdenv, systemdMinimal, - tbb, + onetbb, writeTextDir, }: @@ -36,7 +36,7 @@ let openssl stdenv.cc.cc.lib systemdMinimal - tbb + onetbb ]; gdkLoadersCache = "${gdk-pixbuf.out}/${gdk-pixbuf.moduleDir}.cache"; diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix index da0beca7c733b..f7e58add0a170 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.2"; + version = "0.46.4"; src = fetchurl { urls = [ "mirror://xorg/individual/lib/pixman-${finalAttrs.version}.tar.gz" "https://cairographics.org/releases/pixman-${finalAttrs.version}.tar.gz" ]; - hash = "sha256-Pg3lum41aRaUaj2VgZLxVQXcq4UTR3G/6rTOTim71zM="; + hash = "sha256-0JxE68O9W+5wIcefki/o+y+1f3Mg9V6X/5kU0jRqWRw="; }; # Raise test timeout, 120s can be slightly exceeded on slower hardware diff --git a/pkgs/by-name/po/potreeconverter/package.nix b/pkgs/by-name/po/potreeconverter/package.nix index 4670118900370..240df12965be2 100644 --- a/pkgs/by-name/po/potreeconverter/package.nix +++ b/pkgs/by-name/po/potreeconverter/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, boost, - tbb, + onetbb, makeWrapper, }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ boost - tbb + onetbb ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index 31b95407709a4..d1e5dca8dfce1 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -13,7 +13,7 @@ graphviz, # propagatedBuildInputs - cereal_1_3_2, + cereal, eigen, jrl-cmakemodules, simde, @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - cereal_1_3_2 + cereal eigen jrl-cmakemodules simde diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index 31d3a894674fd..491b7adaa8ed1 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-07-22"; + version = "0-unstable-2025-08-28"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "66d74ce941749134f5b0c9f0b9ab3393084b0c21"; - hash = "sha256-FKDL0cWyIP/zwKgqwZ8qb/Oc99CvXdXllMVnL2nnWRo="; + rev = "4103956c4300902436b03d7da482536e757b3601"; + hash = "sha256-QIjDAbPfbdV+V4RV6v8/85YTxiRbXLBlulObXpkPmxQ="; }; dontBuild = true; diff --git a/pkgs/by-name/py/pymol/package.nix b/pkgs/by-name/py/pymol/package.nix index fe5527d589aca..596482a0ea8e1 100644 --- a/pkgs/by-name/py/pymol/package.nix +++ b/pkgs/by-name/py/pymol/package.nix @@ -13,7 +13,7 @@ libxml2, freetype, mmtf-cpp, - msgpack, + msgpack-cxx, qt5, }: let @@ -85,7 +85,7 @@ python3Packages.buildPythonApplication rec { --replace-fail '"cmake>=3.13.3",' "" ''; - env.PREFIX_PATH = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${msgpack}"; + env.PREFIX_PATH = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${msgpack-cxx}"; build-system = [ python3Packages.setuptools ]; dontUseCmakeConfigure = true; @@ -105,7 +105,7 @@ python3Packages.buildPythonApplication rec { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ mmtf-cpp - msgpack + msgpack-cxx ]; dependencies = with python3Packages; [ diff --git a/pkgs/by-name/qd/qdldl/package.nix b/pkgs/by-name/qd/qdldl/package.nix index bacdab3305e5c..c88db5f6f18b8 100644 --- a/pkgs/by-name/qd/qdldl/package.nix +++ b/pkgs/by-name/qd/qdldl/package.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-pRlxqy5G8mxKXTIn4ruV/95TzpzNB/ArJX+WrEJRqW4="; }; + # fix abs dir concatenation + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "$/$""{CMAKE_INSTALL_INCLUDEDIR}" \ + "$""{CMAKE_INSTALL_INCLUDEDIR}" + ''; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/qh/qhull/package.nix b/pkgs/by-name/qh/qhull/package.nix index 84777ff28cdcb..a315ea25dec88 100644 --- a/pkgs/by-name/qh/qhull/package.nix +++ b/pkgs/by-name/qh/qhull/package.nix @@ -19,6 +19,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + # Fix the build with CMake 4. + # + # Remove on the next version bump. + # + # See: + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 3.0)' \ + 'cmake_minimum_required(VERSION 3.5...4.0)' + ''; + meta = with lib; { homepage = "http://www.qhull.org/"; description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; diff --git a/pkgs/by-name/qp/qpoases/package.nix b/pkgs/by-name/qp/qpoases/package.nix index b77c8cc5fac8f..07356f0818435 100644 --- a/pkgs/by-name/qp/qpoases/package.nix +++ b/pkgs/by-name/qp/qpoases/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, + fetchpatch, nix-update-script, cmake, @@ -21,6 +22,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-L6uBRXaPJZinIRTm+x+wnXmlVkSlWm4XMB5yX/wxg2A="; }; + patches = [ + (fetchpatch { + name = "qpoases-fix-cmake-4.patch"; + url = "https://github.com/coin-or/qpOASES/commit/35b762ba3fee2e009d9e99650c68514da05585c5.patch"; + hash = "sha256-I6l+ah1j45VEMokZqX6DYVmE55uWlVi0rx2B+HQv5Ik="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/pkgs/by-name/qr/qrupdate/package.nix b/pkgs/by-name/qr/qrupdate/package.nix index d59e9ad1c0c6e..030ec7af99c50 100644 --- a/pkgs/by-name/qr/qrupdate/package.nix +++ b/pkgs/by-name/qr/qrupdate/package.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation (finalAttrs: { ./disable-zch1dn-test.patch ]; + postPatch = '' + sed '/^cmake_minimum_required/Is/VERSION [0-9]\.[0-9]/VERSION 3.5/' -i ./CMakeLists.txt + ''; + doCheck = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/rapidjson/package.nix b/pkgs/by-name/ra/rapidjson/package.nix index 0307b3458b955..852026fd21cf2 100644 --- a/pkgs/by-name/ra/rapidjson/package.nix +++ b/pkgs/by-name/ra/rapidjson/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "RAPIDJSON_BUILD_DOC" true) (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" true) - (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" true) + (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" false) # gtest 1.13+ requires C++14 or later. (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" false) (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" true) diff --git a/pkgs/by-name/re/read-edid/package.nix b/pkgs/by-name/re/read-edid/package.nix index 09224699b0b87..a1aa288b72d28 100644 --- a/pkgs/by-name/re/read-edid/package.nix +++ b/pkgs/by-name/re/read-edid/package.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { patches = [ ./fno-common.patch ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' + substituteInPlace CMakeLists.txt --replace-fail 'COPYING' 'LICENSE' + + # cmake 4 compatibility, upstream is dead + substituteInPlace CMakeLists.txt --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required (VERSION 3.10)" ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/re/remctl/package.nix b/pkgs/by-name/re/remctl/package.nix index b9e8c7f6a949f..4387ed5bdfb2b 100644 --- a/pkgs/by-name/re/remctl/package.nix +++ b/pkgs/by-name/re/remctl/package.nix @@ -25,7 +25,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs tests sed -i '\,server/acl/localgroup,d' tests/TESTS - substituteInPlace configure.ac --replace "-Werror" "" + + substituteInPlace Makefile.am \ + --replace-fail "tests/data/acls/val\#id" "'tests/data/acls/val#id'" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index ff21f8608b7ae..c432784847e38 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -46,7 +46,7 @@ patchRcPathCsh, patchRcPathFish, patchRcPathPosix, - tbb_2022, + onetbb, xrootd, }: @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { patchRcPathPosix pcre2 python3 - tbb_2022 + onetbb xrootd xxHash xz diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index dbedc8f9d2767..3159e749318e7 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -5,7 +5,7 @@ fetchpatch2, cmake, doctest, - fmt_11, + fmt, perl, glib, luajit, @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { buildInputs = [ doctest - fmt_11 + fmt glib openssl pcre diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 165df1aa71279..46cc44236a8fe 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,18 +16,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.12.10"; + version = "0.13.1"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-pHwWYgU/PMkoKIADJsbU3ta+u7H4DR+kb3xZturqpgk="; + hash = "sha256-dCxCpJLG2qjfrMxDJOL4rCwdVYfrz3P+4kDQ9d9Mbus="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-M4NyUvtoDK9MKacSMl+W4d+WF7LrINm9zowrTNwy9wk="; + cargoHash = "sha256-WtRryq8bmKfL3EL2kRFFokmG2f0lnS6zRMbUzGeYLDM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index 46208585ee39d..f4d0276b9f252 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.24"; + version = "1.5.26"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; rev = "v${version}"; - hash = "sha256-a5TJlxDj5B+fq8EUrlXtqGKtMC3S8PoIG2w12DTYVsc="; + hash = "sha256-6Py1ygHinx3n7k/hQN+85C57YXh7ag0OGYR+NOnx1rE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix index 8cc252a4ba825..ad1ed4fd56203 100644 --- a/pkgs/by-name/sa/salmon/package.nix +++ b/pkgs/by-name/sa/salmon/package.nix @@ -3,7 +3,7 @@ stdenv, boost, bzip2, - cereal_1_3_2, + cereal, cmake, curl, fetchFromGitHub, @@ -13,7 +13,7 @@ libiconv, libstaden-read, pkg-config, - tbb_2022, + onetbb, xz, zlib, }: @@ -49,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: { enabledStatic = true; }) bzip2 - cereal_1_3_2 + cereal curl icu jemalloc libgff libstaden-read - tbb_2022 + onetbb xz zlib ] diff --git a/pkgs/by-name/sc/scalapack/package.nix b/pkgs/by-name/sc/scalapack/package.nix index 2a65be07d73ac..408337773ba74 100644 --- a/pkgs/by-name/sc/scalapack/package.nix +++ b/pkgs/by-name/sc/scalapack/package.nix @@ -40,6 +40,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/76cc1ed3032e9a4158a4513c9047c3746b269f04.patch"; hash = "sha256-kmllLa9GUeTrHRYeS0yIk9I8LwaIoEytdyQGRuinn3A="; }) + + (fetchpatch { + name = "scalapack-fix-cmake-4.patch"; + url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/c3d6b22b0032fd2b8772d99c2239c18473e197a7.patch"; + hash = "sha256-935KtaqPO2cghbD9Z8YMxGGOQJo1D1LqTje6/IL4bGI="; + }) ]; # Required to activate ILP64. diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix index 71c1daf2189aa..ef557c5904e85 100644 --- a/pkgs/by-name/sc/scipopt-papilo/package.nix +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -6,7 +6,7 @@ boost, blas, gmp, - tbb_2022, + onetbb, gfortran, }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { gmp gfortran boost - tbb_2022 + onetbb ]; cmakeFlags = [ diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index 0665343dd0896..dd09c6713d751 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -11,7 +11,7 @@ scipopt-papilo, scipopt-zimpl, ipopt, - tbb_2022, + onetbb, boost, gfortran, criterion, @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { gmp readline zlib - tbb_2022 + onetbb boost gfortran criterion diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 79a32b745dfbb..b03ebd819ddda 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -62,7 +62,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; - version = "3.2.20"; + version = "3.2.22"; outputs = [ "lib" @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL"; tag = "release-${finalAttrs.version}"; - hash = "sha256-ESYjTN2prkAeHcTYurZaWeM3RgEKtwCZrt9gSMcOAe0="; + hash = "sha256-4jGfw2hNZTGuae2DMLz8xJBtfNu5abIN5GlNIKDOUpw="; }; postPatch = @@ -105,23 +105,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional waylandSupport wayland-scanner; buildInputs = - finalAttrs.dlopenBuildInputs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: 'MTLPixelFormatASTC_4x4_LDR' is unavailable: not available on macOS - (darwinMinVersionHook "11.0") - - apple-sdk_11 - ] - ++ lib.optionals ibusSupport [ - # sdl3 only uses some constants of the ibus headers - # it never actually loads the library - # thus, it also does not have to care about gtk integration, - # so using ibusMinimal avoids an unnecessarily large closure here. - ibusMinimal - ] - ++ lib.optional waylandSupport zenity; - - dlopenBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ] @@ -160,7 +143,20 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader ] ++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL - ++ lib.optional x11Support xorg.libX11; + ++ lib.optional x11Support xorg.libX11 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # error: 'MTLPixelFormatASTC_4x4_LDR' is unavailable: not available on macOS + (darwinMinVersionHook "11.0") + + apple-sdk_11 + ] + ++ lib.optionals ibusSupport [ + # sdl3 only uses some constants of the ibus headers + # it never actually loads the library + # thus, it also does not have to care about gtk integration, + # so using ibusMinimal avoids an unnecessarily large closure here. + ibusMinimal + ]; cmakeFlags = [ (lib.cmakeBool "SDL_ALSA" alsaSupport) @@ -181,21 +177,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDL_TESTS" true) (lib.cmakeBool "SDL_INSTALL_TESTS" true) + (lib.cmakeBool "SDL_DEPS_SHARED" false) ]; doCheck = true; - # See comment below. We actually *do* need these RPATH entries - dontPatchELF = true; - - env = { - # Many dependencies are not directly linked to, but dlopen()'d at runtime. Adding them to the RPATH - # helps them be found - NIX_LDFLAGS = lib.optionalString ( - stdenv.hostPlatform.hasSharedLibraries && stdenv.hostPlatform.extensions.sharedLibrary == ".so" - ) "-rpath ${lib.makeLibraryPath (finalAttrs.dlopenBuildInputs)}"; - }; - postInstall = '' moveToOutput "share/installed-tests" "$installedTests" moveToOutput "libexec/installed-tests" "$installedTests" diff --git a/pkgs/by-name/sh/shadowsocks-libev/package.nix b/pkgs/by-name/sh/shadowsocks-libev/package.nix index 9f2e01217647c..2a4d822a60682 100644 --- a/pkgs/by-name/sh/shadowsocks-libev/package.nix +++ b/pkgs/by-name/sh/shadowsocks-libev/package.nix @@ -52,23 +52,27 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # cmake 4 compatibility + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)" + # https://github.com/shadowsocks/shadowsocks-libev/issues/2901 substituteInPlace CMakeLists.txt \ - --replace '# pkg-config' \ + --replace-fail '# pkg-config' \ '# pkg-config include(GNUInstallDirs)' substituteInPlace cmake/shadowsocks-libev.pc.cmake \ - --replace @prefix@ @CMAKE_INSTALL_PREFIX@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_FULL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_DATAROOTDIR@ @CMAKE_INSTALL_FULL_DATAROOTDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_MANDIR@ @CMAKE_INSTALL_FULL_MANDIR@ + --replace-fail @prefix@ @CMAKE_INSTALL_PREFIX@ \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ \ + --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_FULL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_DATAROOTDIR@ @CMAKE_INSTALL_FULL_DATAROOTDIR@ \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_MANDIR@ @CMAKE_INSTALL_FULL_MANDIR@ # https://github.com/dcreager/libcork/issues/173 but needs a different patch (yay vendoring) substituteInPlace libcork/src/libcork.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; postInstall = '' diff --git a/pkgs/by-name/sm/smproxy/package.nix b/pkgs/by-name/sm/smproxy/package.nix new file mode 100644 index 0000000000000..e12acfa460783 --- /dev/null +++ b/pkgs/by-name/sm/smproxy/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libice, + libsm, + libxmu, + libxt, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "smproxy"; + version = "1.0.8"; + + src = fetchurl { + url = "mirror://xorg/individual/app/smproxy-${finalAttrs.version}.tar.xz"; + hash = "sha256-/uWE6uLsHOLReNctO0hJICcbpoonk1dpzvuvvDov9sg="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libice + libsm + libxmu + libxt + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "allows X applications that do not support X11R6 session management to participate in an X11R6 session"; + homepage = "https://gitlab.freedesktop.org/xorg/app/smproxy"; + license = lib.licenses.mitOpenGroup; + mainProgram = "smproxy"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/so/softhsm/package.nix b/pkgs/by-name/so/softhsm/package.nix index 19be262667a45..9a7d3746d7cf9 100644 --- a/pkgs/by-name/so/softhsm/package.nix +++ b/pkgs/by-name/so/softhsm/package.nix @@ -1,9 +1,10 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, botan2, sqlite, + autoreconfHook, }: stdenv.mkDerivation rec { @@ -11,11 +12,17 @@ stdenv.mkDerivation rec { pname = "softhsm"; version = "2.6.1"; - src = fetchurl { - url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz"; - hash = "sha256-YSSUcwVLzRgRUZ75qYmogKe9zDbTF8nCVFf8YU30dfI="; + src = fetchFromGitHub { + owner = "softhsm"; + repo = "SoftHSMv2"; + rev = "${version}"; + hash = "sha256-sx0ceVY795JbtKbQGAVFllB9UJfTdgd242d6c+s1tBw="; }; + nativeBuildInputs = [ + autoreconfHook + ]; + configureFlags = [ "--with-crypto-backend=botan" "--with-botan=${lib.getDev botan2}" @@ -37,7 +44,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/var"; meta = with lib; { - homepage = "https://www.opendnssec.org/softhsm"; + homepage = "https://www.softhsm.org/"; description = "Cryptographic store accessible through a PKCS #11 interface"; longDescription = " SoftHSM provides a software implementation of a generic diff --git a/pkgs/by-name/so/soxr/package.nix b/pkgs/by-name/so/soxr/package.nix index 156650a09ef15..88563e32ec21d 100644 --- a/pkgs/by-name/so/soxr/package.nix +++ b/pkgs/by-name/so/soxr/package.nix @@ -32,6 +32,14 @@ stdenv.mkDerivation rec { "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" ]; + # Fix the build with CMake 4. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required (VERSION 3.1 FATAL_ERROR)' \ + 'cmake_minimum_required (VERSION 3.10 FATAL_ERROR)' + ''; + meta = with lib; { description = "Audio resampling library"; homepage = "https://soxr.sourceforge.net"; diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/by-name/sp/spago-legacy/package.nix similarity index 77% rename from pkgs/development/tools/purescript/spago/default.nix rename to pkgs/by-name/sp/spago-legacy/package.nix index c06b588c56baf..ed5ffa3550985 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/by-name/sp/spago-legacy/package.nix @@ -4,7 +4,7 @@ lib, # The following are only needed for the passthru.tests: - spago, + spago-legacy, cacert, git, nodejs, @@ -12,11 +12,11 @@ runCommand, }: -lib.pipe haskellPackages.spago [ +lib.pipe haskellPackages.spago-legacy [ haskell.lib.compose.justStaticExecutables (haskell.lib.compose.overrideCabal (oldAttrs: { - changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; + changelog = "https://github.com/purescript/spago-legacy/releases/tag/${oldAttrs.version}"; passthru = (oldAttrs.passthru or { }) // { updateScript = ./update.sh; @@ -25,10 +25,10 @@ lib.pipe haskellPackages.spago [ # network, so they cannot be run in the nix sandbox. sudo is needed in # order to change the sandbox option. # - # $ sudo nix-build -A spago.passthru.tests --option sandbox relaxed + # $ sudo nix-build -A spago-legacy.passthru.tests --option sandbox relaxed # tests = - runCommand "spago-tests" + runCommand "spago-legacy-tests" { __noChroot = true; nativeBuildInputs = [ @@ -36,7 +36,7 @@ lib.pipe haskellPackages.spago [ git nodejs purescript - spago + spago-legacy ]; } '' diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/by-name/sp/spago-legacy/spago-legacy.nix similarity index 87% rename from pkgs/development/tools/purescript/spago/spago.nix rename to pkgs/by-name/sp/spago-legacy/spago-legacy.nix index 905d6b63720e8..75ea67ae64a07 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/by-name/sp/spago-legacy/spago-legacy.nix @@ -62,12 +62,12 @@ zlib, }: mkDerivation { - pname = "spago"; - version = "0.21.0"; + pname = "spago-legacy"; + version = "0.21.1"; src = fetchgit { - url = "https://github.com/purescript/spago.git"; - sha256 = "1v5y15nhw6smnir0y7y854pa70iv8asxsqph2y8rz1c9lkz5d41g"; - rev = "c354f4a461f65fcb83aaa843830ea1589f6c7179"; + url = "https://github.com/purescript/spago-legacy.git"; + sha256 = "18p9cic1y9b2v12np4b5sd82rz5njxh8f1vgqs4gwm6xjccmszmr"; + rev = "2790261c28f59940f192c56f3b8245b3ae8b798d"; fetchSubmodules = true; }; isLibrary = true; @@ -148,7 +148,7 @@ mkDerivation { versions ]; testToolDepends = [ hspec-discover ]; - homepage = "https://github.com/purescript/spago#readme"; + homepage = "https://github.com/purescript/spago-legacy#readme"; license = lib.licenses.bsd3; mainProgram = "spago"; } diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/by-name/sp/spago-legacy/update.sh similarity index 55% rename from pkgs/development/tools/purescript/spago/update.sh rename to pkgs/by-name/sp/spago-legacy/update.sh index b97b0fe94a9cc..5ac99bdb0be04 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/by-name/sp/spago-legacy/update.sh @@ -1,10 +1,10 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq haskellPackages.cabal2nix-unstable -I nixpkgs=. +#!nix-shell -i bash -p curl jq haskellPackages.cabal2nix-unstable.bin nix-prefetch-scripts -I nixpkgs=. # -# This script will update the spago derivation to the latest version using +# This script will update the spago-legacy derivation to the latest version using # cabal2nix. # -# Note that you should always try building spago after updating it here, since +# Note that you should always try building spago-legacy after updating it here, since # some of the overrides in pkgs/development/haskell/configuration-nix.nix may # need to be updated/changed. @@ -14,26 +14,28 @@ set -eo pipefail script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # Spago derivation created with cabal2nix. -spago_derivation_file="${script_dir}/spago.nix" +spago_derivation_file="${script_dir}/spago-legacy.nix" -# This is the current revision of spago in Nixpkgs. +# This is the current revision of spago-legacy in Nixpkgs. old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$spago_derivation_file")" -# This is the latest release version of spago on GitHub. -new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/releases" | jq '.[0].tag_name' --raw-output) +# This is the latest release version of spago-legacy on GitHub. +new_version=$(curl --silent "https://api.github.com/repos/purescript/spago-legacy/releases" | jq '.[0].tag_name' --raw-output) -echo "Updating spago from old version $old_version to new version $new_version." +echo "Updating spago-legacy from old version $old_version to new version $new_version." echo "Running cabal2nix and outputting to ${spago_derivation_file}..." echo "# This has been automatically generated by the script" > "$spago_derivation_file" echo "# ./update.sh. This should not be changed by hand." >> "$spago_derivation_file" -cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> "$spago_derivation_file" +cabal2nix --revision "$new_version" "https://github.com/purescript/spago-legacy.git" >> "$spago_derivation_file" + +nixfmt "$spago_derivation_file" # TODO: This should ideally also automatically update the docsSearchVersion # from pkgs/development/haskell/configuration-nix.nix. echo echo "Finished. Make sure you run the following commands to confirm Spago builds correctly:" -echo ' - `nix build -L -f ./. spago`' -echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' +echo ' - `nix build -L -f ./. spago-legacy`' +echo ' - `sudo nix build -L -f ./. spago-legacy.passthru.tests --option sandbox relaxed`' diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 37e08a8dc5a2e..d7a205d02b5c8 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, fmt, catch2_3, @@ -15,15 +16,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "spdlog"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; tag = "v${finalAttrs.version}"; - hash = "sha256-9RhB4GdFjZbCIfMOWWriLAUf9DE/i/+FTXczr0pD0Vg="; + hash = "sha256-0rOR9G2Y4Z4OBZtUHxID0s1aXN9ejodHrurlVCA0pIo="; }; + patches = [ + # https://github.com/gabime/spdlog/pull/3451 + (fetchpatch { + name = "catch2-3.9.0-compat.patch"; + url = "https://github.com/gabime/spdlog/commit/3edc8036dbf3c7cdf0e460a913ae294c87ae90dc.patch"; + hash = "sha256-0XtNaAvDGpSTtQZjxmLbHOoY4OMZDJfLDzBh7gNQh2c="; + }) + ]; + nativeBuildInputs = [ cmake ]; # Required to build tests, even if they aren't executed buildInputs = [ catch2_3 ]; diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index 6a4546588bf38..8a4f92e9dfb29 100644 --- a/pkgs/by-name/sp/spirv-headers/package.nix +++ b/pkgs/by-name/sp/spirv-headers/package.nix @@ -5,15 +5,18 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spirv-headers"; - version = "1.4.321.0"; + version = "1.4.321.0-unstable-2025-06-24"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "vulkan-sdk-${version}"; - hash = "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="; + # The release for Vulkan SDK 1.4.321.0 is missing a PR required for + # LLVM 21 support in SPIRV-LLVM-Translator; return to the + # `vulkan-sdk-*` tags on the next stable release. + rev = "9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e"; + hash = "sha256-N8NBAkkpOcbgap4loPJJW6E5bjG+TixCh/HN259RyjI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix index 6689cd7caa601..f6e7a42116d83 100644 --- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix +++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix @@ -38,7 +38,12 @@ let }; }; - branch = versions."${llvmMajor}" or (throw "Incompatible LLVM version ${llvmMajor}"); + branch = + versions."${llvmMajor}" or { + version = "${llvmMajor}.x.x"; + rev = ""; + hash = ""; + }; in stdenv.mkDerivation { pname = "SPIRV-LLVM-Translator"; @@ -107,13 +112,6 @@ stdenv.mkDerivation { license = licenses.ncsa; platforms = platforms.unix; maintainers = with maintainers; [ gloaming ]; - - # For the LLVM 21 build some commits to spirv-headers - # are required that didn't make it into the final release of 1.4.321 - # For example: 9e3836d Add SPV_INTEL_function_variants - # Once spirv-headers are released again and updated on nixpkgs, - # this will switch over to the nixpkgs version and should no - # longer be broken. - broken = llvmMajor == "21" && lib.versionOlder spirv-headers.version "1.4.322"; + broken = !(versions ? ${llvmMajor}); }; } diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index f158e801d2dd4..afd55c4dc7421 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -7,15 +7,18 @@ spirv-headers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spirv-tools"; - version = "1.4.321.0"; + version = "1.4.321.0-unstable-2025-06-25"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "vulkan-sdk-${version}"; - hash = "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="; + # The SPIRV-Headers release for Vulkan SDK 1.4.321.0 is missing + # a PR required for LLVM 21 support in SPIRV-LLVM-Translator; + # return to the `vulkan-sdk-*` tags on the next stable release. + rev = "28a883ba4c67f58a9540fb0651c647bb02883622"; + hash = "sha256-yRzpEBGyTr9oovsh3TUnJsR/luHNAPkotcJFWh7R1Fc="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/by-name/sq/sqlitebrowser/package.nix b/pkgs/by-name/sq/sqlitebrowser/package.nix index 4318bc279d813..d11c3b469bd28 100644 --- a/pkgs/by-name/sq/sqlitebrowser/package.nix +++ b/pkgs/by-name/sq/sqlitebrowser/package.nix @@ -28,6 +28,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail '"Unknown"' '"${finalAttrs.src.rev}"' + '' + # Fix build with CMake 4 + # Will be part of the Qt6 port + # Note: The vendored version of qhexedit is incompatible with our qhexedit2: https://github.com/sqlitebrowser/sqlitebrowser/issues/1808 + + '' + substituteInPlace libs/qhexedit/CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 2.8.12.2)' 'cmake_minimum_required(VERSION 3.16)' ''; buildInputs = [ diff --git a/pkgs/by-name/sr/srt/package.nix b/pkgs/by-name/sr/srt/package.nix index d18eb371675b6..f406fa1545432 100644 --- a/pkgs/by-name/sr/srt/package.nix +++ b/pkgs/by-name/sr/srt/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, openssl, windows, @@ -27,7 +28,15 @@ stdenv.mkDerivation rec { windows.pthreads ]; - patches = lib.optionals stdenv.hostPlatform.isMinGW [ + patches = [ + # Fix the build with CMake 4. + (fetchpatch { + name = "srt-fix-cmake-4.patch"; + url = "https://github.com/Haivision/srt/commit/0def1b1a1094fc57752f241250e9a1aed71bbffd.patch"; + hash = "sha256-dnBGNut+I9trkQzr81Wo36O2Pt7d2gsjA1buJBegPMM="; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isMinGW [ ./no-msvc-compat-headers.patch ]; diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix index 2a6c1aa148f65..8bddcb3a20b1f 100644 --- a/pkgs/by-name/su/supercell-wx/package.nix +++ b/pkgs/by-name/su/supercell-wx/package.nix @@ -24,7 +24,7 @@ gtest, glm, qt6, - tbb_2022, + onetbb, tracy, replaceVars, python3, @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { aws-sdk-cpp howard-hinnant-date boost - tbb_2022 + onetbb glew geos spdlog diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix index 65e51db702638..b72ba3e6316ba 100644 --- a/pkgs/by-name/sv/sv-lang/package.nix +++ b/pkgs/by-name/sv/sv-lang/package.nix @@ -6,7 +6,7 @@ catch2_3, cmake, ninja, - fmt_11, + fmt, mimalloc, python3, }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost - fmt_11 + fmt mimalloc # though only used in tests, cmake will complain its absence when configuring catch2_3 diff --git a/pkgs/by-name/sv/svt-av1/package.nix b/pkgs/by-name/sv/svt-av1/package.nix index 53eed9de216e7..8c8f1db2be33e 100644 --- a/pkgs/by-name/sv/svt-av1/package.nix +++ b/pkgs/by-name/sv/svt-av1/package.nix @@ -2,11 +2,9 @@ lib, stdenv, fetchFromGitLab, - fetchpatch2, gitUpdater, cmake, nasm, - cpuinfo, # for passthru.tests ffmpeg, @@ -14,22 +12,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "svt-av1"; - version = "3.0.2"; + version = "3.1.2"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${finalAttrs.version}"; - hash = "sha256-WS9awjnJV0ok6ePlLcpHPAr2gsZjbZcdFSDEmyx7vwk="; + hash = "sha256-/CpcxdyC4qf9wdzzySMYw17FbjYpasT+QVykXSlx28U="; }; - patches = [ - (fetchpatch2 { - url = "https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/ec699561b51f3204e2df6d4c2578eea1f7bd52be.patch?full_index=1"; - hash = "sha256-QVdvqWWT5tlNKBX9pQJwWgaOq+wNkYiBJTSeytRxrwo="; - }) - ]; - nativeBuildInputs = [ cmake ] @@ -37,10 +28,6 @@ stdenv.mkDerivation (finalAttrs: { nasm ]; - buildInputs = lib.optionals stdenv.hostPlatform.isx86_64 [ - cpuinfo - ]; - cmakeFlags = [ "-DSVT_AV1_LTO=ON" ]; diff --git a/pkgs/by-name/ta/tab-window-manager/package.nix b/pkgs/by-name/ta/tab-window-manager/package.nix new file mode 100644 index 0000000000000..a512b7f6b70fd --- /dev/null +++ b/pkgs/by-name/ta/tab-window-manager/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + bison, + flex, + libice, + libsm, + libx11, + libxext, + libxmu, + xorgproto, + libxrandr, + libxt, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "tab-window-manager"; + version = "1.0.13.1"; + + src = fetchurl { + url = "mirror://xorg/individual/app/twm-${finalAttrs.version}.tar.xz"; + hash = "sha256-pSU0dVqotJLIhOUvqYi6yEq01UZBlUZ5uarwjjI98sU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bison + flex + ]; + + buildInputs = [ + xorgproto + libice + libsm + libx11 + libxext + libxmu + libxrandr + libxt + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname twm \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Default Window Manager for the X Window System"; + longDescription = '' + The Tab Window Manager (twm) is a window manager for the X Window System. + It provides titlebars, shaped windows, several forms of icon management, user-defined macro + functions, click-to-type and pointer-driven keyboard focus, and user-specified key and pointer + button bindings. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/twm"; + license = with lib.licenses; [ + mitOpenGroup + hpnd + x11 + ]; + mainProgram = "twm"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ta/taglib_1/package.nix b/pkgs/by-name/ta/taglib_1/package.nix index 865ee774ddee2..219cb617f7c78 100644 --- a/pkgs/by-name/ta/taglib_1/package.nix +++ b/pkgs/by-name/ta/taglib_1/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, zlib, testers, @@ -18,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; }; + patches = [ + (fetchpatch { + name = "taglib-fix-cmake-4.patch"; + url = "https://github.com/taglib/taglib/commit/967aaf7af2f4aa2e9fed0edb2cbaca98b737eebe.patch"; + hash = "sha256-GeowBwspGAmrjALaIgEgSR9uUuClKAkS/cwZ2FHltl4="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix index 16af27b5ef264..dbb0c637efe20 100644 --- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix +++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix @@ -1,16 +1,15 @@ { lib, tailscale, - buildGo124Module, + buildGoModule, }: -buildGo124Module { - inherit (tailscale) - version - src - vendorHash - ; +buildGoModule { pname = "tailscale-gitops-pusher"; + inherit (tailscale) version; + + # It's hosted in the `tailscale` monorepo. + inherit (tailscale) src vendorHash; env = { inherit (tailscale) CGO_ENABLED; @@ -27,11 +26,11 @@ buildGo124Module { "-X tailscale.com/version.shortStamp=${tailscale.version}" ]; - meta = with lib; { + meta = { homepage = "https://tailscale.com"; description = "Allows users to use a GitOps flow for managing Tailscale ACLs"; - license = licenses.bsd3; + license = lib.licenses.bsd3; mainProgram = "gitops-pusher"; - teams = [ teams.cyberus ]; + teams = [ lib.teams.cyberus ]; }; } diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index c3891e1badffd..e4f5c4a1c8c17 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.86.5"; + version = "1.88.3"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-fEQsusnp/XtKyXQD+M3nAP7zpsnr/TD5rt1b366LtKw="; + hash = "sha256-gw4oexTyJGeBkCd07RQQdfY14xArgVIMDHKrWu9K+9Q="; }; - vendorHash = "sha256-4QTSspHLYJfzlontQ7msXyOB5gzq7ZwSvWmKuYY5klA="; + vendorHash = "sha256-8aE6dWMkTLdWRD9WnLVSzpOQQh61voEnjZAJHtbGCSs="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/tb/tbb_2020/package.nix b/pkgs/by-name/tb/tbb_2020/package.nix deleted file mode 100644 index a5d6b0fbb2357..0000000000000 --- a/pkgs/by-name/tb/tbb_2020/package.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ - lib, - stdenv, - fetchpatch, - fetchurl, - fetchFromGitHub, - fixDarwinDylibNames, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tbb"; - version = "2020.3.3"; - - outputs = [ - "out" - "dev" - ]; - - src = fetchFromGitHub { - owner = "oneapi-src"; - repo = "oneTBB"; - tag = "v${finalAttrs.version}"; - hash = "sha256-pCZpQ+t7dDzuS4vhlfSVLwieI0iSQHukXb8Nk5kMMBo="; - }; - - patches = [ - # Fixes build with Musl. - (fetchpatch { - url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch"; - hash = "sha256-Oo5FSBPPBaOziWEBOlRmTmbulExMsAmQWBR5faOj1a0="; - }) - - # Fixes build with Musl. - (fetchpatch { - url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; - hash = "sha256-xp8J/il855VTFIKCN/bFtf+vif6HzcVl4t4/L9nW/xk="; - }) - - # Fixes build for aarch64-darwin - (fetchpatch { - name = "aarch64-darwin.patch"; - url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch"; - hash = "sha256-+sNU8yEsVVmQYOCKmlNiyJfKmB/U0GKAmrydwkfrDFQ="; - }) - ]; - - nativeBuildInputs = ( - lib.optionals stdenv.hostPlatform.isDarwin [ - fixDarwinDylibNames - ] - ); - - makeFlags = - lib.optionals stdenv.cc.isClang [ - "compiler=clang" - ] - ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) ( - if stdenv.hostPlatform.isAarch64 then - "arch=arm64" - else if stdenv.hostPlatform.isx86_64 then - "arch=intel64" - else if stdenv.hostPlatform.isi686 then - "arch=ia32" - else - throw "Unsupported cross architecture" - )); - - # Fix undefined reference errors with version script under LLVM. - NIX_LDFLAGS = lib.optionalString ( - stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17" - ) "--undefined-version"; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ - mv include $out/ - rm $out/include/index.html - - runHook postInstall - ''; - - pcTemplate = fetchurl { - url = "https://github.com/oneapi-src/oneTBB/raw/478de5b1887c928e52f029d706af6ea640a877be/integration/pkg-config/tbb.pc.in"; - hash = "sha256-2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI="; - }; - - postInstall = '' - # Generate pkg-config file based on upstream template. - # It should not be necessary with tbb after 2021.2. - mkdir -p "$out/lib/pkgconfig" - substitute "${finalAttrs.pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \ - --subst-var-by CMAKE_INSTALL_PREFIX "$out" \ - --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \ - --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \ - --subst-var-by TBB_VERSION "${finalAttrs.version}" \ - --subst-var-by TBB_LIB_NAME "tbb" - ''; - - meta = { - description = "Intel Thread Building Blocks C++ Library"; - homepage = "http://threadingbuildingblocks.org/"; - license = lib.licenses.asl20; - longDescription = '' - Intel Threading Building Blocks offers a rich and complete approach to - expressing parallelism in a C++ program. It is a library that helps you - take advantage of multi-core processor performance without having to be a - threading expert. Intel TBB is not just a threads-replacement library. It - represents a higher-level, task-based parallelism that abstracts platform - details and threading mechanisms for scalability and performance. - ''; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - silvanshade - thoughtpolice - tmarkus - ]; - }; -}) diff --git a/pkgs/by-name/th/thrift/package.nix b/pkgs/by-name/th/thrift/package.nix index 7b32a64faad91..ac0a73247061a 100644 --- a/pkgs/by-name/th/thrift/package.nix +++ b/pkgs/by-name/th/thrift/package.nix @@ -1,8 +1,7 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, boost, zlib, libevent, @@ -12,16 +11,19 @@ pkg-config, bison, flex, + ctestCheckHook, static ? stdenv.hostPlatform.isStatic, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "thrift"; - version = "0.18.1"; + version = "0.22.0"; - src = fetchurl { - url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-BMbxDl14jKeOE+4u8NIVLHsHDAr1VIPWuULinP8pZyY="; + src = fetchFromGitHub { + owner = "apache"; + repo = "thrift"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gGAO+D0A/hEoHMm6OvRBc1Mks9y52kfd0q/Sg96pdW4="; }; # Workaround to make the Python wrapper not drop this package: @@ -58,62 +60,26 @@ stdenv.mkDerivation rec { zlib ]; - postPatch = '' - # Python 3.10 related failures: - # SystemError: PY_SSIZE_T_CLEAN macro must be defined for '#' formats - # AttributeError: module 'collections' has no attribute 'Hashable' - substituteInPlace test/py/RunClientServer.py \ - --replace "'FastbinaryTest.py'," "" \ - --replace "'TestEof.py'," "" \ - --replace "'TestFrozen.py'," "" - - # these functions are removed in Python3.12 - substituteInPlace test/py/SerializationTest.py \ - --replace-fail "assertEquals" "assertEqual" \ - --replace-fail "assertNotEquals" "assertNotEqual" - ''; + nativeCheckInputs = [ ctestCheckHook ]; preConfigure = '' export PY_PREFIX=$out ''; - patches = [ - # ToStringTest.cpp is failing from some reason due to locale issue, this - # doesn't disable all UnitTests as in Darwin. - ./disable-failing-test.patch - (fetchpatch { - name = "setuptools-gte-62.1.0.patch"; # https://github.com/apache/thrift/pull/2635 - url = "https://github.com/apache/thrift/commit/c41ad9d5119e9bdae1746167e77e224f390f2c42.diff"; - hash = "sha256-FkErrg/6vXTomS4AsCsld7t+Iccc55ZiDaNjJ3W1km0="; - }) - (fetchpatch { - name = "thrift-install-FindLibevent.patch"; # https://github.com/apache/thrift/pull/2726 - url = "https://github.com/apache/thrift/commit/2ab850824f75d448f2ba14a468fb77d2594998df.diff"; - hash = "sha256-ejMKFG/cJgoPlAFzVDPI4vIIL7URqaG06/IWdQ2NkhY="; - }) - (fetchpatch { - name = "thrift-fix-tests-OpenSSL3.patch"; # https://github.com/apache/thrift/pull/2760 - url = "https://github.com/apache/thrift/commit/eae3ac418f36c73833746bcd53e69ed8a12f0e1a.diff"; - hash = "sha256-0jlN4fo94cfGFUKcLFQgVMI/x7uxn5OiLiFk6txVPzs="; - }) - ]; - cmakeFlags = [ - "-DBUILD_JAVASCRIPT:BOOL=OFF" - "-DBUILD_NODEJS:BOOL=OFF" + (lib.cmakeBool "BUILD_JAVASCRIPT" false) + (lib.cmakeBool "BUILD_NODEJS" false) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) + (lib.cmakeBool "OPENSSL_USE_STATIC_LIBS" static) # FIXME: Fails to link in static mode with undefined reference to # `boost::unit_test::unit_test_main(bool (*)(), int, char**)' - "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}" - ] - ++ lib.optionals static [ - "-DWITH_STATIC_LIB:BOOL=ON" - "-DOPENSSL_USE_STATIC_LIBS=ON" + (lib.cmakeBool "BUILD_TESTING" (!static)) ]; disabledTests = [ - "PythonTestSSLSocket" - "PythonThriftTNonblockingServer" + "UnitTests" # getaddrinfo() -> -3; Temporary failure in name resolution + "python_test" # many failures about python 2 or network things ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Tests that hang up in the Darwin sandbox @@ -138,14 +104,6 @@ stdenv.mkDerivation rec { doCheck = !static; - checkPhase = '' - runHook preCheck - - ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))" - - runHook postCheck - ''; - enableParallelChecking = false; meta = with lib; { @@ -156,4 +114,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index 84acdafc39b73..1286d54fb83ae 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -9,7 +9,7 @@ bzip2, zstd, spdlog, - tbb_2022, + onetbb, openssl, boost, libpqxx, @@ -35,7 +35,6 @@ let cp -r ${rapidcheck.dev}/* $out ''; catch2 = catch2_3; - tbb = tbb_2022; in stdenv.mkDerivation rec { pname = "tiledb"; @@ -100,7 +99,7 @@ stdenv.mkDerivation rec { bzip2 zstd spdlog - tbb + onetbb openssl boost libpqxx @@ -135,7 +134,7 @@ stdenv.mkDerivation rec { ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib + install_name_tool -add_rpath ${onetbb}/lib $out/lib/libtiledb.dylib ''; meta = { diff --git a/pkgs/by-name/ti/time/package.nix b/pkgs/by-name/ti/time/package.nix index dca11222ef248..af26954c2c576 100644 --- a/pkgs/by-name/ti/time/package.nix +++ b/pkgs/by-name/ti/time/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, }: @@ -16,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # fixes cross-compilation to riscv64-linux ./time-1.9-implicit-func-decl-clang.patch + # fix compilation with gcc15 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/time/raw/191440912c2e9a63af87802e507ca3ccb923e805/f/time-1.9-Fix-compiling-with-GCC15.patch"; + hash = "sha256-4Qp3mV8XuCmz518GPtrW52gyaPOb+97RE6FDPKNCyJw="; + }) ]; meta = { diff --git a/pkgs/by-name/to/todds/package.nix b/pkgs/by-name/to/todds/package.nix index 9712ba56802e8..e77fec6f4e253 100644 --- a/pkgs/by-name/to/todds/package.nix +++ b/pkgs/by-name/to/todds/package.nix @@ -9,7 +9,7 @@ fmt, hyperscan, opencv, - tbb_2022, + onetbb, fetchFromGitHub, }: stdenv.mkDerivation (finalAttrs: { @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { fmt hyperscan opencv - tbb_2022 + onetbb ]; strictDeps = true; diff --git a/pkgs/by-name/to/toml11/package.nix b/pkgs/by-name/to/toml11/package.nix index 472f01d79c32c..8bf21b712a05f 100644 --- a/pkgs/by-name/to/toml11/package.nix +++ b/pkgs/by-name/to/toml11/package.nix @@ -3,45 +3,58 @@ stdenv, fetchFromGitHub, cmake, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "toml11"; - version = "3.7.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "ToruNiina"; repo = "toml11"; - rev = "v${finalAttrs.version}"; - hash = "sha256-HnhXBvIjo1JXhp+hUQvjs83t5IBVbNN6o3ZGhB4WESQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-NnM+I43UVcd72Y9h+ysAAc7s5gZ78mjVwIMReTJ7G5M="; + fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "literal-operator-whitespace.patch"; + url = "https://patch-diff.githubusercontent.com/raw/ToruNiina/toml11/pull/285.patch"; + hash = "sha256-LZPr/cY6BZXC6/rBIAMCcqEdnhJs1AvbrPjpHF76uKg="; + }) + ]; + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + (lib.cmakeBool "TOML11_BUILD_TOML_TESTS" true) + ]; + doCheck = true; - meta = with lib; { + meta = { + changelog = "https://github.com/ToruNiina/toml11/blob/${finalAttrs.src.tag}/docs/content.en/docs/changelog/_index.md"; homepage = "https://github.com/ToruNiina/toml11"; description = "TOML for Modern C++"; longDescription = '' toml11 is a C++11 (or later) header-only toml parser/encoder depending only on C++ standard library. - - It is compatible to the latest version of TOML v1.0.0. - - It is one of the most TOML standard compliant libraries, tested with - the language agnostic test suite for TOML parsers by BurntSushi. - - It shows highly informative error messages. - - It has configurable container. You can use any random-access containers - and key-value maps as backend containers. - - It optionally preserves comments without any overhead. - - It has configurable serializer that supports comments, inline tables, - literal strings and multiline strings. - - It supports user-defined type conversion from/into toml values. - - It correctly handles UTF-8 sequences, with or without BOM, both on posix - and Windows. + - It complies with the latest TOML language specification. + - It passes all the standard TOML language test cases. + - It supports new features merged into the upcoming TOML version (v1.1.0). + - It provides clear error messages, including the location of the error. + - It parses and retains comments, associating them with corresponding values. + - It maintains formatting information such as hex integers and considers these during serialization. + - It provides exception-less parse function. + - It supports complex type conversions from TOML values. + - It allows customization of the types stored in toml::value. + - It provides some extensions not present in the TOML language standard. ''; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix ++ platforms.windows; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.cobalt ]; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; }) diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 93c962e8fad00..8277793d3b250 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -12,7 +12,7 @@ dbus, freetype, glfw, - tbb, + onetbb, withGtkFileSelector ? false, gtk3, @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ capstone freetype - tbb + onetbb ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ] diff --git a/pkgs/by-name/tr/trlib/package.nix b/pkgs/by-name/tr/trlib/package.nix index aec21ad636bf0..3309a7244e94a 100644 --- a/pkgs/by-name/tr/trlib/package.nix +++ b/pkgs/by-name/tr/trlib/package.nix @@ -30,6 +30,14 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # ref. https://github.com/felixlen/trlib/pull/25 + # This PR was merged upstream, so the patch can be removed on next release + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required (VERSION 3.1)" \ + "cmake_minimum_required (VERSION 3.13)" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ blas diff --git a/pkgs/by-name/tu/tuntox/package.nix b/pkgs/by-name/tu/tuntox/package.nix index dc3c0fbc1a131..816a508ad8cdf 100644 --- a/pkgs/by-name/tu/tuntox/package.nix +++ b/pkgs/by-name/tu/tuntox/package.nix @@ -1,99 +1,48 @@ { lib, stdenv, - cscope, fetchFromGitHub, - fetchpatch, - git, - libevent, - libopus, - libsodium, - libtoxcore, - libvpx, - msgpack, pkg-config, + libtoxcore, python3, - python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tuntox"; - version = "0.0.10"; + version = "0.0.10.1-unstable-2025-08-27"; src = fetchFromGitHub { owner = "gjedeer"; repo = "tuntox"; - rev = version; - sha256 = "sha256-c/0OxUH8iw8nRuVg4Fszf6Z/JiEV+m0B2ofzy81uFu8="; + rev = "4c9fc50da3f7d7b3d5e3981ede66819644e1af0d"; + hash = "sha256-mqhCLIJOQfiSWi6iY56ZPQmXSLhdC/yX1KAItEz8sZo="; }; nativeBuildInputs = [ - cscope - git pkg-config ]; buildInputs = [ - libopus libtoxcore - libsodium - libevent - libvpx - msgpack - python3 ]; - pythonBuildInputs = with python3Packages; [ - jinja2 - requests - ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; - patches = [ - # https://github.com/gjedeer/tuntox/pull/67 - (fetchpatch { - url = "https://github.com/gjedeer/tuntox/compare/a646402f42e120c7148d4de29dbdf5b09027a80a..365d2e5cbc0e3655fb64c204db0515f5f4cdf5a4.patch"; - sha256 = "sha256-P3uIRnV+pBi3s3agGYUMt2PZU4CRxx/DUR8QPVQ+UN8="; - }) - ]; + buildFlags = [ "tuntox_nostatic" ]; postPatch = '' - substituteInPlace gitversion.h --replace '7d45afdf7d00a95a8c3687175e2b1669fa1f7745' '365d2e5cbc0e3655fb64c204db0515f5f4cdf5a4' - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace Makefile --replace ' -static ' ' ' - substituteInPlace Makefile --replace 'CC=gcc' ' ' - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace Makefile.mac --replace '.git/HEAD .git/index' ' ' - substituteInPlace Makefile.mac --replace '/usr/local/lib/libtoxcore.a' '${libtoxcore}/lib/libtoxcore.a' - substituteInPlace Makefile.mac --replace '/usr/local/lib/libsodium.a' '${libsodium}/lib/libsodium.dylib' - substituteInPlace Makefile.mac --replace 'CC=gcc' ' ' + substituteInPlace Makefile \ + --replace-fail '$(shell git rev-parse HEAD)' "${finalAttrs.src.rev}" ''; - buildPhase = - '''' - + lib.optionalString stdenv.hostPlatform.isLinux '' - make - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - make -f Makefile.mac tuntox - ''; - - installPhase = '' - mkdir -p $out/bin - mv tuntox $out/bin/ - ''; - - doCheck = false; - - meta = with lib; { + meta = { description = "Tunnel TCP connections over the Tox protocol"; mainProgram = "tuntox"; homepage = "https://github.com/gjedeer/tuntox"; - license = licenses.gpl3; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ willcohen ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tv/tvm/package.nix b/pkgs/by-name/tv/tvm/package.nix index e4e94deb3170e..29bdd9ae89029 100644 --- a/pkgs/by-name/tv/tvm/package.nix +++ b/pkgs/by-name/tv/tvm/package.nix @@ -18,12 +18,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - # TVM CMake build uses some sources in the project's ./src/target/opt/ - # directory which errneously gets mangled by the eager `fixCmakeFiles` - # function in Nix's CMake setup-hook.sh to ./src/target/var/empty/, - # which then breaks the build. Toggling this flag instructs Nix to - # not mangle the legitimate use of the opt/ folder. - dontFixCmake = true; meta = with lib; { homepage = "https://tvm.apache.org/"; diff --git a/pkgs/by-name/ua/uavs3d/package.nix b/pkgs/by-name/ua/uavs3d/package.nix index a0b6198965483..085eed38d3eda 100644 --- a/pkgs/by-name/ua/uavs3d/package.nix +++ b/pkgs/by-name/ua/uavs3d/package.nix @@ -32,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; + # Fix the build with CMake 4. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 3.1)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; + passthru = { updateScript = unstableGitUpdater { }; tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix index 393842b7b07be..b3a10fc8454e3 100644 --- a/pkgs/by-name/uc/ucx/package.nix +++ b/pkgs/by-name/uc/ucx/package.nix @@ -32,11 +32,8 @@ let name = "rocm"; paths = rocmList; }; - - # rocm build fails with gcc stdenv due to unrecognised arg parallel-jobs - stdenv' = if enableRocm then rocmPackages.stdenv else stdenv; in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "ucx"; version = "1.19.0"; diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index 419f16eb7c4d1..20e6377951ab2 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -7,7 +7,7 @@ openssl, zeromq, cppzmq, - tbb_2022, + onetbb, spdlog, libsodium, fmt, @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { openssl zeromq cppzmq - tbb_2022 + onetbb spdlog libsodium fmt diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index fe24b22775b11..99fcaf1497c44 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -56,13 +56,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.23.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "unbound"; tag = "release-${finalAttrs.version}"; - hash = "sha256-65bv/AYQ3Dxwuwv49dU2UuA2imZFbUWnQEJESJvqC6w="; + hash = "sha256-M5gn18HTgcpqsOZGtxPoQbQd5tPW3T4r0YeMK5Mwgls="; }; outputs = [ diff --git a/pkgs/by-name/un/unittest-cpp/package.nix b/pkgs/by-name/un/unittest-cpp/package.nix index 58f859ae43eab..8ddbc575fbe50 100644 --- a/pkgs/by-name/un/unittest-cpp/package.nix +++ b/pkgs/by-name/un/unittest-cpp/package.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { }) ]; + # Fix the build with CMake 4. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.1)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; + # Fix 'Version:' setting in .pc file. TODO: remove once upstreamed: # https://github.com/unittest-cpp/unittest-cpp/pull/188 cmakeFlags = [ "-DPACKAGE_VERSION=${version}" ]; diff --git a/pkgs/by-name/us/usrsctp/package.nix b/pkgs/by-name/us/usrsctp/package.nix index 9d5e72f1f2c65..5d3ee93d9670e 100644 --- a/pkgs/by-name/us/usrsctp/package.nix +++ b/pkgs/by-name/us/usrsctp/package.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { url = "https://github.com/sctplab/usrsctp/commit/ac559d2a95277e5e0827e9ee5a1d3b1b50e0822a.patch"; hash = "sha256-QBlzH37Xwwnn1y8pM941Zesz18p2EazfeD0lCU8n6nI="; }) + + (fetchpatch { + name = "usrsctp-fix-cmake-4.patch"; + url = "https://github.com/sctplab/usrsctp/commit/7569d2ce1e8658534369ad9726ca62139211db84.patch"; + hash = "sha256-Hxp1SGwmpm6UK//KFLQoOmmI0a1QpSNaTaEEUbC8jbg="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix index a75d5555be921..049a99ef79e78 100644 --- a/pkgs/by-name/ut/utf8proc/package.nix +++ b/pkgs/by-name/ut/utf8proc/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = "utf8proc"; rev = "v${version}"; - hash = "sha256-wmtMo6eBK/xxxkIeJfh5Yb293po9cKK+7WjqNPoxM9g="; + hash = "sha256-iNITnxA1cacOBRU/XV22yzjB0XUOCYsaLLLPYLa+AoA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index eb0da7a33da8c..70303a99050ea 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -21,6 +21,7 @@ pam, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, + systemdLibs, sqlite, nlsSupport ? true, translateManpages ? true, @@ -28,6 +29,7 @@ installShellFiles, writeSupport ? stdenv.hostPlatform.isLinux, shadowSupport ? stdenv.hostPlatform.isLinux, + coreutils, # Doesn't build on Darwin, only makes sense on systems which have pam withLastlog ? !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform pam, gitUpdater, @@ -37,12 +39,12 @@ let isMinimal = cryptsetupSupport == false && !nlsSupport && !ncursesSupport && !systemdSupport; in -stdenv.mkDerivation (finalPackage: rec { +stdenv.mkDerivation (finalAttrs: { pname = "util-linux" + lib.optionalString isMinimal "-minimal"; version = "2.41.1"; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; + url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor finalAttrs.version}/util-linux-${finalAttrs.version}.tar.xz"; hash = "sha256-vprZonb0MFq33S9SJci+H/VDUvVl/03t6WKMGqp97Fc="; }; @@ -125,7 +127,7 @@ stdenv.mkDerivation (finalPackage: rec { (lib.enableFeature translateManpages "poman") "SYSCONFSTATICDIR=${placeholder "lib"}/lib" ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "scanf_cv_type_modifier=ms" + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "scanf_cv_type_modifier=ms" ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ # These features are all disabled in the freebsd-ports distribution "--disable-nls" @@ -164,52 +166,47 @@ stdenv.mkDerivation (finalPackage: rec { ++ lib.optionals pamSupport [ pam ] ++ lib.optionals capabilitiesSupport [ libcap_ng ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals systemdSupport [ systemd ]; - - doCheck = false; # "For development purpose only. Don't execute on production system!" + ++ lib.optionals systemdSupport [ systemdLibs ]; enableParallelBuilding = true; - postInstall = - lib.optionalString stdenv.hostPlatform.isLinux '' - moveToOutput bin/mount "$mount" - moveToOutput bin/umount "$mount" - ln -svf "$mount/bin/"* $bin/bin/ - '' - + '' + postInstall = '' + moveToOutput sbin/nologin "$login" + moveToOutput sbin/sulogin "$login" + prefix=$login _moveSbin + ln -svf "$login/bin/"* $bin/bin/ - moveToOutput sbin/nologin "$login" - moveToOutput sbin/sulogin "$login" - prefix=$login _moveSbin - ln -svf "$login/bin/"* $bin/bin/ - '' - + lib.optionalString withLastlog '' - # moveToOutput "lib/liblastlog2*" "$lastlog" - ${lib.optionalString (!stdenv.hostPlatform.isStatic) ''moveToOutput "lib/security" "$lastlog"''} - moveToOutput "lib/tmpfiles.d/lastlog2-tmpfiles.conf" "$lastlog" + ln -svf "$bin/bin/hexdump" "$bin/bin/hd" + ln -svf "$man/share/man/man1/hexdump.1" "$man/share/man/man1/hd.1" - moveToOutput "bin/lastlog2" "$lastlog" - ln -svf "$lastlog/bin/"* $bin/bin/ - '' - + lib.optionalString (withLastlog && systemdSupport) '' - moveToOutput "lib/systemd/system/lastlog2-import.service" "$lastlog" - substituteInPlace $lastlog/lib/systemd/system/lastlog2-import.service \ - --replace-fail "$bin/bin/lastlog2" "$lastlog/bin/lastlog2" - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' + installShellCompletion --bash bash-completion/* + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + moveToOutput bin/mount "$mount" + moveToOutput bin/umount "$mount" + ln -svf "$mount/bin/"* $bin/bin/ + + moveToOutput sbin/swapon "$swap" + moveToOutput sbin/swapoff "$swap" + prefix=$swap _moveSbin + ln -svf "$swap/bin/"* $bin/bin/ + '' + + lib.optionalString withLastlog '' + ${lib.optionalString (!stdenv.hostPlatform.isStatic) ''moveToOutput "lib/security" "$lastlog"''} + moveToOutput "lib/tmpfiles.d/lastlog2-tmpfiles.conf" "$lastlog" - moveToOutput sbin/swapon "$swap" - moveToOutput sbin/swapoff "$swap" - prefix=$swap _moveSbin - ln -svf "$swap/bin/"* $bin/bin/ - '' - + '' + moveToOutput "bin/lastlog2" "$lastlog" + ln -svf "$lastlog/bin/"* $bin/bin/ - ln -svf "$bin/bin/hexdump" "$bin/bin/hd" - ln -svf "$man/share/man/man1/hexdump.1" "$man/share/man/man1/hd.1" + '' + + lib.optionalString (withLastlog && systemdSupport) '' + moveToOutput "lib/systemd/system/lastlog2-import.service" "$lastlog" + substituteInPlace $lastlog/lib/systemd/system/lastlog2-import.service \ + --replace-fail "/usr/bin/mv" "${lib.getExe' coreutils "mv"}" \ + --replace-fail "$bin/bin/lastlog2" "$lastlog/bin/lastlog2" + ''; - installShellCompletion --bash bash-completion/* - ''; + doCheck = false; # "For development purpose only. Don't execute on production system!" passthru = { updateScript = gitUpdater { @@ -231,7 +228,7 @@ stdenv.mkDerivation (finalPackage: rec { meta = { homepage = "https://www.kernel.org/pub/linux/utils/util-linux/"; description = "Set of system utilities for Linux"; - changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor version}/v${version}-ReleaseNotes"; + changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor finalAttrs.version}/v${finalAttrs.version}-ReleaseNotes"; # https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing license = with lib.licenses; [ gpl2Only diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 9eacfafb9571d..f77377765b659 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.8.14"; + version = "0.8.19"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-KG6WNaHbrPBasHdSdtWrnvzwMRrvpwukVSIZe3COrUA="; + hash = "sha256-TbCkkZQoRItBmzwn7B8JbXWs72lYiqWV5mOfkvRarsg="; }; - cargoHash = "sha256-Ow39kxnACXVbEtCPGJJ7SKdTFhYwd9IDPbYAsvNPOKw="; + cargoHash = "sha256-09A40qwbRex8WEgCFC2yRZoq+6UnxurJAX8e27G+Rhg="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/ve/veridian/package.nix b/pkgs/by-name/ve/veridian/package.nix index fc9770d53817c..85cdc66221fac 100644 --- a/pkgs/by-name/ve/veridian/package.nix +++ b/pkgs/by-name/ve/veridian/package.nix @@ -8,7 +8,7 @@ pkg-config, boost, - fmt_11, + fmt, openssl, sv-lang, mimalloc, @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage { buildInputs = [ boost - fmt_11 + fmt openssl sv-lang mimalloc diff --git a/pkgs/by-name/vi/viewres/package.nix b/pkgs/by-name/vi/viewres/package.nix new file mode 100644 index 0000000000000..5875c008db9a3 --- /dev/null +++ b/pkgs/by-name/vi/viewres/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libxaw, + libxmu, + libxt, + wrapWithXFileSearchPathHook, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "viewres"; + version = "1.0.8"; + + src = fetchurl { + url = "mirror://xorg/individual/app/viewres-${finalAttrs.version}.tar.xz"; + hash = "sha256-SyIcKxAzkLFmYzYSuav4A2y76QYF29ijfPKjd/orbNI="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + xorgproto + libxaw + libxmu + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Displays a tree showing the widget class hierarchy of the Athena Widget Set (libxaw)"; + homepage = "https://gitlab.freedesktop.org/xorg/app/viewres"; + license = lib.licenses.x11; + mainProgram = "viewres"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/vi/viskores/package.nix b/pkgs/by-name/vi/viskores/package.nix index 5f6e601e27bcd..76f248506fc38 100644 --- a/pkgs/by-name/vi/viskores/package.nix +++ b/pkgs/by-name/vi/viskores/package.nix @@ -6,7 +6,7 @@ cmake, ninja, llvmPackages, - tbb, + onetbb, mpi, mpiSupport ? true, testers, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - tbb + onetbb ] ++ lib.optional mpiSupport mpi ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix index a01d4a0e2829f..4cb3648a56c5d 100644 --- a/pkgs/by-name/w3/w3m/package.nix +++ b/pkgs/by-name/w3/w3m/package.nix @@ -105,6 +105,9 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-ssl=${openssl.dev}" "--with-gc=${boehmgc.dev}" + # The code won't compile in c23 mode. + # https://gcc.gnu.org/gcc-15/porting_to.html#c23-fn-decls-without-parameters + "CFLAGS=-std=gnu17" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 7f4aacb50d798..56928c88ffbd1 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -15,6 +15,8 @@ libevent, double-conversion, + ctestCheckHook, + gtest, nix-update-script, @@ -22,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.04.21.00"; + version = "2025.09.15.00"; outputs = [ "out" @@ -33,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-t3b+R2tb4VTsjDL9Jzjcaehs5k+BLNLilm3+nXxyjj0="; + hash = "sha256-S2L3ifQTwyidz3x5pPrVEGEJXvM1czqTRXYsYUqIeRY="; }; patches = [ @@ -55,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: { double-conversion ]; + nativeCheckInputs = [ + ctestCheckHook + ]; + checkInputs = [ gtest ]; @@ -71,41 +77,20 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_DIR" "${placeholder "dev"}/lib/cmake/wangle") ]; - env.GTEST_FILTER = - "-" - + lib.concatStringsSep ":" ( - [ - # these depend on example pem files from the folly source tree (?) - "SSLContextManagerTest.TestSingleClientCAFileSet" - "SSLContextManagerTest.TestMultipleClientCAsSet" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # flaky - "BroadcastPoolTest.ThreadLocalPool" - "Bootstrap.UDPClientServerTest" - ] - ); - __darwinAllowLocalNetworking = true; doCheck = true; - checkPhase = '' - runHook preCheck - - ctest -j $NIX_BUILD_CORES --output-on-failure ${ - # Deterministic glibc abort 🫠 - # SSLContextManagerTest uses 15+ GB of RAM - lib.optionalString stdenv.hostPlatform.isLinux ( - lib.escapeShellArgs [ - "--exclude-regex" - "^(BootstrapTest|BroadcastPoolTest|SSLContextManagerTest)$" - ] - ) - } - - runHook postCheck - ''; + dontUseNinjaCheck = true; + + disabledTests = [ + # Deterministic glibc abort 🫠 + "BootstrapTest" + "BroadcastPoolTest" + + # SSLContextManagerTest uses 15+ GB of RAM + "SSLContextManagerTest" + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wa/watchman/Cargo.lock b/pkgs/by-name/wa/watchman/Cargo.lock index 9568411779adb..32d205250fa08 100644 --- a/pkgs/by-name/wa/watchman/Cargo.lock +++ b/pkgs/by-name/wa/watchman/Cargo.lock @@ -13,15 +13,15 @@ dependencies = [ [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "getrandom", @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" [[package]] name = "atty" @@ -58,15 +58,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -74,7 +74,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -85,9 +85,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" [[package]] name = "byteorder" @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "cfg_aliases" @@ -131,12 +131,6 @@ dependencies = [ "vec_map", ] -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - [[package]] name = "crossbeam" version = "0.8.4" @@ -273,7 +267,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.106", ] [[package]] @@ -309,13 +303,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "libc", - "wasi", + "r-efi", + "wasi 0.14.7+wasi-0.2.4", ] [[package]] @@ -324,6 +319,12 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" + [[package]] name = "heck" version = "0.3.3" @@ -342,6 +343,17 @@ dependencies = [ "libc", ] +[[package]] +name = "io-uring" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" +dependencies = [ + "bitflags 2.9.4", + "cfg-if", + "libc", +] + [[package]] name = "itoa" version = "1.0.15" @@ -366,26 +378,20 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.172" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" dependencies = [ "autocfg", "scopeguard", ] -[[package]] -name = "log" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" - [[package]] name = "maplit" version = "1.0.2" @@ -394,9 +400,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "memoffset" @@ -409,31 +415,31 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", - "wasi", - "windows-sys 0.52.0", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.59.0", ] [[package]] name = "nix" -version = "0.29.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.4", "cfg-if", "cfg_aliases", "libc", @@ -449,6 +455,25 @@ dependencies = [ "winapi", ] +[[package]] +name = "objc2-core-foundation" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166" +dependencies = [ + "bitflags 2.9.4", +] + +[[package]] +name = "objc2-io-kit" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a" +dependencies = [ + "libc", + "objc2-core-foundation", +] + [[package]] name = "object" version = "0.36.7" @@ -466,9 +491,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "os_pipe" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" +checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224" dependencies = [ "libc", "windows-sys 0.59.0", @@ -476,9 +501,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" dependencies = [ "lock_api", "parking_lot_core", @@ -486,15 +511,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -535,9 +560,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] @@ -551,11 +576,17 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -563,9 +594,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -573,18 +604,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.11" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.4", ] [[package]] name = "rustc-demangle" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "ryu" @@ -600,10 +631,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.224" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "6aaeb1e94f53b16384af593c71e20b095e958dab1d26939c1b70645c5cfbcc0b" dependencies = [ + "serde_core", "serde_derive", ] @@ -621,78 +653,108 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.17" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" +checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8" dependencies = [ "serde", + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.224" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32f39390fa6346e24defbcdd3d9544ba8a19985d0af74df8501fbfe9a64341ab" +dependencies = [ + "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.224" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "87ff78ab5e8561c9a675bfc1785cb07ae721f0ee53329a595cefd8c04c2ac4e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.106", ] [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] name = "shared_child" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c" +checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7" dependencies = [ "libc", - "windows-sys 0.59.0", + "sigchld", + "windows-sys 0.60.2", ] [[package]] -name = "signal-hook-registry" -version = "1.4.5" +name = "sigchld" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1" dependencies = [ "libc", + "os_pipe", + "signal-hook", ] [[package]] -name = "slab" -version = "0.4.9" +name = "signal-hook" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" dependencies = [ - "autocfg", + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +dependencies = [ + "libc", ] +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -738,9 +800,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.100" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -749,16 +811,15 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "3c3ffa3e4ff2b324a57f7aeb3c349656c7b127c3c189520251a648102a92496e" dependencies = [ - "cfg-if", - "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", - "rayon", + "objc2-core-foundation", + "objc2-io-kit", "windows", ] @@ -782,41 +843,43 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.69" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.106", ] [[package]] name = "tokio" -version = "1.44.2" +version = "1.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", + "slab", "socket2", "tokio-macros", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -827,20 +890,21 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.106", ] [[package]] name = "tokio-util" -version = "0.6.10" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "log", + "futures-util", + "hashbrown", "pin-project-lite", "slab", "tokio", @@ -858,18 +922,18 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", ] [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unicode-segmentation" @@ -897,9 +961,27 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasi" +version = "0.14.7+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] [[package]] name = "watchman_client" @@ -959,30 +1041,104 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.61.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +dependencies = [ + "windows-collections", + "windows-core", + "windows-future", + "windows-link", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" dependencies = [ "windows-core", - "windows-targets", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-targets", + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] -name = "windows-sys" -version = "0.52.0" +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core", + "windows-link", + "windows-threading", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" dependencies = [ - "windows-targets", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core", + "windows-link", +] + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", ] [[package]] @@ -991,7 +1147,16 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.3", ] [[package]] @@ -1000,14 +1165,40 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link", ] [[package]] @@ -1016,64 +1207,118 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.106", ] diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 06c45602b4921..960f02a703557 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -11,7 +11,6 @@ cargo, rustPlatform, ensureNewerSourcesForZipFilesHook, - removeReferencesTo, pcre2, openssl, @@ -35,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2025.04.21.00"; + version = "2025.09.15.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-eZRrG7bgmh7hW7ihQISQP5pnWAVGhDLL93rCP7ZtUnA="; + hash = "sha256-ZIFGCOoIuy4Ns51oek3HnBLtCSnI742FTA2YmorBpyk="; }; patches = [ @@ -56,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { cargo rustPlatform.cargoSetupHook ensureNewerSourcesForZipFilesHook - removeReferencesTo ]; buildInputs = [ @@ -95,12 +93,20 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs . + cp ${./Cargo.lock} ${finalAttrs.cargoRoot}/Cargo.lock - ''; - postFixup = '' - # TODO: Do this in `fmt` rather than downstream. - remove-references-to -t ${folly.fmt.dev} $out/bin/* + # The build system looks for `/usr/bin/python3`. It falls back + # gracefully if it’s not found, but let’s dodge the potential + # reproducibility risk for unsandboxed Darwin. + substituteInPlace CMakeLists.txt \ + --replace-fail /usr/bin /var/empty + + # Facebook Thrift requires C++20 now but Watchman hasn’t been + # updated yet… (Aren’t these things meant to be integrated together + # in a monorepo?) + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CMAKE_CXX_STANDARD 17)' 'set(CMAKE_CXX_STANDARD 20)' ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index 49b114da935c7..1633cb8018d3b 100644 --- a/pkgs/by-name/we/webex/package.nix +++ b/pkgs/by-name/we/webex/package.nix @@ -50,7 +50,7 @@ xcbutilrenderutil, xcbutilwm, p7zip, - tbb, + onetbb, wayland, libXScrnSaver, }: @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { xcbutilkeysyms xcbutilrenderutil xcbutilwm - tbb + onetbb wayland ]; diff --git a/pkgs/by-name/we/webrtc-audio-processing/abseil-202508.patch b/pkgs/by-name/we/webrtc-audio-processing/abseil-202508.patch new file mode 100644 index 0000000000000..1c5bb9e834b7c --- /dev/null +++ b/pkgs/by-name/we/webrtc-audio-processing/abseil-202508.patch @@ -0,0 +1,282 @@ +diff --git a/webrtc/api/audio/audio_processing.h b/webrtc/api/audio/audio_processing.h +index dca75f2174dd1a42a21c6f46472f7686bfc79ca9..4580ba9fd9af339123a0516ab539208a71810c84 100644 +--- a/webrtc/api/audio/audio_processing.h ++++ b/webrtc/api/audio/audio_processing.h +@@ -28,6 +28,7 @@ + #include + #include + ++#include "absl/base/config.h" + #include "absl/base/nullability.h" + #include "absl/strings/string_view.h" + #include "api/array_view.h" +@@ -632,6 +633,7 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface { + // return value of true indicates that the file has been + // sucessfully opened, while a value of false indicates that + // opening the file failed. ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + virtual bool CreateAndAttachAecDump( + absl::string_view file_name, + int64_t max_log_size_bytes, +@@ -640,6 +642,16 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface { + absl::Nonnull handle, + int64_t max_log_size_bytes, + absl::Nonnull worker_queue) = 0; ++#else ++ virtual bool CreateAndAttachAecDump(absl::string_view file_name, ++ int64_t max_log_size_bytes, ++ TaskQueueBase* absl_nonnull ++ worker_queue) = 0; ++ virtual bool CreateAndAttachAecDump(FILE* absl_nonnull handle, ++ int64_t max_log_size_bytes, ++ TaskQueueBase* absl_nonnull ++ worker_queue) = 0; ++#endif + + // TODO(webrtc:5298) Deprecated variant. + // Attaches provided webrtc::AecDump for recording debugging +diff --git a/webrtc/api/make_ref_counted.h b/webrtc/api/make_ref_counted.h +index b5f4e99c8530fe88e8a34b12a8fb69ee5b868c52..080023a83ff9487b56249dd7a0d93a2b5919aa67 100644 +--- a/webrtc/api/make_ref_counted.h ++++ b/webrtc/api/make_ref_counted.h +@@ -13,6 +13,7 @@ + #include + #include + ++#include "absl/base/config.h" + #include "absl/base/nullability.h" + #include "api/ref_count.h" + #include "api/scoped_refptr.h" +@@ -86,7 +87,11 @@ template < + typename std::enable_if && + std::is_abstract_v, + T>::type* = nullptr> ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + absl::Nonnull> make_ref_counted(Args&&... args) { ++#else ++absl_nonnull scoped_refptr make_ref_counted(Args&&... args) { ++#endif + return scoped_refptr(new RefCountedObject(std::forward(args)...)); + } + +@@ -99,7 +104,11 @@ template < + !std::is_convertible_v && + webrtc_make_ref_counted_internal::HasAddRefAndRelease::value, + T>::type* = nullptr> ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + absl::Nonnull> make_ref_counted(Args&&... args) { ++#else ++absl_nonnull scoped_refptr make_ref_counted(Args&&... args) { ++#endif + return scoped_refptr(new T(std::forward(args)...)); + } + +@@ -113,7 +122,11 @@ template < + !webrtc_make_ref_counted_internal::HasAddRefAndRelease::value, + + T>::type* = nullptr> ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + absl::Nonnull>> make_ref_counted( ++#else ++absl_nonnull scoped_refptr> make_ref_counted( ++#endif + Args&&... args) { + return scoped_refptr>( + new FinalRefCountedObject(std::forward(args)...)); +diff --git a/webrtc/api/scoped_refptr.h b/webrtc/api/scoped_refptr.h +index c6fb5605ca2ef97509109c113e3a7f8af2d7ca7b..8c441ff07adf3e55dfaa5c6a487d51e869d5ba94 100644 +--- a/webrtc/api/scoped_refptr.h ++++ b/webrtc/api/scoped_refptr.h +@@ -66,6 +66,7 @@ + #include + #include + ++#include "absl/base/config.h" + #include "absl/base/nullability.h" + + namespace webrtc { +@@ -73,13 +74,19 @@ namespace webrtc { + template + class ABSL_NULLABILITY_COMPATIBLE scoped_refptr { + public: ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + using absl_nullability_compatible = void; ++#endif + using element_type = T; + + scoped_refptr() : ptr_(nullptr) {} + scoped_refptr(std::nullptr_t) : ptr_(nullptr) {} // NOLINT(runtime/explicit) + ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + explicit scoped_refptr(absl::Nullable p) : ptr_(p) { ++#else ++ explicit scoped_refptr(T* absl_nullable p) : ptr_(p) { ++#endif + if (ptr_) + ptr_->AddRef(); + } +@@ -122,7 +129,11 @@ class ABSL_NULLABILITY_COMPATIBLE scoped_refptr { + return retVal; + } + ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + scoped_refptr& operator=(absl::Nullable p) { ++#else ++ scoped_refptr& operator=(T* absl_nullable p) { ++#endif + // AddRef first so that self assignment should work + if (p) + p->AddRef(); +@@ -152,7 +163,11 @@ class ABSL_NULLABILITY_COMPATIBLE scoped_refptr { + return *this; + } + ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + void swap(absl::Nonnull pp) noexcept { ++#else ++ void swap(T** absl_nonnull pp) noexcept { ++#endif + T* p = ptr_; + ptr_ = *pp; + *pp = p; +diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h b/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h +index 0d258a9ebc09f67a6bb5f37d524c64a68e040f3a..14d8b39a346a74437008c16e523b19b6c30c1e9f 100644 +--- a/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h ++++ b/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h +@@ -29,6 +29,7 @@ class RTC_EXPORT AecDumpFactory { + // The AecDump takes responsibility for `handle` and closes it in the + // destructor. A non-null return value indicates that the file has been + // sucessfully opened. ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + static absl::Nullable> Create( + FileWrapper file, + int64_t max_log_size_bytes, +@@ -41,6 +42,20 @@ class RTC_EXPORT AecDumpFactory { + absl::Nonnull handle, + int64_t max_log_size_bytes, + absl::Nonnull worker_queue); ++#else ++ static absl_nullable std::unique_ptr Create( ++ FileWrapper file, ++ int64_t max_log_size_bytes, ++ TaskQueueBase* absl_nonnull worker_queue); ++ static absl_nullable std::unique_ptr Create( ++ absl::string_view file_name, ++ int64_t max_log_size_bytes, ++ TaskQueueBase* absl_nonnull worker_queue); ++ static absl_nullable std::unique_ptr Create( ++ FILE* absl_nonnull handle, ++ int64_t max_log_size_bytes, ++ TaskQueueBase* absl_nonnull worker_queue); ++#endif + }; + + } // namespace webrtc +diff --git a/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc b/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc +index 63929afac41934a4a9cac6b56ce8517c099fbeff..658bcee7f48416f4c60333f0860f95c0dbbafd87 100644 +--- a/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc ++++ b/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc +@@ -16,6 +16,7 @@ + + namespace webrtc { + ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + absl::Nullable> AecDumpFactory::Create( + FileWrapper file, + int64_t max_log_size_bytes, +@@ -37,3 +38,27 @@ absl::Nullable> AecDumpFactory::Create( + return nullptr; + } + } // namespace webrtc ++#else ++absl_nullable std::unique_ptr AecDumpFactory::Create( ++ FileWrapper file, ++ int64_t max_log_size_bytes, ++ TaskQueueBase* absl_nonnull worker_queue) { ++ return nullptr; ++} ++ ++absl_nullable std::unique_ptr AecDumpFactory::Create( ++ absl::string_view file_name, ++ int64_t max_log_size_bytes, ++ TaskQueueBase* absl_nonnull worker_queue) { ++ return nullptr; ++} ++ ++absl_nullable std::unique_ptr AecDumpFactory::Create( ++ FILE* absl_nonnull handle, ++ int64_t max_log_size_bytes, ++ TaskQueueBase* absl_nonnull worker_queue) { ++ return nullptr; ++} ++} // namespace webrtc ++ ++#endif +diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc +index a1cba51a1158fad909150e39db592c2dd13cb1fd..1dfe26d4a83fc968651868cdfd22fd38f4595468 100644 +--- a/webrtc/modules/audio_processing/audio_processing_impl.cc ++++ b/webrtc/modules/audio_processing/audio_processing_impl.cc +@@ -19,6 +19,7 @@ + #include + #include + ++#include "absl/base/config.h" + #include "absl/base/nullability.h" + #include "absl/strings/match.h" + #include "absl/strings/string_view.h" +@@ -1787,7 +1788,11 @@ void AudioProcessingImpl::UpdateRecommendedInputVolumeLocked() { + bool AudioProcessingImpl::CreateAndAttachAecDump( + absl::string_view file_name, + int64_t max_log_size_bytes, ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + absl::Nonnull worker_queue) { ++#else ++ TaskQueueBase* absl_nonnull worker_queue) { ++#endif + std::unique_ptr aec_dump = + AecDumpFactory::Create(file_name, max_log_size_bytes, worker_queue); + if (!aec_dump) { +@@ -1801,7 +1806,11 @@ bool AudioProcessingImpl::CreateAndAttachAecDump( + bool AudioProcessingImpl::CreateAndAttachAecDump( + FILE* handle, + int64_t max_log_size_bytes, ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + absl::Nonnull worker_queue) { ++#else ++ TaskQueueBase* absl_nonnull worker_queue) { ++#endif + std::unique_ptr aec_dump = + AecDumpFactory::Create(handle, max_log_size_bytes, worker_queue); + if (!aec_dump) { +diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h +index ecdc055768bd2e9aa6b9ca7f11d5af4a648832ad..51a2bfbfaa812eea2ea7353483979d40e1ac7282 100644 +--- a/webrtc/modules/audio_processing/audio_processing_impl.h ++++ b/webrtc/modules/audio_processing/audio_processing_impl.h +@@ -20,6 +20,7 @@ + #include + #include + ++#include "absl/base/config.h" + #include "absl/base/nullability.h" + #include "absl/strings/string_view.h" + #include "api/array_view.h" +@@ -74,11 +75,19 @@ class AudioProcessingImpl : public AudioProcessing { + bool CreateAndAttachAecDump( + absl::string_view file_name, + int64_t max_log_size_bytes, ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + absl::Nonnull worker_queue) override; ++#else ++ TaskQueueBase* absl_nonnull worker_queue) override; ++#endif + bool CreateAndAttachAecDump( + FILE* handle, + int64_t max_log_size_bytes, ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 + absl::Nonnull worker_queue) override; ++#else ++ TaskQueueBase* absl_nonnull worker_queue) override; ++#endif + // TODO(webrtc:5298) Deprecated variant. + void AttachAecDump(std::unique_ptr aec_dump) override; + void DetachAecDump() override; diff --git a/pkgs/by-name/we/webrtc-audio-processing/package.nix b/pkgs/by-name/we/webrtc-audio-processing/package.nix index 03f309134a6da..6dfea3582b92e 100644 --- a/pkgs/by-name/we/webrtc-audio-processing/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing/package.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/commit/e9c78dc4712fa6362b0c839ad57b6b46dce1ba83.diff"; hash = "sha256-QXOtya7RA0UTV9VK4qpql5D8QcOKAn6qURZvPpWT+vg="; }) + + # fix build with abseil 202508 + # upstream PR: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/merge_requests/60 + ./abseil-202508.patch ]; outputs = [ diff --git a/pkgs/by-name/wo/woff2/gcc15.patch b/pkgs/by-name/wo/woff2/gcc15.patch new file mode 100644 index 0000000000000..7ba9eee11f1df --- /dev/null +++ b/pkgs/by-name/wo/woff2/gcc15.patch @@ -0,0 +1,37 @@ +From 08ece7871775c0d7bf4fdff64b961cdc256adf6c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 2 Aug 2024 22:12:03 +0100 +Subject: [PATCH] include/woff2/output.h: add missing include + +Without the change `woff2` build fails on upcoming `gcc-15` as: + + In file included from src/woff2_out.cc:9: + include/woff2/output.h:73:25: error: expected ')' before '*' token + 73 | WOFF2MemoryOut(uint8_t* buf, size_t buf_size); + | ~ ^ + | ) + include/woff2/output.h:79:3: error: 'uint8_t' does not name a type + 79 | uint8_t* buf_; + | ^~~~~~~ + include/woff2/output.h:16:1: note: 'uint8_t' is defined in header ''; + this is probably fixable by adding '#include ' + 15 | #include + +++ |+#include + 16 | +--- + include/woff2/output.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/woff2/output.h b/include/woff2/output.h +index dc78ccf..b12d538 100644 +--- a/include/woff2/output.h ++++ b/include/woff2/output.h +@@ -9,6 +9,8 @@ + #ifndef WOFF2_WOFF2_OUT_H_ + #define WOFF2_WOFF2_OUT_H_ + ++#include ++ + #include + #include + #include diff --git a/pkgs/by-name/wo/woff2/package.nix b/pkgs/by-name/wo/woff2/package.nix index 22d3ce49e41a3..bc9e6ec00e6fd 100644 --- a/pkgs/by-name/wo/woff2/package.nix +++ b/pkgs/by-name/wo/woff2/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; # Need to explicitly link to brotlicommon - patches = lib.optional static ./brotli-static.patch; + patches = lib.optional static ./brotli-static.patch ++ [ ./gcc15.patch ]; nativeBuildInputs = [ cmake @@ -44,6 +44,14 @@ stdenv.mkDerivation rec { postPatch = '' # without this binaries only get built if shared libs are disable sed 's@^if (NOT BUILD_SHARED_LIBS)$@if (TRUE)@g' -i CMakeLists.txt + + # Fix the build with CMake 4. + # + # See: + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.6)' \ + 'cmake_minimum_required(VERSION 3.10)' ''; meta = with lib; { diff --git a/pkgs/by-name/x2/x265/gcc15-fixes.patch b/pkgs/by-name/x2/x265/gcc15-fixes.patch new file mode 100644 index 0000000000000..ce89375861b9f --- /dev/null +++ b/pkgs/by-name/x2/x265/gcc15-fixes.patch @@ -0,0 +1,24 @@ +From 43e696a388ddf4ce5f4b9f756e726544b6310092 Mon Sep 17 00:00:00 2001 +From: ReenigneArcher +Date: Wed, 9 Jul 2025 14:41:33 +0000 +Subject: [PATCH] fix(dynamicHDR10): undefined-uint8_t + +--- + source/dynamicHDR10/json11/json11.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source/dynamicHDR10/json11/json11.cpp b/source/dynamicHDR10/json11/json11.cpp +index 762577735..c111ebb82 100644 +--- a/dynamicHDR10/json11/json11.cpp ++++ b/dynamicHDR10/json11/json11.cpp +@@ -22,6 +22,7 @@ + #include "json11.h" + #include + #include ++#include + #include + #include + #include +-- +2.49.0 + diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix index c34f5773d0e7f..e393bd0f67e28 100644 --- a/pkgs/by-name/x2/x265/package.nix +++ b/pkgs/by-name/x2/x265/package.nix @@ -5,6 +5,7 @@ fetchurl, cmake, nasm, + fetchpatch, fetchpatch2, # NUMA support enabled by default on NUMA platforms: @@ -55,6 +56,29 @@ stdenv.mkDerivation rec { patches = [ ./darwin-__rdtsc.patch + # fix compilation with gcc15 + # https://bitbucket.org/multicoreware/x265_git/pull-requests/36 + ./gcc15-fixes.patch + + # Fix the build with CMake 4. + (fetchpatch { + name = "x265-fix-cmake-4-1.patch"; + url = "https://bitbucket.org/multicoreware/x265_git/commits/b354c009a60bcd6d7fc04014e200a1ee9c45c167/raw"; + stripLen = 1; + hash = "sha256-kS+hYZb5dnIlNoZ8ABmNkLkPx+NqCPy+DonXktBzJAE="; + }) + (fetchpatch { + name = "x265-fix-cmake-4-2.patch"; + url = "https://bitbucket.org/multicoreware/x265_git/commits/51ae8e922bcc4586ad4710812072289af91492a8/raw"; + stripLen = 1; + hash = "sha256-ZrpyfSnijUgdyVscW73K48iEXa9k85ftNaQdr0HWSYg="; + }) + (fetchpatch { + name = "x265-fix-cmake-4-3.patch"; + url = "https://bitbucket.org/multicoreware/x265_git/commits/78e5ac35c13c5cbccc5933083edceb0d3eaeaa21/raw"; + stripLen = 1; + hash = "sha256-qEihgUKGEdthbKz67s+/hS/qdpzl+3tEB3gx2tarax4="; + }) ] # TODO: remove after update to version 4.2 ++ lib.optionals (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) [ diff --git a/pkgs/by-name/xa/xauth/package.nix b/pkgs/by-name/xa/xauth/package.nix new file mode 100644 index 0000000000000..c44e008f8b622 --- /dev/null +++ b/pkgs/by-name/xa/xauth/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libx11, + libxau, + libxext, + libxmu, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xauth"; + version = "1.1.4"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xauth-${finalAttrs.version}.tar.xz"; + hash = "sha256-6TGBQUZK17TcD4VkpYDw0g+XfIWjiMxA1admIGFRxpA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libx11 + libxau + libxext + libxmu + xorgproto + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "X authority file utility"; + longDescription = '' + The xauth program is used to edit and display the authorization information used in connecting + to the X server. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xauth"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xauth"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xb/xbacklight/package.nix b/pkgs/by-name/xb/xbacklight/package.nix new file mode 100644 index 0000000000000..6edc91a415c4d --- /dev/null +++ b/pkgs/by-name/xb/xbacklight/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libxcb, + libxcb-util, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xbacklight"; + version = "1.2.4"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xbacklight-${finalAttrs.version}.tar.xz"; + hash = "sha256-1MMLDm8YyC84dYWnN+47ctRoySeJKwiomMQbwSJI6O4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libxcb + libxcb-util + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Utility to adjust X backlight brightness using RandR extension"; + longDescription = '' + Xbacklight is used to adjust the backlight brightness where supported. + It uses the RandR extension to find all outputs on the X server supporting backlight + brightness control and changes them all in the same way. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xbacklight"; + license = lib.licenses.hpndSellVariant; + mainProgram = "xbacklight"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix index cec703c5a6bee..e9daa2ee4b7f8 100644 --- a/pkgs/by-name/xc/xcbuild/package.nix +++ b/pkgs/by-name/xc/xcbuild/package.nix @@ -81,6 +81,8 @@ stdenv.mkDerivation (finalAttrs: { ./patches/Suppress-unknown-key-warnings.patch # Don't pipe stdout / stderr of processes launched by xcrun ./patches/fix-interactive-apps.patch + # Fallback to $HOME and correctly handle missing home directories + ./patches/fix-no-home-directory-crash.patch ]; prePatch = '' @@ -92,6 +94,12 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace Libraries/pbxbuild/Sources/Tool/TouchResolver.cpp \ --replace-fail "/usr/bin/touch" "touch" + substituteInPlace Libraries/pbxbuild/Sources/Tool/MakeDirectoryResolver.cpp \ + --replace-fail "/bin/mkdir" "mkdir" + substituteInPlace Libraries/pbxbuild/Sources/Tool/SymlinkResolver.cpp \ + --replace-fail "/bin/ln" "ln" + substituteInPlace Libraries/pbxbuild/Sources/Tool/ScriptResolver.cpp \ + --replace-fail "/bin/sh" "sh" '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Fix build on gcc-13 due to missing includes @@ -115,6 +123,12 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error"; + # CMake 4 dropped support of versions lower than 3.5, and versions + # lower than 3.10 are deprecated. + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") + ]; + nativeBuildInputs = [ cmake makeBinaryWrapper diff --git a/pkgs/by-name/xc/xcbuild/patches/fix-no-home-directory-crash.patch b/pkgs/by-name/xc/xcbuild/patches/fix-no-home-directory-crash.patch new file mode 100644 index 0000000000000..a4f580045bc5f --- /dev/null +++ b/pkgs/by-name/xc/xcbuild/patches/fix-no-home-directory-crash.patch @@ -0,0 +1,39 @@ +From 4da8e2e3e91aa1a92db95c33a62e1e76525e40cc Mon Sep 17 00:00:00 2001 +From: andre4ik3 +Date: Fri, 15 Aug 2025 09:39:33 +0000 +Subject: [PATCH] Fix crash when no home directory is set + +--- + Libraries/process/Sources/DefaultUser.cpp | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/Libraries/process/Sources/DefaultUser.cpp b/Libraries/process/Sources/DefaultUser.cpp +index 54e464e0..466e63cd 100644 +--- a/Libraries/process/Sources/DefaultUser.cpp ++++ b/Libraries/process/Sources/DefaultUser.cpp +@@ -269,11 +269,18 @@ userHomeDirectory() const + CloseHandle(process); + return WideStringToString(buffer); + #else +- char *home = ::getpwuid(::getuid())->pw_dir; +- if (home != nullptr) { ++ if (struct passwd const *pw = ::getpwuid(::getuid())) { ++ if (pw->pw_name != nullptr) { ++ return std::string(pw->pw_dir); ++ } ++ } ++ ++ // Fallback to $HOME if no home is set ++ const char* home = std::getenv("HOME"); ++ if (home && *home) { + return std::string(home); +- } else { +- return ext::nullopt; + } ++ ++ return ext::nullopt; + #endif + } +-- +2.50.1 + diff --git a/pkgs/by-name/xc/xconsole/package.nix b/pkgs/by-name/xc/xconsole/package.nix new file mode 100644 index 0000000000000..0bb173de971bc --- /dev/null +++ b/pkgs/by-name/xc/xconsole/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapWithXFileSearchPathHook, + xorgproto, + libx11, + libxaw, + libxmu, + libxt, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xconsole"; + version = "1.1.0"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xconsole-${finalAttrs.version}.tar.xz"; + hash = "sha256-DHdZeMrN2nbfyLWpcULxRaF30mIg3TB4ZtndYuc5EYk="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + xorgproto + libx11 + libxaw + libxmu + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Displays /dev/console messages in an X window"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xconsole"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xconsole"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xd/xdg-utils-cxx/package.nix b/pkgs/by-name/xd/xdg-utils-cxx/package.nix index d5c9e7c9aff8b..459ff18a9707d 100644 --- a/pkgs/by-name/xd/xdg-utils-cxx/package.nix +++ b/pkgs/by-name/xd/xdg-utils-cxx/package.nix @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { cmake ]; + # Fix the build with CMake 4. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 3.0)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; + meta = with lib; { description = "Implementation of the FreeDesktop specifications to be used in c++ projects"; homepage = "https://github.com/azubieta/xdg-utils-cxx"; diff --git a/pkgs/by-name/xf/xfontsel/package.nix b/pkgs/by-name/xf/xfontsel/package.nix index 0b01c7f0cfc64..40197dd67eaf2 100644 --- a/pkgs/by-name/xf/xfontsel/package.nix +++ b/pkgs/by-name/xf/xfontsel/package.nix @@ -1,57 +1,68 @@ -# This program used to come with xorg releases, but now I could only find it -# at https://www.x.org/releases/individual/. -# That is why this expression is not inside pkgs.xorg - { lib, stdenv, fetchurl, - makeWrapper, - xorg, pkg-config, + gettext, + wrapWithXFileSearchPathHook, + xorgproto, + libx11, + libxaw, + libxmu, + libxt, + writeScript, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfontsel"; - version = "1.0.6"; + version = "1.1.1"; src = fetchurl { - url = "mirror://xorg/individual/app/xfontsel-${version}.tar.bz2"; - sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; + url = "mirror://xorg/individual/app/xfontsel-${finalAttrs.version}.tar.xz"; + hash = "sha256-ekuGZYp3ASU+0P6KZkceVOTKy7pm1yePF1nTs6M6Ask="; }; nativeBuildInputs = [ pkg-config - makeWrapper + gettext + wrapWithXFileSearchPathHook ]; buildInputs = [ - xorg.libX11 - xorg.libXaw + xorgproto + libx11 + libxaw + libxmu + libxt ]; - # Without this, it gets Xmu as a dependency, but without rpath entry - NIX_LDFLAGS = "-lXmu"; + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; - # This will not make xfontsel find its app-defaults, but at least the $out - # directory will contain them. - # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work. - installPhase = '' - make install appdefaultdir=$out/share/X11/app-defaults - wrapProgram $out/bin/xfontsel \ - --set XAPPLRESDIR $out/share/X11/app-defaults - ''; + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; - meta = with lib; { - homepage = "https://www.x.org/"; + meta = { description = "Allows testing the fonts available in an X server"; - mainProgram = "xfontsel"; - license = with licenses; [ + longDescription = '' + xfontsel provides a simple way to display the X11 core protocol fonts known to your X server, + examine samples of each, and retrieve the X Logical Font Description ("XLFD") full name for a + font. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xfontsel"; + license = with lib.licenses; [ x11 - smlnj + hpnd mit ]; + mainProgram = "xfontsel"; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/xm/xmag/package.nix b/pkgs/by-name/xm/xmag/package.nix new file mode 100644 index 0000000000000..fee3b821ffb59 --- /dev/null +++ b/pkgs/by-name/xm/xmag/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapWithXFileSearchPathHook, + xorgproto, + libx11, + libxaw, + libxmu, + libxt, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xmag"; + version = "1.0.8"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xmag-${finalAttrs.version}.tar.xz"; + hash = "sha256-Mm08WD15W7U6xgnRROf3+xSZurp+rsFLjmzSMuoGlTI="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + xorgproto + libx11 + libxaw + libxmu + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Utility to display a magnified snapshot of a portion of an X11 screen."; + homepage = "https://gitlab.freedesktop.org/xorg/app/xmag"; + license = with lib.licenses; [ + mitOpenGroup + x11 + ]; + mainProgram = "xmag"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xm/xmessage/package.nix b/pkgs/by-name/xm/xmessage/package.nix new file mode 100644 index 0000000000000..76bb66937226d --- /dev/null +++ b/pkgs/by-name/xm/xmessage/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libxaw, + libxt, + wrapWithXFileSearchPathHook, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xmessage"; + version = "1.0.7"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xmessage-${finalAttrs.version}.tar.xz"; + hash = "sha256-cD/Mt6C3ctYdfmA8GJuXOYZqqXuphccnJ1Qg+CmjA1Y="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + libxaw + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Display a message or query in a window"; + longDescription = '' + xmessage displays a message or query in a window. The user can click on an "okay" button to + dismiss it or can select one of several buttons to answer a question. xmessage can also exit + after a specified time. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xmessage"; + license = lib.licenses.x11; + mainProgram = "xmessage"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xm/xmore/package.nix b/pkgs/by-name/xm/xmore/package.nix new file mode 100644 index 0000000000000..e0c5f289bfd67 --- /dev/null +++ b/pkgs/by-name/xm/xmore/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapWithXFileSearchPathHook, + xorgproto, + libxaw, + libxt, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xmore"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xmore-${finalAttrs.version}.tar.xz"; + hash = "sha256-frVg28HeTkPGT+SRrXOQeinXNMyoKprYLH0/65zbCpo="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + xorgproto + libxaw + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Plain text display program for the X Window System"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xmore"; + license = with lib.licenses; [ + hpndSellVariant + mitOpenGroup + ]; + mainProgram = "xmore"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xs/xset/package.nix b/pkgs/by-name/xs/xset/package.nix new file mode 100644 index 0000000000000..e16e5c884dbf7 --- /dev/null +++ b/pkgs/by-name/xs/xset/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxext, + libxmu, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xset"; + version = "1.2.5"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xset-${finalAttrs.version}.tar.xz"; + hash = "sha256-n2ktVWNbOGLNY2M7EiKodoDsKDx6jo7W3WmKMUf3Xi8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxext + libxmu + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "User preference utility for X servers"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xset"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xset"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xs/xsetroot/package.nix b/pkgs/by-name/xs/xsetroot/package.nix new file mode 100644 index 0000000000000..db3bdc81b0244 --- /dev/null +++ b/pkgs/by-name/xs/xsetroot/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + xbitmaps, + libx11, + libxcursor, + libxmu, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xsetroot"; + version = "1.1.3"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xsetroot-${finalAttrs.version}.tar.xz"; + hash = "sha256-YIG0Wp60Qm4EXSWdHhRLMkF/tjXluWqpBkc2WslmONE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + xbitmaps + libx11 + libxcursor + libxmu + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Root window parameter setting utility for X"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xsetroot"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xsetroot"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xs/xsm/package.nix b/pkgs/by-name/xs/xsm/package.nix new file mode 100644 index 0000000000000..a8bc165c4991c --- /dev/null +++ b/pkgs/by-name/xs/xsm/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapWithXFileSearchPathHook, + xorgproto, + libice, + libsm, + libx11, + libxaw, + libxt, + makeBinaryWrapper, + writeScript, + # run time dependencies + iceauth, + smproxy, + twm, + xterm, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xsm"; + version = "1.0.6"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xsm-${finalAttrs.version}.tar.xz"; + hash = "sha256-t0zHdMYGDDdZL2ipDb0xsPKmL7FOVidpQ095vihKY84="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + makeBinaryWrapper + ]; + + buildInputs = [ + xorgproto + libice + libsm + libx11 + libxaw + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + postInstall = '' + wrapProgram $out/bin/xsm \ + --prefix PATH : ${ + lib.makeBinPath [ + iceauth + smproxy + twm + xterm + ] + } + ''; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "X Session Manager"; + longDescription = '' + A session is a group of X applications, each of which has a particular state. xsm allows you + to create arbitrary sessions - for example, you might have a "light" session, a "development" + session, or an "xterminal" session. Each session can have its own set of applications. Within + a session, you can perform a "checkpoint" to save application state, or a "shutdown" to save + state and exit the session. When you log back in to the system, you can load a specific + session, and you can delete sessions you no longer want to keep. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xsm"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xsm"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xs/xstdcmap/package.nix b/pkgs/by-name/xs/xstdcmap/package.nix new file mode 100644 index 0000000000000..e47334435472e --- /dev/null +++ b/pkgs/by-name/xs/xstdcmap/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxmu, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xstdcmap"; + version = "1.0.5"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xstdcmap-${finalAttrs.version}.tar.xz"; + hash = "sha256-NlhH43k5hJnsmtmimcxHoNbn/rqVRt/U5bQiIEtawYA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxmu + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "X standard colormap utility"; + longDescription = '' + The xstdcmap utility can be used to selectively define standard colormap properties. + It is intended to be run from a user's X startup script to create standard colormap + definitions in order to facilitate sharing of scarce colormap resources among clients using + PseudoColor visuals. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xstdcmap"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xstdcmap"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index e39d0159fc79b..2c06f83173eeb 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 = "401"; + version = "402"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-PaK15ky0mwOqEwV9heYuHy5k98dEcZwA0zjRHNPmyho="; + hash = "sha256-UmDFeTzVZMaeU+9vUowArwZq5ntC0CE3+374+v5wu3o="; }; patches = [ ./sixel-256.support.patch ]; diff --git a/pkgs/by-name/ya/yajl/package.nix b/pkgs/by-name/ya/yajl/package.nix index e665ae8e66267..936e1d9a6225d 100644 --- a/pkgs/by-name/ya/yajl/package.nix +++ b/pkgs/by-name/ya/yajl/package.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-vY0tqCkz6PN00Qbip5ViO64L3C06fJ4JjFuIk0TWgCo="; }; + patches = [ + ./yajl-cmake4-compat.patch + ]; + nativeBuildInputs = [ cmake ]; doCheck = true; diff --git a/pkgs/by-name/ya/yajl/yajl-cmake4-compat.patch b/pkgs/by-name/ya/yajl/yajl-cmake4-compat.patch new file mode 100644 index 0000000000000..9ff29c10e017d --- /dev/null +++ b/pkgs/by-name/ya/yajl/yajl-cmake4-compat.patch @@ -0,0 +1,72 @@ +From 109f4e9665e6d8fd8ed4f647f362b5f147374f94 Mon Sep 17 00:00:00 2001 +From: Luna +Date: Sun, 21 Sep 2025 10:05:47 -0700 +Subject: [PATCH] build: update cmake_minimum_required to 3.5...4.1 for CMake 4 + compat + +Replace deprecated EXEC_PROGRAM with execute_process and GET_TARGET_PROPERTY LOCATION with $ generator expressions. + +Signed-off-by: Luna +--- + CMakeLists.txt | 2 +- + reformatter/CMakeLists.txt | 4 +--- + src/CMakeLists.txt | 2 +- + verify/CMakeLists.txt | 4 +--- + 4 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9af25203..45f4a2ad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,7 @@ + # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.5...4.1) + + PROJECT(YetAnotherJSONParser C) + +diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt +index 4b7b3fa4..8ba7cfce 100644 +--- a/reformatter/CMakeLists.txt ++++ b/reformatter/CMakeLists.txt +@@ -35,9 +35,7 @@ IF (NOT WIN32) + ENDIF (NOT WIN32) + + # copy the binary into the output directory +-GET_TARGET_PROPERTY(binPath json_reformat LOCATION) +- + ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${binDir}) + + INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 78875032..43790aaf 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -65,7 +65,7 @@ CONFIGURE_FILE(yajl.pc.cmake ${pkgconfigDir}/yajl.pc) + FOREACH (header ${PUB_HDRS}) + SET (header ${CMAKE_CURRENT_SOURCE_DIR}/${header}) + +- EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir}) ++ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) + + ADD_CUSTOM_COMMAND(TARGET yajl POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) +diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt +index 2bceb265..1ce3cca3 100644 +--- a/verify/CMakeLists.txt ++++ b/verify/CMakeLists.txt +@@ -29,9 +29,7 @@ ADD_EXECUTABLE(json_verify ${SRCS}) + TARGET_LINK_LIBRARIES(json_verify yajl) + + # copy in the binary +-GET_TARGET_PROPERTY(binPath json_verify LOCATION) +- + ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${binDir}) + + INSTALL(TARGETS json_verify RUNTIME DESTINATION bin) diff --git a/pkgs/by-name/ya/yara/package.nix b/pkgs/by-name/ya/yara/package.nix index 03ec0d3504527..0867a3175cef4 100644 --- a/pkgs/by-name/ya/yara/package.nix +++ b/pkgs/by-name/ya/yara/package.nix @@ -17,15 +17,15 @@ enableStatic ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yara"; - version = "4.5.2"; + version = "4.5.4"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; - tag = "v${version}"; - hash = "sha256-ryRbLXnhC7nAxtlhr4bARxmNdtPhpvGKwlOiYPYPXOE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vSwjP0wbC65jEOxY9zrHAV1gEhcZ96emqvkuUw20Twc="; }; nativeBuildInputs = [ @@ -54,13 +54,18 @@ stdenv.mkDerivation rec { doCheck = enableStatic; + # bin/yara contain forbidden references to /build/. + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/bin/yara + ''; + meta = { description = "Tool to perform pattern matching for malware-related tasks"; homepage = "http://Virustotal.github.io/yara/"; - changelog = "https://github.com/VirusTotal/yara/releases/tag/v${version}"; + changelog = "https://github.com/VirusTotal/yara/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "yara"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ya/yasm/gcc-15.patch b/pkgs/by-name/ya/yasm/gcc-15.patch new file mode 100644 index 0000000000000..918a058da78d8 --- /dev/null +++ b/pkgs/by-name/ya/yasm/gcc-15.patch @@ -0,0 +1,17 @@ +diff --git a/libyasm/bitvect.h b/libyasm/bitvect.h +index 3aee3a53..a13470ad 100644 +--- a/libyasm/bitvect.h ++++ b/libyasm/bitvect.h +@@ -83,7 +83,11 @@ typedef Z_longword *Z_longwordptr; + #ifdef MACOS_TRADITIONAL + #define boolean Boolean + #else +- typedef enum boolean { false = FALSE, true = TRUE } boolean; ++ #if __STDC_VERSION__ < 202311L ++ typedef enum boolean { false = FALSE, true = TRUE } boolean; ++ #else ++ typedef bool boolean; ++ #endif + #endif + #endif + diff --git a/pkgs/by-name/ya/yasm/package.nix b/pkgs/by-name/ya/yasm/package.nix index 3577781c9818f..f92ff98bfb3f0 100644 --- a/pkgs/by-name/ya/yasm/package.nix +++ b/pkgs/by-name/ya/yasm/package.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; + patches = [ + # https://github.com/yasm/yasm/pull/287 + ./gcc-15.patch + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; meta = with lib; { diff --git a/pkgs/by-name/ze/zeromq/package.nix b/pkgs/by-name/ze/zeromq/package.nix index 918099c8b6240..cc6869e87bc96 100644 --- a/pkgs/by-name/ze/zeromq/package.nix +++ b/pkgs/by-name/ze/zeromq/package.nix @@ -30,14 +30,26 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; - # Use proper STREQUAL instead of EQUAL to compare strings - # See: https://github.com/zeromq/libzmq/pull/4711 patches = [ + # Use proper STREQUAL instead of EQUAL to compare strings + # See: https://github.com/zeromq/libzmq/pull/4711 (fetchpatch { url = "https://github.com/zeromq/libzmq/pull/4711/commits/55bd6b3df06734730d3012c17bc26681e25b549d.patch"; hash = "sha256-/FVah+s7f1hWXv3MXkYfIiV1XAiMVDa0tmt4BQmSgmY="; name = "cacheline_undefined.patch"; }) + + # Fix the build with CMake 4. + (fetchpatch { + name = "zeromq-fix-cmake-4-1.patch"; + url = "https://github.com/zeromq/libzmq/commit/34f7fa22022bed9e0e390ed3580a1c83ac4a2834.patch"; + hash = "sha256-oauAZV6pThplcn2v9mQxhxlUhYgpbly0JBLYik+zoJE="; + }) + (fetchpatch { + name = "zeromq-fix-cmake-4-2.patch"; + url = "https://github.com/zeromq/libzmq/commit/b91a6201307b72beb522300366aad763d19b1456.patch"; + hash = "sha256-FKvZi7pTUx+wLUR8Suf+pRFg8I5OHpJ93gEmTxUrmO4="; + }) ]; strictDeps = true; diff --git a/pkgs/by-name/zo/zopfli/package.nix b/pkgs/by-name/zo/zopfli/package.nix index 903061699dd49..e7091c16281c5 100644 --- a/pkgs/by-name/zo/zopfli/package.nix +++ b/pkgs/by-name/zo/zopfli/package.nix @@ -29,6 +29,16 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ]; + # Fix the build with CMake 4. + # + # See: + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.11)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; + postInstall = '' install -Dm444 -t $out/share/doc/zopfli ../README* cp $src/src/zopfli/*.h $dev/include/ diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 07da1f56012e9..3f9a293f08ae2 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "e184dedb360769d6e8e041e711559185f39ab55c", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e184dedb360769d6e8e041e711559185f39ab55c.tar.gz", - "sha256": "16qlwrw96lf52yvmmhfl948wpimbnqm9z87j27agcdmigf5icg1s", - "msg": "Update from Hackage at 2025-07-07T21:33:55Z" + "commit": "c074fec58a2c83bfb17c273302005fe2625207f1", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c074fec58a2c83bfb17c273302005fe2625207f1.tar.gz", + "sha256": "1my6xrg3m694fr3k5386yx5wqd2j0wdxfx6g3scnh5af0sx2hx0w", + "msg": "Update from Hackage at 2025-09-14T21:34:10Z" } diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index d9fea00ac495d..784ede8d29544 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -1,5 +1,5 @@ { - clangStdenv, + llvmPackages_20, lib, fetchurl, dotnetCorePackages, @@ -8,7 +8,6 @@ git, cmake, pkg-config, - llvm, zlib, icu, lttng-ust_2_12, @@ -37,7 +36,10 @@ }: let - stdenv = if clangStdenv.hostPlatform.isDarwin then swiftPackages.stdenv else clangStdenv; + llvmPackages = llvmPackages_20; + + stdenv = + if llvmPackages.stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else llvmPackages.stdenv; inherit (stdenv) isLinux @@ -101,7 +103,7 @@ stdenv.mkDerivation rec { # this gets copied into the tree, but we still need the sandbox profile bootstrapSdk # the propagated build inputs in llvm.dev break swift compilation - llvm.out + llvmPackages.llvm.out zlib _icu openssl diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index c1a4d5478a51a..98da0be6322e9 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -20,6 +20,7 @@ enablePlugin, disableGdbPlugin ? !enablePlugin, enableShared, + enableDefaultPie, targetPrefix, langC, @@ -279,6 +280,9 @@ let "libat_cv_have_ifunc=no" "--disable-gnu-indirect-function" ] + ++ lib.optionals enableDefaultPie [ + "--enable-default-pie" + ] ++ lib.optionals langJit [ "--enable-host-shared" ] diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index ee94af1d9b221..e6acca591005f 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -19,6 +19,7 @@ cargo, staticCompiler ? false, enableShared ? stdenv.targetPlatform.hasSharedLibraries, + enableDefaultPie ? true, enableLTO ? stdenv.hostPlatform.hasSharedLibraries, texinfo ? null, perl ? null, # optional, for texi2pod (then pod2man) @@ -137,6 +138,7 @@ let darwin disableBootstrap disableGdbPlugin + enableDefaultPie enableLTO enableMultilib enablePlugin diff --git a/pkgs/development/compilers/gcc/ng/common/gcc/default.nix b/pkgs/development/compilers/gcc/ng/common/gcc/default.nix index fe4688a96beb0..3a8250b6a2c77 100644 --- a/pkgs/development/compilers/gcc/ng/common/gcc/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/gcc/default.nix @@ -193,6 +193,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-multilib" "--disable-nls" "--disable-shared" + "--enable-default-pie" "--enable-languages=${ lib.concatStrings ( lib.intersperse "," ( diff --git a/pkgs/development/compilers/ghc/9.6.3.nix b/pkgs/development/compilers/ghc/9.6.3.nix deleted file mode 100644 index 14860037a3c51..0000000000000 --- a/pkgs/development/compilers/ghc/9.6.3.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.6.3"; - sha256 = "1xbpxchmvm9gswrwwz1rsvx9kjaxhc2q3fx9l6wa0l5599xydkfz"; -} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 114999da79b3d..250147021e168 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -66,16 +66,16 @@ enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic && !isGhcjs, # Whether to build terminfo. - # FIXME(@sternenseemann): This actually doesn't influence what hadrian does, - # just what buildInputs etc. looks like. It would be best if we could actually - # tell it what to do like it was possible with make. enableTerminfo ? !( stdenv.targetPlatform.isWindows || stdenv.targetPlatform.isGhcjs - # terminfo can't be built for cross - || (stdenv.buildPlatform != stdenv.hostPlatform) - || (stdenv.hostPlatform != stdenv.targetPlatform) + # Before , + # we couldn't force hadrian to build terminfo for cross. + || ( + lib.versionOlder version "9.15.20250808" + && (stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform != stdenv.targetPlatform) + ) ), # Libdw.c only supports x86_64, i686 and s390x as of 2022-08-04 @@ -131,10 +131,12 @@ -- no way to set this via the command line finalStage :: Stage finalStage = ${ - # Always build the stage 2 compiler if possible. - # TODO(@sternensemann): unify condition with make-built GHCs - if stdenv.hostPlatform.canExecute stdenv.targetPlatform then - "Stage2" # native compiler or “native” cross e.g. pkgsStatic + # N. B. hadrian ignores this setting if it doesn't agree it's possible, + # i.e. when its cross-compiling setting is true. So while we could, in theory, + # build Stage2 if hostPlatform.canExecute targetPlatform, hadrian won't play + # ball (with make, Stage2 was built if hostPlatform.system == targetPlatform.system). + if stdenv.hostPlatform == stdenv.targetPlatform then + "Stage2" # native compiler else "Stage1" # cross compiler } @@ -183,51 +185,29 @@ || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 - lib.optionals (lib.versionOlder version "9.6.7") [ - ./docs-sphinx-7.patch - ] - ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.6.5") [ - # Fix aarch64-linux builds of 9.6.0 - 9.6.4. - # Fixes a pointer type mismatch in the RTS. - # https://gitlab.haskell.org/ghc/ghc/-/issues/24348 - (fetchpatch { - name = "fix-incompatible-pointer-types.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/1e48c43483693398001bfb0ae644a3558bf6a9f3.diff"; - hash = "sha256-zUlzpX7J1n+MCEv9AWpj69FTy2uzJH8wrQDkTexGbgM="; - }) - ] - ++ - lib.optionals - ( - # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1 and 9.8.4 - lib.versionOlder version "9.11" - && !(lib.versionAtLeast version "9.6.7" && lib.versionOlder version "9.8") - && !(lib.versionAtLeast version "9.8.4" && lib.versionOlder version "9.9") - && !(lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.11") - ) - [ - # Determine size of time related types using hsc2hs instead of assuming CLong. - # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. - # https://github.com/haskell/ghcup-hs/issues/1107 - # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 - # Note that in normal situations this shouldn't be the case since nixpkgs - # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). - (fetchpatch { - name = "unix-fix-ctimeval-size-32-bit.patch"; - url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch"; - sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv"; - stripLen = 1; - extraPrefix = "libraries/unix/"; - }) - ] - ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.6.6") [ - (fetchpatch { - name = "fix-fully_static.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/1bb24432ff77e11a0340a7d8586e151e15bba2a1.diff"; - hash = "sha256-MpvTmFFsNiPDoOp9BhZyWeapeibQ77zgEV+xzZ1UAXs="; - }) - ] + lib.optionals + ( + # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1 and 9.8.4 + lib.versionOlder version "9.11" + && !(lib.versionAtLeast version "9.6.7" && lib.versionOlder version "9.8") + && !(lib.versionAtLeast version "9.8.4" && lib.versionOlder version "9.9") + && !(lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.11") + ) + [ + # Determine size of time related types using hsc2hs instead of assuming CLong. + # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. + # https://github.com/haskell/ghcup-hs/issues/1107 + # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 + # Note that in normal situations this shouldn't be the case since nixpkgs + # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). + (fetchpatch { + name = "unix-fix-ctimeval-size-32-bit.patch"; + url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch"; + sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv"; + stripLen = 1; + extraPrefix = "libraries/unix/"; + }) + ] ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [ # Fix unlit being installed under a different name than is used in the # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 @@ -343,6 +323,10 @@ let # TODO(@Ericson2314) Make unconditional targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; + # TODO(@sternenseemann): there's no stage0:exe:haddock target by default, + # so haddock isn't available for GHC cross-compilers. Can we fix that? + hasHaddock = stdenv.hostPlatform == stdenv.targetPlatform; + hadrianSettings = # -fexternal-dynamic-refs apparently (because it's not clear from the # documentation) makes the GHC RTS able to load static libraries, which may @@ -498,9 +482,6 @@ stdenv.mkDerivation ( patchShebangs --build . ''; - # GHC needs the locale configured during the Haddock phase. - LANG = "en_US.UTF-8"; - # GHC is a bit confused on its cross terminology. # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths preConfigure = '' @@ -559,9 +540,15 @@ stdenv.mkDerivation ( getToolExe buildTargetLlvmPackages.clang "clang" }" '' - + lib.optionalString (stdenv.buildPlatform.libc == "glibc") '' - export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive" - '' + # Haddock and sphinx need a working locale + + lib.optionalString (enableDocs || hasHaddock) ( + '' + export LANG="en_US.UTF-8" + '' + + lib.optionalString (stdenv.buildPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive" + '' + ) + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' @@ -867,14 +854,11 @@ stdenv.mkDerivation ( inherit llvmPackages; inherit enableShared; + inherit hasHaddock; # Expose hadrian used for bootstrapping, for debugging purposes inherit hadrian; - # TODO(@sternenseemann): there's no stage0:exe:haddock target by default, - # so haddock isn't available for GHC cross-compilers. Can we fix that? - hasHaddock = stdenv.hostPlatform == stdenv.targetPlatform; - bootstrapAvailable = lib.meta.availableOn stdenv.buildPlatform bootPkgs.ghc; }; diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 1dbf759259be5..82bb830cd8603 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -381,9 +381,6 @@ stdenv.mkDerivation ( postPatch = "patchShebangs ."; - # GHC needs the locale configured during the Haddock phase. - LANG = "en_US.UTF-8"; - # GHC is a bit confused on its cross terminology. # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths preConfigure = '' @@ -438,9 +435,15 @@ stdenv.mkDerivation ( echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' - + lib.optionalString (stdenv.buildPlatform.libc == "glibc") '' - export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive" - '' + # Haddock and sphinx need a working locale + + lib.optionalString (enableDocs || enableHaddockProgram) ( + '' + export LANG="en_US.UTF-8" + '' + + lib.optionalString (stdenv.buildPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive" + '' + ) + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index eff1902bc83f2..2ea294a8b1293 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.13.20250428"; - rev = "22d11fa818fae2c95c494fc0fac1f8cb4c6e7cb6"; - sha256 = "0f3xc4k662yrlx8abqqrbgvwzr0ffnpiw8z4a47nnai4xk5k0wjl"; + version = "9.15.20250811"; + rev = "c8d76a2994b8620c54adc2069f4728135d6b5059"; + sha256 = "001rf9z5a1v2xpm9qjzz2p966m5bxmqcnykq0xgb3qf40vi9rnh4"; } diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index bd2426b7f7210..b25f60b3d5ae2 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-S9AekSlyB7+kUOpA1NWpOxtTGl5DhHOyoG4Y4HciciU="; + hash = "sha256-0BDBCc7pTYDv5oHqtGvepJGskGv0ZYPDLp8NuwvRpZQ="; }; strictDeps = true; diff --git a/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch b/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch index 2fbcf56426d6f..364d503dbdc73 100644 --- a/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch +++ b/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch @@ -1,22 +1,22 @@ -From e8b910246d0c7c3d9fff994f71c6f8a48ec09a50 Mon Sep 17 00:00:00 2001 -From: Tristan Ross -Date: Sat, 24 Aug 2024 19:56:24 -0700 -Subject: [PATCH] [libclc] use default paths with find_program when possible - ---- - libclc/CMakeLists.txt | 4 ++-- - 1 file changed, 1 insertions(+), 1 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 02bb859ae8590b..6bcd8ae52a5794 100644 +index b0e7aac6f8f3..af17e62588fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -55,7 +55,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI +@@ -57,7 +57,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI # Import required tools if( NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} ) foreach( tool IN ITEMS clang llvm-as llvm-link opt ) - find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) -+ find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} ) ++ find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} ) set( ${tool}_exe ${LLVM_TOOL_${tool}} ) set( ${tool}_target ) endforeach() +@@ -93,7 +93,7 @@ if( EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} ) + # and custom tools. + foreach( tool IN ITEMS clang llvm-as llvm-link opt ) + find_program( LLVM_CUSTOM_TOOL_${tool} ${tool} +- PATHS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) ++ PATHS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} ) + set( ${tool}_exe ${LLVM_CUSTOM_TOOL_${tool}} ) + set( ${tool}_target ) + endforeach() diff --git a/pkgs/development/compilers/llvm/README.md b/pkgs/development/compilers/llvm/README.md index 3996699886415..9d6bc1773d979 100644 --- a/pkgs/development/compilers/llvm/README.md +++ b/pkgs/development/compilers/llvm/README.md @@ -74,7 +74,7 @@ We are making it use these variables. For the older LLVM versions, these patches live in https://github.com/Ericson2314/llvm-project branches `split-prefix`. Instead of applying the patches to the worktree per the above instructions, one can checkout those directly and rebase those instead. -For newer LLVM versions, enough has has been upstreamed, +For newer LLVM versions, enough has been upstreamed, (see https://reviews.llvm.org/differential/query/5UAfpj_9zHwY/ for my progress upstreaming), that I have just assembled new gnu-install-dirs patches from the remaining unmerged patches instead of rebasing from the prior LLVM's gnu install dirs patch. diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 8ed41c6f7937b..4b4b2212e264f 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { env = { NIX_CFLAGS_COMPILE = toString ( [ - "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + "-DSCUDO_DEFAULT_OPTIONS=delete_size_mismatch=false:dealloc_type_mismatch=false" ] ++ lib.optionals (!haveLibc) [ # The compiler got stricter about this, and there is a usellvm patch below @@ -186,6 +186,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ (lib.cmakeBool "COMPILER_RT_BUILD_CTX_PROFILE" false) ] + ++ + lib.optional (stdenv.hostPlatform.isAarch64 && !haveLibc) + # Fixes https://github.com/NixOS/nixpkgs/issues/393603 + (lib.cmakeBool "COMPILER_RT_DISABLE_AARCH64_FMV" true) ++ devExtraCmakeFlags; outputs = [ diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 5a9088864e0d3..df2f95aa0a1e0 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -199,6 +199,8 @@ let clang = if stdenv.targetPlatform.libc == null then tools.clangNoLibc + else if stdenv.targetPlatform.isDarwin then + tools.systemLibcxxClang else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM else if (pkgs.targetPackages.stdenv or args.stdenv).cc.isGNU then @@ -221,6 +223,15 @@ let extraBuildCommands = mkExtraBuildCommands cc; }; + # Darwin uses the system libc++ by default. It is set up as its own clang definition so that `libcxxClang` + # continues to use the libc++ from LLVM. + systemLibcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = darwin.libcxx; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + lld = callPackage ./lld { }; @@ -289,7 +300,8 @@ let clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec { cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; + # This is used to build compiler-rt. Make sure to use the system libc++ on Darwin. + libcxx = if stdenv.hostPlatform.isDarwin then darwin.libcxx else targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc @@ -380,14 +392,13 @@ let clangNoLibcxx = tools.clangWithLibcAndBasicRt; mlir = callPackage ./mlir { }; + + libclc = callPackage ./libclc { }; } // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") { bolt = callPackage ./bolt { }; } - // lib.optionalAttrs (lib.versionOlder metadata.release_version "22") { - libclc = callPackage ./libclc { }; - } // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") { flang = callPackage ./flang { mlir = tools.mlir; diff --git a/pkgs/development/compilers/llvm/common/patches.nix b/pkgs/development/compilers/llvm/common/patches.nix index 75a3659228e8f..b97f8af6eae2d 100644 --- a/pkgs/development/compilers/llvm/common/patches.nix +++ b/pkgs/development/compilers/llvm/common/patches.nix @@ -92,6 +92,10 @@ } ]; "libclc/use-default-paths.patch" = [ + { + after = "20"; + path = ../20; + } { after = "19"; before = "20"; diff --git a/pkgs/development/compilers/purescript/purescript/update.sh b/pkgs/development/compilers/purescript/purescript/update.sh index 186a51a2bca3a..0834fbf5d1dc5 100755 --- a/pkgs/development/compilers/purescript/purescript/update.sh +++ b/pkgs/development/compilers/purescript/purescript/update.sh @@ -50,4 +50,4 @@ echo echo "Finished. Make sure you run the following commands to confirm PureScript builds correctly:" echo ' - `nix build -L -f ./. purescript`' echo ' - `nix build -L -f ./. purescript.passthru.tests.minimal-module`' -echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' +echo ' - `sudo nix build -L -f ./. spago-legacy.passthru.tests --option sandbox relaxed`' diff --git a/pkgs/development/compilers/rust/1_89.nix b/pkgs/development/compilers/rust/1_89.nix index 77b5fc06dfc72..768d02987ff3a 100644 --- a/pkgs/development/compilers/rust/1_89.nix +++ b/pkgs/development/compilers/rust/1_89.nix @@ -20,8 +20,8 @@ pkgsTargetTarget, makeRustPlatform, wrapRustcWith, - llvmPackages_20, - llvm_20, + llvmPackages, + llvm, wrapCCWith, overrideCC, fetchpatch, @@ -29,7 +29,7 @@ let llvmSharedFor = pkgSet: - pkgSet.llvmPackages_20.libllvm.override ( + pkgSet.llvmPackages.libllvm.override ( { enableSharedLibraries = true; } @@ -37,7 +37,7 @@ let # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM stdenv = pkgSet.stdenv.override { allowedRequisites = null; - cc = pkgSet.pkgsBuildHost.llvmPackages_20.clangUseLLVM; + cc = pkgSet.pkgsBuildHost.llvmPackages.clangUseLLVM; }; } ); @@ -51,12 +51,11 @@ import ./default.nix llvmSharedForHost = llvmSharedFor pkgsBuildHost; llvmSharedForTarget = llvmSharedFor pkgsBuildTarget; + inherit llvmPackages; + # For use at runtime llvmShared = llvmSharedFor pkgsHostTarget; - # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox - llvmPackages = llvmPackages_20; - # 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 @@ -87,8 +86,8 @@ import ./default.nix ( removeAttrs args [ - "llvmPackages_20" - "llvm_20" + "llvmPackages" + "llvm" "wrapCCWith" "overrideCC" "pkgsHostTarget" diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 5a9b1f54ac829..25d7f37c4089e 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -290,8 +290,6 @@ stdenv.mkDerivation { done ''; - # We invoke cmakeConfigurePhase multiple times, but only need this once. - dontFixCmake = true; # We setup custom build directories. dontUseCmakeBuildDir = true; @@ -459,10 +457,6 @@ stdenv.mkDerivation { hash = "sha256-wPZQ4wtEWk8HaKMfzjamlU6p/IW5EFiTssY63rGM+ZA="; } } - - # NOTE: This interferes with ABI stability on Darwin, which uses the system - # libraries in the hardcoded path /usr/lib/swift. - fixCmakeFiles . ''} ''; diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index a60c80ee39030..d101e08b002fe 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -59,7 +59,7 @@ def generate_sources(assets, feature_version, out): out = {} for feature_version in feature_versions: - # Default user-agenet is blocked by Azure WAF. + # Default user-agent is blocked by Azure WAF. headers = {'user-agent': 'nixpkgs-temurin-generate-sources/1.0.0'} resp = requests.get(f"https://api.adoptium.net/v3/assets/latest/{feature_version}/hotspot", headers=headers) diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 22c2e903f3e0f..23e0673fb4bb2 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -7,35 +7,35 @@ "vmType": "hotspot", "x86_64": { "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" + "sha256": "7e9e5241d1378d75ae70e9b216d0d51d3aa2e61e187e92e09d117cb613e16ee4", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" } }, "openjdk17": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "2e83ac152fb315db0d667761f2120b64504800f641a513044e834a1a41f29bc0", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" } }, "openjdk21": { "aarch64": { - "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" + "build": "9", + "sha256": "4773cfdc59d66b75f4a68ac843b2b5854791840114cf8bb1b56fb6f7826ae498", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "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" + "build": "9", + "sha256": "73c4cbe10f4f385383d9cb54d34f2bee2c68b5265f9e3d954f3326948c40c0be", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" } }, "openjdk23": { @@ -56,18 +56,18 @@ }, "openjdk24": { "aarch64": { - "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" + "build": "12", + "sha256": "5563867bf1abfc466c59bf3d08e9957a30666fe96fb8f9c5bae939ab11d262d5", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_aarch64_alpine-linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "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" + "build": "12", + "sha256": "947ba234c65cdbd4d852e8f2812334ed093530d86b32cca5d9b45d6672186f77", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" } }, "openjdk25": { @@ -90,10 +90,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "21e28ad4faf34a2d353252ea363d57afe8d72f9d55f66a54e4e99fd1acb7786b", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" } } }, @@ -103,35 +103,35 @@ "vmType": "hotspot", "x86_64": { "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" + "sha256": "b0092a3f753beb13221fab3a1ce713390809b4841b4a5eb407f9819d628c8856", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "88424be8b71d7c801c39866cf19d3b7c49b1c499cdccfa292e103c7cba08c21b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" } }, "openjdk21": { "aarch64": { - "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" + "build": "9", + "sha256": "f495749fce8d8974323f30428c1183168f90592dc90bb94c96edab33ffccc94e", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "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" + "build": "9", + "sha256": "f499e2d5c596fd531c8427b2fb207c9eeabed783adad32aeed64b03dd476a231", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" } }, "openjdk23": { @@ -152,18 +152,18 @@ }, "openjdk24": { "aarch64": { - "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" + "build": "12", + "sha256": "389100187cf328c7b6b6b390fc0f5071ab38e93e8a6c06beb11e59363d2fd0d0", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_aarch64_alpine-linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "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" + "build": "12", + "sha256": "b63b888d2415828168c4d35a62d88f385a5532a20b7391e30a5d5d0a9a73b892", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_x64_alpine-linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" } }, "openjdk25": { @@ -186,10 +186,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "fb10b6185c76cb48bdcbb76e466adc319b37ffc0b1cf89708a1f13e94adcc12c", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" } } } @@ -199,103 +199,103 @@ "openjdk11": { "aarch64": { "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" + "sha256": "32c316cb3998a9c9dee2829fbb577ea1c0ed666700cec73e049d44c342bb19af", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "armv6l": { "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" + "sha256": "b33c99068804bbd7e4aa4bd1c5419ae88ec77833e5e5339ab06a00546a2b0711", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_arm_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "armv7l": { "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" + "sha256": "b33c99068804bbd7e4aa4bd1c5419ae88ec77833e5e5339ab06a00546a2b0711", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_arm_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "packageType": "jdk", "powerpc64le": { "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" + "sha256": "e272abd162b3de68093630929453feba3e63a5ab1bbb912379f6a4aa968ef06a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "vmType": "hotspot", "x86_64": { "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" + "sha256": "7dfd551795a8884b26cbb02e0301da95db40160bb194f48271dc2ef9367f50c2", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_x64_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" } }, "openjdk17": { "aarch64": { - "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" + "build": "8", + "sha256": "423416447885d9e45f96dd9e0b2c1367da5e1b0353e187cfdf9388c9820ac147", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "armv6l": { - "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" + "build": "8", + "sha256": "bc8ba665df25378cfca76b2d2ca6821ba32c4d45934aa5beea5b542d6658f5d6", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "armv7l": { - "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" + "build": "8", + "sha256": "bc8ba665df25378cfca76b2d2ca6821ba32c4d45934aa5beea5b542d6658f5d6", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "packageType": "jdk", "powerpc64le": { - "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" + "build": "8", + "sha256": "eb020f74e00870379522be0b44fc6322c2214e77971c258400c8b5af704d5c0a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "riscv64": { - "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" + "build": "8", + "sha256": "42cc01235222a27576de8331a532da200ce36c9d155c93e9e0b4d565dcaf684a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "166774efcf0f722f2ee18eba0039de2d685b350ee14d7b69e6f83437dafd2af1", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" } }, "openjdk21": { "aarch64": { - "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" + "build": "9", + "sha256": "e5c41a1ab0865ea5de9b4529bf8526005f1d4593090845387d14fe450ce39c33", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "packageType": "jdk", "powerpc64le": { - "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" + "build": "9", + "sha256": "a24e869b8e563fd7b9f7776f6686ca5d737c8d1c3c33c9b72836935709b44a34", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "riscv64": { - "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" + "build": "9", + "sha256": "8171d95189e675e297b5cb96c7ac6247ab4e9f48da82b13f491fc46ef5d97836", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "vmType": "hotspot", "x86_64": { - "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" + "build": "9", + "sha256": "f2dc5418092c43003db8f9005c4a286e1c0104fea96ccdd49e8ebd037cac9219", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" } }, "openjdk23": { @@ -328,30 +328,30 @@ }, "openjdk24": { "aarch64": { - "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" + "build": "12", + "sha256": "6f8725d186d05c627176db9c46c732a6ef3ba41d9e9b3775c4727fc8ac642bb2", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_aarch64_linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "packageType": "jdk", "powerpc64le": { - "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" + "build": "12", + "sha256": "00f55805b4fa34c2557428e7f43ac847a8af0177ecb0b9dd8a6016f313ec43a9", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_ppc64le_linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "riscv64": { - "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" + "build": "12", + "sha256": "93fb5af13491b5b05ac378002b8a997614dc0f422870c10d5fadcdfcbcd0b948", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_riscv64_linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "vmType": "hotspot", "x86_64": { - "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" + "build": "12", + "sha256": "aea1cc55e51cf651c85f2f00ad021603fe269c4bb6493fa97a321ad770c9b096", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_x64_linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" } }, "openjdk25": { @@ -384,36 +384,36 @@ }, "openjdk8": { "aarch64": { - "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" + "build": "8", + "sha256": "19552c1cf7f5c18290a6bdcd6757f70ea5c331a2bc0dd7a3b3120e8dbc4b4891", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" }, "armv6l": { - "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" + "build": "8", + "sha256": "c4f29a65ca6c4c211e3af645e3fcbd9e8f0c2b8ab2b738973237f08e4dc38310", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" }, "armv7l": { - "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" + "build": "8", + "sha256": "c4f29a65ca6c4c211e3af645e3fcbd9e8f0c2b8ab2b738973237f08e4dc38310", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" }, "packageType": "jdk", "powerpc64le": { - "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" + "build": "8", + "sha256": "3e4dbc94ebd299b60d8168b1d33cdae1f619db9403aaefd65d0b643615d596cc", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" }, "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "5d64ae542b59a962b3caadadd346f4b1c3010879a28bb02d928326993de16e79", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" } } }, @@ -421,103 +421,103 @@ "openjdk11": { "aarch64": { "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" + "sha256": "761a0a87ca2b1e75eb5208565a56a4c3f49e02a5d4c00ce6a4930d015660e5d1", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "armv6l": { "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" + "sha256": "05b791574d7174d2c8e033c4c987411b167d2ff9b5e954926b82295310f93e4d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jre_arm_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "armv7l": { "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" + "sha256": "05b791574d7174d2c8e033c4c987411b167d2ff9b5e954926b82295310f93e4d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jre_arm_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "packageType": "jre", "powerpc64le": { "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" + "sha256": "e3a2e957a06909ccff8eb81e892e952080905831cdcbe41825c041430e205e3a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "vmType": "hotspot", "x86_64": { "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" + "sha256": "ddbd5d7ef14aa06784fb94d1e0e7177868dfdd0aa216a8a2e654869968ef7392", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jre_x64_linux_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" } }, "openjdk17": { "aarch64": { - "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" + "build": "8", + "sha256": "98f9d60be880b6ec551f5f1fcd784971aa573e8d8f5b9923fb0148c25afcd161", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "armv6l": { - "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" + "build": "8", + "sha256": "a8a5294e1c2353280525dfde607e71125fbdf767c6be85382a74d2d9d175d908", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "armv7l": { - "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" + "build": "8", + "sha256": "a8a5294e1c2353280525dfde607e71125fbdf767c6be85382a74d2d9d175d908", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "packageType": "jre", "powerpc64le": { - "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" + "build": "8", + "sha256": "a0a3e94b278a869a2a03802cd549ca0ecdfe1f568175a8ddac113613ee9a8bb9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "riscv64": { - "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" + "build": "8", + "sha256": "f79ef9103ca89faae1d46794cd719b3a8d73079f63df977c92307b7ff9c3d726", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "2885b944da3793144d4a86a29524f4d7b68ba155f5c08afa444a3b40f7071892", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" } }, "openjdk21": { "aarch64": { - "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" + "build": "9", + "sha256": "f54f6e2a907c4aef95ce6d7388474c6d5d87ae87899dd309561672bcfda9121e", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "packageType": "jre", "powerpc64le": { - "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" + "build": "9", + "sha256": "12c351c7a6906ca4ddd3f158cbd9ebf2733bab2dc432dc3f9d5685476b16b7bc", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "riscv64": { - "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" + "build": "9", + "sha256": "1c87410971cd7c3cd175bfe81cfecbe83462a64291caf1055cdcc0feb56e907d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "vmType": "hotspot", "x86_64": { - "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" + "build": "9", + "sha256": "968c283e104059dae86ea1d670672a80170f27a39529d815843ec9c1f0fa2a03", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" } }, "openjdk23": { @@ -550,30 +550,30 @@ }, "openjdk24": { "aarch64": { - "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" + "build": "12", + "sha256": "6b06ed1d91930ef86afc7d2159948aa9b3054b154cd8afda35d1fddd158fc11d", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_aarch64_linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "packageType": "jre", "powerpc64le": { - "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" + "build": "12", + "sha256": "de9ec7034fb369ec9b5d12bba9d51984d14d859006e89ef2b86bbae9bc4c7ae4", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_ppc64le_linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "riscv64": { - "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" + "build": "12", + "sha256": "4a1177077bc5937ec93cfaaff60fd212a8591af241827869c73f87949a1268e9", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_riscv64_linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "vmType": "hotspot", "x86_64": { - "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" + "build": "12", + "sha256": "bee902852ae8b6698e04eb1599dc94af844ae45b72b3b8ec854350b9aba41335", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_x64_linux_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" } }, "openjdk25": { @@ -606,36 +606,36 @@ }, "openjdk8": { "aarch64": { - "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" + "build": "8", + "sha256": "c34506736ab52768c59660a5d4246b94f57543c79b7e4b53d322dda3ec4a9302", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" }, "armv6l": { - "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" + "build": "8", + "sha256": "48547114cef3ce1ab8e80c8140430d8fb2f23359d52ad6d7a0af28f5fe9c81f8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jre_arm_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" }, "armv7l": { - "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" + "build": "8", + "sha256": "48547114cef3ce1ab8e80c8140430d8fb2f23359d52ad6d7a0af28f5fe9c81f8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jre_arm_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" }, "packageType": "jre", "powerpc64le": { - "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" + "build": "8", + "sha256": "15391b2d1bf613abd739f6ad6eeb728f4803d901cceae0d83f6bbd00da7751bf", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" }, "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "6e83ffc37da053352ccaa2fd3bd7d813b9674d87aa01b35ac3e54903cd33b0d8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jre_x64_linux_hotspot_8u462b08.tar.gz", + "version": "8.0.462" } } } @@ -645,49 +645,49 @@ "openjdk11": { "aarch64": { "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" + "sha256": "b5b46eb84aa2f301e739178aef0209c6843d6ad45b33f19dd39df4decdd29e9e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "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" + "sha256": "4683f3b751310bfd228a5a64e6ee643e9f1ccadd38b4bac3d74597dbf6d5d57a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_x64_mac_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" } }, "openjdk17": { "aarch64": { - "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" + "build": "8", + "sha256": "f9845abc8403f1d489402201064e7b9f2c57605d8717b85a95a15d94f882eeb7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "ca5700c5d13124467ae52e1609881d7ce45d974870b18c3382ea8b7ae69d0f00", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" } }, "openjdk21": { "aarch64": { - "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" + "build": "9", + "sha256": "59422c2292ae4e76b87e00d8808dbe49cffa39af731e08bb0292ddb0af4e0261", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "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" + "build": "9", + "sha256": "0ceaf7060b2c9dbbe8ecc4fb9351c6b4cf24e4350d58772c9656589933a4fdeb", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_x64_mac_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" } }, "openjdk23": { @@ -708,18 +708,18 @@ }, "openjdk24": { "aarch64": { - "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" + "build": "12", + "sha256": "db2ba6f72c19ad8b742303a504f58474bceeb94174a185de5f095c1d45577f1c", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_aarch64_mac_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "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" + "build": "12", + "sha256": "4f63497563f6f0eb109f6898bb2e45e6cb428a6e4abe0772698493e373e8f0c7", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_x64_mac_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" } }, "openjdk25": { @@ -742,10 +742,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "026001d776b9e692e9c79b7de975f7a1d819def42bd12e7d655ab16136b7dcf6", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u462b08.tar.gz", + "version": "8.0.462" } } }, @@ -753,49 +753,49 @@ "openjdk11": { "aarch64": { "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" + "sha256": "cc5d0f885c1b086f614291358b19a5925dee36dab45ba867af3f3a91c7f4c219", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "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" + "sha256": "75efdcbdf50d8d6caa262dd9d12620357f374137e303dbc7f69ffb15ea4f81fb", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jre_x64_mac_hotspot_11.0.28_6.tar.gz", + "version": "11.0.28" } }, "openjdk17": { "aarch64": { - "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" + "build": "8", + "sha256": "30c3cfb717a2a84bf164c010a9c51dc81a15dcf214cf83a9695206233c9c5d37", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "45438e511171f21ade709c6987ef4b88ea98b6c0124b4775a4b29d5822395cdd", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.16_8.tar.gz", + "version": "17.0.16" } }, "openjdk21": { "aarch64": { - "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" + "build": "9", + "sha256": "7849fd9e0d48c6638a1f82a81000ef170e32600fd7a32fc257668e7e7ae041b4", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "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" + "build": "9", + "sha256": "34464861ed170ea0e5acdf870011f9e92f836e712b620ba37c4b2d0e5aeb8675", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_x64_mac_hotspot_21.0.8_9.tar.gz", + "version": "21.0.8" } }, "openjdk23": { @@ -816,18 +816,18 @@ }, "openjdk24": { "aarch64": { - "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" + "build": "12", + "sha256": "430546a697213e8a56653ca10ea59557054b2d5451ed82aad3a2cb7359fa1e2f", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_aarch64_mac_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "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" + "build": "12", + "sha256": "a246ba0487432ef06d1d13c3588a10663c89b15aea73c8a1c3a81211c4d22627", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_x64_mac_hotspot_24.0.2_12.tar.gz", + "version": "24.0.2" } }, "openjdk25": { @@ -850,10 +850,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "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" + "build": "8", + "sha256": "d34f688e4b8f58dca0599d0f99b31729568af26837e30d997d77fc65929d7041", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u462-b08/OpenJDK8U-jre_x64_mac_hotspot_8u462b08.tar.gz", + "version": "8.0.462" } } } diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 6e3fb04d8ec1b..5a4df23a384ce 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -53,9 +53,6 @@ self: super: // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { # AARCH64-SPECIFIC OVERRIDES - # Corrupted store path https://github.com/NixOS/nixpkgs/pull/272097#issuecomment-1848414265 - cachix = triggerRebuild 1 super.cachix; - # Doctests fail on aarch64 due to a GHCi linking bug # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437 # TODO: figure out if needed on aarch32 as well diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0886a68deaa46..3bdae5481620e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -82,6 +82,22 @@ with haskellLib; } ) ); + Cabal_3_16_0_0 = + overrideCabal + (drv: { + # Revert increased lower bound on unix since we have backported + # the required patch to all GHC bundled versions of unix. + postPatch = drv.postPatch or "" + '' + substituteInPlace Cabal.cabal --replace-fail "unix >= 2.8.6.0" "unix >= 2.6.0.0" + ''; + }) + ( + doDistribute ( + super.Cabal_3_16_0_0.override { + Cabal-syntax = self.Cabal-syntax_3_16_0_0; + } + ) + ); # Needs matching version of Cabal Cabal-hooks = super.Cabal-hooks.override { @@ -100,11 +116,8 @@ with haskellLib; let # !!! Use cself/csuper inside for the actual overrides cabalInstallOverlay = cself: csuper: { - Cabal = cself.Cabal_3_14_2_0; - Cabal-syntax = cself.Cabal-syntax_3_14_2_0; - - # Only needed for cabal2nix, hpack < 0.37 forbids Cabal >= 3.14 - hpack = cself.hpack_0_38_1; + Cabal = cself.Cabal_3_16_0_0; + Cabal-syntax = cself.Cabal-syntax_3_16_0_0; }; in { @@ -145,7 +158,7 @@ with haskellLib; ] ) [ - ./patches/cabal-install-3.14.1.1-lift-unix-bound.patch + ./patches/cabal-install-3.16-lift-unix-bound.patch ]; } // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) { @@ -169,49 +182,47 @@ with haskellLib; # May as well… (self.generateOptparseApplicativeCompletions [ "guardian" ]) ]; - - cabal2nix-unstable = super.cabal2nix-unstable.overrideScope cabalInstallOverlay; - distribution-nixpkgs-unstable = super.distribution-nixpkgs-unstable.overrideScope cabalInstallOverlay; - hackage-db-unstable = super.hackage-db-unstable.overrideScope cabalInstallOverlay; } ) cabal-install cabal-install-solver guardian - cabal2nix-unstable - distribution-nixpkgs-unstable - hackage-db-unstable ; - # Expected test output for these accidentally checks the absolute location of the source directory - # https://github.com/dan-t/cabal-cargs/issues/9 - cabal-cargs = overrideCabal (drv: { - testFlags = drv.testFlags or [ ] ++ [ - "-p" - "!/FindCabalFilePure withoutSandbox/" - "-p" - "!/FromCabalFilePure withoutSandbox/" - "-p" - "!/FromLibSrcPure withoutSandbox/" - "-p" - "!/FromExeSrcFilePure withoutSandbox/" - "-p" - "!/FindCabalFilePure withSandbox/" - "-p" - "!/FromCabalFilePure withSandbox/" - "-p" - "!/FromLibSrcPure withSandbox/" - "-p" - "!/FromExeSrcFilePure withSandbox/" - ]; - }) super.cabal-cargs; + # cabal2nix depends on hpack which doesn't support Cabal >= 3.16 + cabal2nix-unstable = super.cabal2nix-unstable.override ( + prev: + # Manually override the relevant dependencies to reduce rebuild amount + let + cabalOverride = { + Cabal = self.Cabal_3_14_2_0; + }; + in + cabalOverride + // lib.mapAttrs (_: drv: drv.override cabalOverride) { + inherit (prev) + distribution-nixpkgs + hackage-db + hpack + ; + } + ); - # Extensions wants the latest version of Cabal for its list of Haskell + # 2025-09-20: Too strict bound on filepath (<1.5) + # https://github.com/dan-t/cabal-cargs/issues/10 + cabal-cargs = doJailbreak super.cabal-cargs; + + # Extensions wants a specific version of Cabal for its list of Haskell # language extensions. - # 2025-02-10: jailbreak to allow hspec-hedgehog 0.3.0.0 and hedgehog 1.5 extensions = doJailbreak ( super.extensions.override { - Cabal = if versionOlder self.ghc.version "9.6" then self.Cabal_3_10_3_0 else null; # use GHC bundled version + Cabal = + if versionOlder self.ghc.version "9.10" then + self.Cabal_3_12_1_0 + else + # use GHC bundled version + # N.B. for GHC >= 9.12, extensions needs to be upgraded + null; } ); @@ -219,11 +230,22 @@ with haskellLib; ### HASKELL-LANGUAGE-SERVER SECTION ### ####################################### - # All jailbreaks in this section due to: https://github.com/haskell/haskell-language-server/pull/4316#discussion_r1667684895 - haskell-language-server = - lib.pipe - (super.haskell-language-server.overrideScope ( - lself: lsuper: { + inherit + ( + let + hls_overlay = lself: lsuper: { + # For fourmolu 0.18 and ormolu 0.7.7 + Cabal-syntax = lself.Cabal-syntax_3_14_2_0; + Cabal = lself.Cabal_3_14_2_0; + # Jailbreaking cabal-install-parsers to make it pick Cabal 3.14 instead of 3.12. + cabal-install-parsers = doJailbreak lsuper.cabal-install-parsers; + # hls 2.11 needs older cabal-add than in stackage. Also copying over test fix override from configuration-nix.nix + cabal-add = overrideCabal (drv: { + # tests depend on executable + preCheck = ''export PATH="$PWD/dist/build/cabal-add:$PATH"''; + }) lself.cabal-add_0_1; + # Need a newer version of extensions to be compatible with the newer Cabal + extensions = doJailbreak lself.extensions_0_1_0_3; # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix, # because some packages, like ormolu, need a newer Cabal version. # ghc-paths is special because it depends on Cabal for building @@ -234,17 +256,43 @@ with haskellLib; # otherwise we have different versions of ghc-paths # around which have the same abi-hash, which can lead to confusions and conflicts. ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; + }; + in + lib.mapAttrs (_: pkg: pkg.overrideScope hls_overlay) ( + super + // { + # HLS 2.11: Too strict bound on Diff 1.0. + haskell-language-server = lib.pipe super.haskell-language-server [ + dontCheck + doJailbreak + ( + if versionOlder self.ghc.version "9.10" || versionOlder "9.11" self.ghc.version then + addBuildDepends [ + self.apply-refact + self.hlint + self.refact + ] + else + lib.id + ) + ]; } - )) - [ - dontCheck - ]; + ) + ) + hlint + fourmolu + ormolu + haskell-language-server + ; # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser ( disableCabalFlag "auto" super.ghc-lib-parser-ex ); + hls-plugin-api = doJailbreak super.hls-plugin-api; # HLS 2.11: Too strict bound on Diff 1.0. + ghcide = doJailbreak super.ghcide; # HLS 2.11: Too strict bound on Diff 1.0. + ########################################### ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### @@ -265,16 +313,14 @@ with haskellLib; "vector-tests-O0" "vector-tests-O2" ]; + # Ironically, we still need to build the doctest suite. + # vector-0.13.2.0 has a doctest < 0.24 constraint + jailbreak = true; }) super.vector; # https://github.com/lspitzner/data-tree-print/issues/4 data-tree-print = doJailbreak super.data-tree-print; - # jacinda needs latest version of alex and happy - jacinda = super.jacinda.override { - happy = self.happy_2_1_5; - }; - # Test suite hangs on 32bit. Unclear if this is a bug or not, but if so, then # it has been present in past versions as well. # https://github.com/haskell-unordered-containers/unordered-containers/issues/491 @@ -306,17 +352,24 @@ with haskellLib; # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149 orbits = dontCheck super.orbits; + # 2025-09-20: Restrictive upper bound on hashable. + # https://github.com/softwarefactory-project/matrix-client-haskell/issues/46 + matrix-client = doJailbreak super.matrix-client; + # 2025-02-10: Too strict bounds on tasty-quickcheck < 0.11 tasty-discover = doJailbreak super.tasty-discover; # 2025-02-10: Too strict bounds on tasty < 1.5 tasty-hunit-compat = doJailbreak super.tasty-hunit-compat; - # Out of date test data: https://github.com/ocharles/weeder/issues/176 - weeder = appendPatch (pkgs.fetchpatch { - name = "weeder-2.9.0-test-fix-expected.patch"; - url = "https://github.com/ocharles/weeder/commit/56028d0c80fe89d4f2ae25275aedb72714fec7da.patch"; - sha256 = "10zkvclyir3zf21v41zdsvg68vrkq89n64kv9k54742am2i4aygf"; + # Expected failures are fixed as of GHC-9.10, + # but the tests haven't been updated yet. + # https://github.com/ocharles/weeder/issues/198 + weeder = overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "-p" + "!/wrong/" + ]; }) super.weeder; # Test suite doesn't find necessary test files when compiling @@ -351,6 +404,14 @@ with haskellLib; # There are numerical tests on random data, that may fail occasionally lapack = dontCheck super.lapack; + # fpr-calc test suite depends on random >= 1.3 + # see https://github.com/IntersectMBO/lsm-tree/issues/797 + bloomfilter-blocked = + lib.warnIf (lib.versionAtLeast self.random.version "1.3") + "haskellPackages.bloomfilter-blocked: dontCheck can potentially be removed" + dontCheck + super.bloomfilter-blocked; + # support for transformers >= 0.6 lifted-base = appendPatch (fetchpatch { url = "https://github.com/basvandijk/lifted-base/commit/6b61483ec7fd0d5d5d56ccb967860d42740781e8.patch"; @@ -369,6 +430,22 @@ with haskellLib; }; }) super.leveldb-haskell; + # 2025-08-08: Allow inspection-testing >= 0.6 in fused-effects' test-suite + # https://github.com/fused-effects/fused-effects/pull/466 + fused-effects = doJailbreak super.fused-effects; + + # 2025-08-08: Allow QuickCheck >= 2.15 in selective's test-suite + # https://github.com/snowleopard/selective/pull/81 + selective = doJailbreak super.selective; + + # 2025-09-03: Allow QuickCheck >= 2.15 + # https://github.com/sw17ch/data-clist/pull/28 + data-clist = doJailbreak super.data-clist; + + # 2025-09-20: Allow QuickCheck >= 2.15 + # https://github.com/raehik/binrep/issues/14 + binrep = warnAfterVersion "1.1.0" (doJailbreak super.binrep); + # 2024-06-23: Hourglass is archived and had its last commit 6 years ago. # Patch is needed to add support for time 1.10, which is only used in the tests # https://github.com/vincenthz/hs-hourglass/pull/56 @@ -425,6 +502,11 @@ with haskellLib; # 2025-02-10: Too strict bounds on bytestring < 0.12 ghc-debug-common = doJailbreak super.ghc-debug-common; + ghc-debug-client = lib.pipe super.ghc-debug-client [ + (warnAfterVersion "0.7.0.0") + # 2025-09-18: Too strict bounds on containers < 0.7 + doJailbreak + ]; # https://github.com/agrafix/superbuffer/issues/4 # Too strict bounds on bytestring < 0.12 @@ -435,10 +517,19 @@ with haskellLib; attoparsec-varword = doJailbreak (dontCheck super.attoparsec-varword); # These packages (and their reverse deps) cannot be built with profiling enabled. - ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; + ghc-heap-view = lib.pipe super.ghc-heap-view [ + disableLibraryProfiling + (warnAfterVersion "0.6.4.1") + # 2025-09-18: Too strict bounds on base < 4.20 + doJailbreak + ]; ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-vis = disableLibraryProfiling super.ghc-vis; + # 2025-09-20: Too strict upper bound on base (<4.20) + # https://github.com/phadej/regression-simple/issues/13 + regression-simple = doJailbreak super.regression-simple; + # Fix 32bit struct being used for 64bit syscall on 32bit platforms # https://github.com/haskellari/lukko/issues/15 lukko = appendPatches [ @@ -457,29 +548,31 @@ with haskellLib; jpeg-turbo = dontCheck super.jpeg-turbo; JuicyPixels-jpeg-turbo = dontCheck super.JuicyPixels-jpeg-turbo; - # Fixes compilation for basement on i686 for GHC >= 9.4 + # Fixes compilation for basement on i686 # https://github.com/haskell-foundation/foundation/pull/573 - # Patch would not work for GHC >= 9.2 where it breaks compilation on x86_64 + # Don't apply patch for GHC == 9.2.* on 64bit where it breaks compilation: # https://github.com/haskell-foundation/foundation/pull/573#issuecomment-1669468867 - # TODO(@sternenseemann): make unconditional - basement = appendPatches (lib.optionals pkgs.stdenv.hostPlatform.is32bit [ - (fetchpatch { - name = "basement-i686-ghc-9.4.patch"; - url = "https://github.com/haskell-foundation/foundation/pull/573/commits/38be2c93acb6f459d24ed6c626981c35ccf44095.patch"; - sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7"; - stripLen = 1; - }) - ]) super.basement; + basement = appendPatches (lib.optionals + (pkgs.stdenv.hostPlatform.is32bit || lib.versions.majorMinor self.ghc.version != "9.2") + [ + (fetchpatch { + name = "basement-i686-ghc-9.4.patch"; + url = "https://github.com/haskell-foundation/foundation/pull/573/commits/38be2c93acb6f459d24ed6c626981c35ccf44095.patch"; + sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7"; + stripLen = 1; + }) + ] + ) super.basement; # Fixes compilation of memory with GHC >= 9.4 on 32bit platforms # https://github.com/vincenthz/hs-memory/pull/99 - memory = appendPatches (lib.optionals pkgs.stdenv.hostPlatform.is32bit [ + memory = appendPatches [ (fetchpatch { name = "memory-i686-ghc-9.4.patch"; url = "https://github.com/vincenthz/hs-memory/pull/99/commits/2738929ce15b4c8704bbbac24a08539b5d4bf30e.patch"; sha256 = "196rj83iq2k249132xsyhbbl81qi1j23h9pa6mmk6zvxpcf63yfw"; }) - ]) super.memory; + ] super.memory; # Depends on outdated deps hedgehog < 1.4, doctest < 0.12 for tests # As well as deepseq < 1.5 (so it forbids GHC 9.8) @@ -507,8 +600,27 @@ with haskellLib; url = "https://github.com/jgm/gitit/commit/efaee62bc32c558e618ad34458fa2ef85cb8eb1e.patch"; sha256 = "1ghky3afnib56w102mh09cz2alfyq743164mnjywwfl6a6yl6i5h"; }) + (pkgs.fetchpatch { + name = "gitit-pandoc-3.7.patch"; + url = "https://github.com/jgm/gitit/commit/211631ffdd8b520f368220e5cfbd8d64a28b43b6.patch"; + hash = "sha256-eVjwiGNfEKmeamsUfTNCxJm7OJ7N9xuYHfFllwtwRi0="; + }) + (pkgs.fetchpatch { + name = "gitit-xml-conduit-1.10.patch"; + url = "https://github.com/jgm/gitit/commit/88d1a91795e08ea573d50f4f24e2e1c5d6da5002.patch"; + hash = "sha256-LrP51+Uxp1VPKrDkIhVlm3kSAnYkodiENtLbWHxV3B4="; + }) ] super.gitit; + # Cut off infinite recursion via test suites: + # + # tasty-quickcheck-0.11.1 (test) -> regex-tdfa-1.3.2.4 (test) -> doctest-parallel-0.4 + # -> ghc-exactprint-1.10.0.0 -> extra-1.8 -> quickcheck-instances-0.3.33 (test) + # -> uuid-types-1.0.6 (test) -> tasty-quickcheck-0.11.1 + # + # tasty-quickcheck is probably the least risky test suite to disable. + tasty-quickcheck = dontCheck super.tasty-quickcheck; + # https://github.com/schuelermine/ret/issues/3 ret = doJailbreak super.ret; # base < 4.19 @@ -527,6 +639,14 @@ with haskellLib; ''; } super.containers-unicode-symbols; + # 2025-09-03: support text 2.1.1 + hs-opentelemetry-api = appendPatch (pkgs.fetchpatch2 { + name = "fix-building-with-the-latest-text-and-persistent-releases.patch"; + url = "https://github.com/iand675/hs-opentelemetry/commit/ee8a6dad7db306eb67748ddcd77df4974ad8259e.patch"; + hash = "sha256-CdDrEdm5rCKydTxk42dcURZWcVukgHG+7kfOLiNxhoI="; + relative = "api"; + }) super.hs-opentelemetry-api; + # Test file not included on hackage numerals-base = dontCheck (doJailbreak super.numerals-base); @@ -552,7 +672,7 @@ with haskellLib; name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-whpBFmOHBTm1clXoAwInsQw7mnxrQOyaUj7byogku5c="; + sha256 = "sha256-s3EleptCwmVxHjAcPDe40Ch+fULFqf+6H1pLjXNFZ1Y="; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -567,16 +687,6 @@ 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 - # https://git-annex.branchable.com/bugs/flaky_test_failure_add_dup/ - (pkgs.fetchpatch { - name = "git-annex-workaround-for-git-2.50_bis.patch"; - url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=cf449837ea9ab7687d8a157f21cad31ddf5bbfb6"; - sha256 = "sha256-HmNJ85dLht5Hy85AUkjACnET9YLPP2MshYHsApUax+I="; - excludes = [ - "doc/**" - "CHANGELOG" - ]; - }) ]; postPatch = '' @@ -612,12 +722,30 @@ with haskellLib; # https://github.com/awakesecurity/nix-graph/issues/5 nix-graph = doJailbreak super.nix-graph; + # Allow inspection-testing >= 0.6 in test suite + algebraic-graphs = + appendPatch + (pkgs.fetchpatch2 { + name = "algebraic-graphs-0.7-allow-inspection-testing-0.6.patch"; + url = "https://github.com/snowleopard/alga/commit/d4e43fb42db05413459fb2df493361d5a666588a.patch"; + hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s="; + }) + ( + overrideCabal (drv: { + prePatch = '' + ${drv.prePatch or ""} + ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal + ''; + }) super.algebraic-graphs + ); + # Too strict bounds on hspec # https://github.com/illia-shkroba/pfile/issues/2 pfile = doJailbreak super.pfile; # Manually maintained cachix-api = overrideCabal (drv: { + # FIXME: should use overrideSrc version = "1.7.9"; src = pkgs.fetchFromGitHub { owner = "cachix"; @@ -630,6 +758,7 @@ with haskellLib; cachix = ( overrideCabal (drv: { + # FIXME: should use overrideSrc version = "1.7.9"; src = pkgs.fetchFromGitHub { owner = "cachix"; @@ -638,17 +767,16 @@ with haskellLib; hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; + # Fix ambiguous 'show' reference: https://github.com/cachix/cachix/pull/704 + postPatch = '' + sed -i 's/<> show i/<> Protolude.show i/' src/Cachix/Client/NixVersion.hs + ''; }) ( - lib.pipe - (super.cachix.override { - nix = self.hercules-ci-cnix-store.nixPackage; - }) - [ - (addBuildTool self.hercules-ci-cnix-store.nixPackage) - (addBuildTool pkgs.buildPackages.pkg-config) - (addBuildDepend self.hnix-store-nar) - ] + super.cachix.override { + nix = self.hercules-ci-cnix-store.nixPackage; + hnix-store-core = self.hnix-store-core_0_8_0_0; + } ) ); @@ -673,6 +801,13 @@ with haskellLib; # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; + # 2025-09-03: jailbreak for base 4.20 and hashable 1.5 + # https://github.com/typeclasses/ascii-case/pulls/1 + ascii-case = lib.pipe super.ascii-case [ + (warnAfterVersion "1.0.1.4") + doJailbreak + ]; + # Tests require older versions of tasty. hzk = dontCheck super.hzk; @@ -772,8 +907,33 @@ with haskellLib; sha256 = "sha256-EAyTVkAqCvJ0lRD0+q/htzBJ8iD5qP47j5i2fKhRrlw="; }) super.xml-picklers; - # 2024-05-18: Upstream tests against a different pandoc version - pandoc-crossref = dontCheck super.pandoc-crossref; + # 2025-08-03: Too strict bounds on open-browser, data-default and containers + # https://github.com/lierdakil/pandoc-crossref/issues/478 krank:ignore-line + pandoc-crossref = lib.pipe super.pandoc-crossref [ + (warnAfterVersion "0.3.21") + doJailbreak + + # We are still using pandoc == 3.7.* + (appendPatch ( + lib.warnIf (lib.versionAtLeast self.pandoc.version "3.8") + "haskellPackages.pandoc-crossref: remove revert of pandoc-3.8 patch" + pkgs.fetchpatch + { + name = "pandoc-crossref-revert-pandoc-3.8-highlight.patch"; + url = "https://github.com/lierdakil/pandoc-crossref/commit/b0c35a59d5a802f6525407bfeb31699ffd0b4671.patch"; + hash = "sha256-MIITL9Qr3+1fKf1sTwHzXPcYTt3YC+vr9CpMgqsBXlc="; + revert = true; + } + )) + ]; + + # Too strict bounds on QuickCheck (<2.15), containers (<0.7), hashable (<1.5), pandoc (<3.7) + # https://github.com/jaspervdj/patat/issues/194 + patat = doJailbreak super.patat; + + # Too strict upper bound on data-default-class (< 0.2) + # https://github.com/stackbuilders/dotenv-hs/issues/203 + dotenv = doJailbreak super.dotenv; # 2022-01-29: Tests require package to be in ghc-db. aeson-schemas = dontCheck super.aeson-schemas; @@ -784,32 +944,26 @@ with haskellLib; # https://github.com/alphaHeavy/lzma-conduit/issues/23 lzma-conduit = doJailbreak super.lzma-conduit; - # doctest suite needs adjustment with GHC 9.12 - xml-conduit = appendPatch (pkgs.fetchpatch { - name = "xml-conduit-ghc-9.12.patch"; - url = "https://github.com/snoyberg/xml/commit/73ce67029c61decaa6525536377a15581325fd9e.patch"; - sha256 = "1gvdhwz7f6rw28xqm82h1kx2kwbdvigipfcb0y66520lvd544sm6"; - stripLen = 1; - }) super.xml-conduit; - # 2020-06-05: HACK: does not pass own build suite - `dontCheck` # 2024-01-15: too strict bound on free < 5.2 - hnix = doJailbreak ( - dontCheck ( - super.hnix.override { - # 2023-12-11: Needs older core due to remote - hnix-store-core = self.hnix-store-core_0_6_1_0; - } - ) + hnix = doJailbreak super.hnix; + # 2025-09-13: too strict bound on algebraic-graphs + hnix-store-core = warnAfterVersion "0.6.1.0" (doJailbreak super.hnix-store-core); + + # hnix doesn't support hnix-store-core >= 0.8: https://github.com/haskell-nix/hnix/pull/1112 + hnix-store-core_0_8_0_0 = doDistribute super.hnix-store-core_0_8_0_0; + hnix-store-db = super.hnix-store-db.override { hnix-store-core = self.hnix-store-core_0_8_0_0; }; + hnix-store-json = super.hnix-store-json.override { + hnix-store-core = self.hnix-store-core_0_8_0_0; + }; + hnix-store-readonly = super.hnix-store-readonly.override { + hnix-store-core = self.hnix-store-core_0_8_0_0; + }; + hnix-store-remote_0_7_0_0 = doDistribute ( + super.hnix-store-remote_0_7_0_0.override { hnix-store-core = self.hnix-store-core_0_8_0_0; } ); - - # Too strict bounds on algebraic-graphs - # https://github.com/haskell-nix/hnix-store/issues/180 - hnix-store-core_0_6_1_0 = doJailbreak super.hnix-store-core_0_6_1_0; - - # 2023-12-11: Needs older core - hnix-store-remote = super.hnix-store-remote.override { - hnix-store-core = self.hnix-store-core_0_6_1_0; + hnix-store-tests = super.hnix-store-tests.override { + hnix-store-core = self.hnix-store-core_0_8_0_0; }; # Fails for non-obvious reasons while attempting to use doctest. @@ -845,7 +999,6 @@ with haskellLib; DigitalOcean = dontCheck super.DigitalOcean; directory-layout = dontCheck super.directory-layout; dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw - dotenv = dontCheck super.dotenv; # Tests fail because of missing test file on version 0.8.0.2 fixed on version 0.8.0.4 dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw ed25519 = dontCheck super.ed25519; @@ -897,13 +1050,6 @@ with haskellLib; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; - # Bogus lower bound on data-default-class added via Hackage revision - # https://github.com/mrkkrp/req/pull/180#issuecomment-2628201485 - req = overrideCabal { - revision = null; - editedCabalFile = null; - } super.req; - # Group of libraries by same upstream maintainer for interacting with # Telegram messenger. Bit-rotted a bit since 2020. tdlib = appendPatch (fetchpatch { @@ -1012,6 +1158,9 @@ with haskellLib; # https://github.com/pixbi/duplo/issues/25 duplo = doJailbreak super.duplo; + # https://github.com/fgaz/dual/pull/3 + dual-game = doJailbreak super.dual-game; + # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary pkgs.libmikmod super.mikmod; @@ -1315,6 +1464,14 @@ with haskellLib; postInstall = "rm $out/bin/mkReadme && rmdir $out/bin"; }) super.hastache; + # 2025-09-01: Merged patch from upstream to fix bounds: + optics = appendPatch (fetchpatch { + name = "optics-fix-inspection-testing-bound"; + url = "https://github.com/well-typed/optics/commit/d16b1ac5476c89cc94fb108fe1be268791affca6.patch"; + sha256 = "sha256-w0L/EXSWRQkCkFnvXYel0BNgQQhxn6zATkD3GZS5gz8="; + relative = "optics"; + }) super.optics; + # 2025-02-10: Too strict bounds on text < 2.1 digestive-functors-blaze = doJailbreak super.digestive-functors-blaze; @@ -1620,32 +1777,32 @@ with haskellLib; # https://github.com/NixOS/nixpkgs/issues/198495 (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql); - # Needs matching lsp-types - # Allow lens >= 5.3 - lsp_2_4_0_0 = doDistribute ( - doJailbreak ( - super.lsp_2_4_0_0.override { - lsp-types = self.lsp-types_2_1_1_0; - } - ) - ); - - # Needs matching lsp-types; - # Lift bound on sorted-list <0.2.2 - lsp_2_1_0_0 = doDistribute ( - doJailbreak ( - super.lsp_2_1_0_0.override { - lsp-types = self.lsp-types_2_1_1_0; - } - ) - ); - # Lift bound on lens <5.3 - lsp-types_2_1_1_0 = doDistribute (doJailbreak super.lsp-types_2_1_1_0); - - # 2025-03-03: dhall-lsp-server-1.1.4 requires lsp-2.1.0.0 - dhall-lsp-server = super.dhall-lsp-server.override { - lsp = self.lsp_2_1_0_0; - }; + dhall-lsp-server = + appendPatches + [ + # Add support for lsp >= 2.7 + (pkgs.fetchpatch { + name = "dhall-lsp-server-lsp-2.7.patch"; + url = "https://github.com/dhall-lang/dhall-haskell/commit/a621e1438df5865d966597e2e1b0bb37e8311447.patch"; + sha256 = "sha256-7edxNIeIM/trl2SUXybvSzkscvr1kj5+tZF50IeTOgY="; + relative = "dhall-lsp-server"; + }) + # Fix build with text >= 2.1.2 + (pkgs.fetchpatch { + name = "dhall-lsp-server-text-2.1.2.patch"; + url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch"; + hash = "sha256-cwNH5+7YY8UbA9zHhTRfVaqtIMowZGfFT5Kj+wSlapA="; + relative = "dhall-lsp-server"; + }) + ] + ( + overrideCabal (drv: { + prePatch = '' + ${drv.prePatch or ""} + ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal + ''; + }) super.dhall-lsp-server + ); # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom-core = lib.pipe super.reflex-dom-core [ @@ -1654,6 +1811,20 @@ with haskellLib; unmarkBroken ]; + # https://github.com/ghcjs/jsaddle/pull/160/ + jsaddle = appendPatch (fetchpatch { + name = "fix-on-firefox.patch"; + url = "https://github.com/ghcjs/jsaddle/commit/71ef7f0cbc60a380ba0dc299e758c8f90cc4b526.patch"; + relative = "jsaddle"; + sha256 = "sha256-IBOX74r+lyywVWp0ZucoseeevFrGiInkq7V6RoWADNU="; + }) super.jsaddle; + jsaddle-warp = appendPatch (fetchpatch { + name = "fix-on-firefox.patch"; + url = "https://github.com/ghcjs/jsaddle/commit/71ef7f0cbc60a380ba0dc299e758c8f90cc4b526.patch"; + relative = "jsaddle-warp"; + sha256 = "sha256-jYEUOkP4Kv3yBjo3SbN7sruV+T5R5XWbRFcCUAa6HvE="; + }) super.jsaddle-warp; + # https://github.com/ghcjs/jsaddle/issues/151 jsaddle-webkit2gtk = overrideCabal @@ -1733,7 +1904,7 @@ with haskellLib; # Fails with encoding problems, likely needs locale data. # Test can be executed by adding which to testToolDepends and # $PWD/dist/build/haskeline-examples-Test to $PATH. - haskeline_0_8_3_0 = doDistribute (dontCheck super.haskeline_0_8_3_0); + haskeline_0_8_4_0 = doDistribute (dontCheck super.haskeline_0_8_4_0); # Test suite fails to compile https://github.com/agrafix/Spock/issues/177 Spock = dontCheck super.Spock; @@ -1767,6 +1938,30 @@ with haskellLib; # Break infinite recursion via optparse-applicative (alternatively, dontCheck syb) prettyprinter-ansi-terminal = dontCheck super.prettyprinter-ansi-terminal; + # Released version prohibits QuickCheck >= 2.15 at the moment + optparse-applicative = + appendPatches + [ + (pkgs.fetchpatch2 { + name = "optparse-applicative-0.18.1-allow-QuickCheck-2.15.patch"; + url = "https://github.com/pcapriotti/optparse-applicative/commit/2c2a39ed53e6339d8dc717efeb7d44f4c2b69cab.patch"; + hash = "sha256-198TfBUR3ygPpvKPvtH69UmbMmoRagmzr9UURPr6Kj4="; + }) + ] + ( + overrideCabal (drv: { + prePatch = '' + ${drv.prePatch or ""} + ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal + ''; + }) super.optparse-applicative + ); + + # chell-quickcheck doesn't work with QuickCheck >= 2.15 with no known fix yet + # https://github.com/typeclasses/chell/issues/5 + system-filepath = dontCheck super.system-filepath; + gnuidn = dontCheck super.gnuidn; + # Tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431. # Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x. # So let's not go there and just disable the tests altogether. @@ -2045,6 +2240,10 @@ with haskellLib; job = dontCheck super.job; scheduler = dontCheck super.scheduler; + # Flaky test suite + # https://github.com/minimapletinytools/linear-tests/issues/1 + linear-tests = dontCheck super.linear-tests; + # 2024-09-18: Make compatible with haskell-gi 0.26.10 # https://github.com/owickstrom/gi-gtk-declarative/pull/118 gi-gtk-declarative = warnAfterVersion "0.7.1" ( @@ -2058,9 +2257,69 @@ with haskellLib; ); gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; - # FIXME: These should be removed as gi-gtk4/gi-gdk4 become the standard - gi-gtk_4 = self.gi-gtk_4_0_12; - gi-gdk_4 = self.gi-gdk_4_0_10; + # stack-3.7.1 requires Cabal < 3.12 + stack = + let + stack' = super.stack.overrideScope (self: super: { hpack = self.hpack_0_38_1; }); + in + if lib.versionOlder self.ghc.version "9.10" then + stack' + else + lib.pipe + # to reduce rebuilds, don't override Cabal in the entire scope + ((stack'.override { Cabal = self.Cabal_3_10_3_0; }).overrideScope ( + self: super: + let + downgradeCabal = + drv: + lib.pipe drv [ + # Since Cabal and Cabal-syntax are in the global package db, we can't + # remove them from the available packages. Instead, we pass a constraint. + (appendConfigureFlags [ + "--constraint=Cabal<3.12" + "--constraint=Cabal-syntax<3.12" + ]) + (addBuildDepends [ + self.Cabal-syntax_3_10_3_0 + self.Cabal_3_10_3_0 + ]) + ]; + in + lib.mapAttrs (_: downgradeCabal) { + inherit (super) + hpack + hackage-security + pantry + rio-prettyprint + ; + } + )) + [ + # In order to apply a patch to a file with DOS line endings with GNU patch(1), + # we need to use --binary with a patch that has DOS line endings. + (overrideCabal (drv: { + prePatch = '' + ${drv.prePatch or ""} + patchFlags="--binary -p1" + ''; + })) + (appendPatch ( + pkgs.fetchpatch { + postFetch = '' + sed -e 's/$/\r/' -i "$out" + ''; + # Type equality operator warning and failure with text >= 2.1.2 + # We filter out all Cabal related changes from this patch as Cabal bumps may change the behavior of stack. + name = "stack-ghc-9.10.patch"; + url = "https://github.com/commercialhaskell/stack/commit/6a672dd12f25151707cf45e9823447334728d245.patch"; + hash = "sha256-MVwYIvFwiuBx9r6QUR0dHejmsQxVI6KFoZlujSXYJPM="; + includes = [ + "src/Stack/Prelude.hs" + "src/Stack/Types/CompilerBuild.hs" + ]; + } + )) + ]; # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2024-03-21: pins specific version of ShellCheck @@ -2074,14 +2333,6 @@ with haskellLib; ) ); - stack = super.stack.overrideScope ( - self: super: { - # stack needs to be built with the same hpack version that the upstream releases use. - # https://github.com/NixOS/nixpkgs/issues/223390 - hpack = self.hpack_0_38_1; - } - ); - # ShellCheck < 0.10.0 needs to be adjusted for changes in fgl >= 5.8 # https://github.com/koalaman/shellcheck/issues/2677 ShellCheck_0_9_0 = doJailbreak ( @@ -2135,20 +2386,16 @@ with haskellLib; sha256 = "0l15ccfdys100jf50s9rr4p0d0ikn53bkh7a9qlk9i0y0z5jc6x1"; }) super.basic-cpuid; - # Allow building with language-docker >= 13 (!); waiting for 2.13 release. - hadolint = doJailbreak ( - appendPatches [ - (pkgs.fetchpatch { - name = "hadolint-language-docker-12.patch"; - url = "https://github.com/hadolint/hadolint/commit/593ccde5af13c9b960b3ea815c47ce028a2e8adc.patch"; - sha256 = "07v5c1k8if72j04m017jpsf7gvc5kwyi1q3a532n0zhxqc7w1zjn"; - includes = [ - "**/DL3011.hs" - "**/DL3011Spec.hs" - ]; - }) - ] super.hadolint - ); + # 2025-09-03 jailbreak for base >= 4.20 + # https://github.com/brandonhamilton/ilist/issues/17 + ilist = lib.pipe super.ilist [ + (warnAfterVersion "0.4.0.1") + doJailbreak + ]; + + # 2025-09-18: ilist >=0.3.1 && <0.4, optparse-applicative >=0.19.0 && <0.20 + # https://github.com/hadolint/hadolint/issues/1127 + hadolint = doJailbreak super.hadolint; # Too strict lower bounds on (test) deps # https://github.com/phadej/puresat/issues/6 @@ -2157,24 +2404,14 @@ with haskellLib; # test suite requires stack to run, https://github.com/dino-/photoname/issues/24 photoname = dontCheck super.photoname; - # Upgrade of unordered-containers in Stackage causes ordering-sensitive test to fail - # https://github.com/commercialhaskell/stackage/issues/6366 - # https://github.com/kapralVV/Unique/issues/9 - # Too strict bounds on hashable - # https://github.com/kapralVV/Unique/pull/10 - Unique = warnAfterVersion "0.4.7.9" ( - overrideCabal (drv: { - testFlags = [ - "--skip" - "/Data.List.UniqueUnsorted.removeDuplicates/removeDuplicates: simple test/" - "--skip" - "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/unique: simple test/" - "--skip" - "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/repeatedBy: simple test/" - ] - ++ drv.testFlags or [ ]; - }) super.Unique - ); + # Too strict bounds on + # QuickCheck (<2.15): https://github.com/kapralVV/Unique/issues/12 + # hashable (<1.5): https://github.com/kapralVV/Unique/issues/11#issuecomment-3088832168 + Unique = doJailbreak super.Unique; + + # Too strict bound on tasty-quickcheck (<0.11) + # https://github.com/haskell-unordered-containers/hashable/issues/321 + hashable_1_4_7_0 = doDistribute (doJailbreak super.hashable_1_4_7_0); # https://github.com/AndrewRademacher/aeson-casing/issues/8 aeson-casing = warnAfterVersion "0.2.0.0" ( @@ -2304,6 +2541,15 @@ with haskellLib; } super.regex-compat-tdfa ); + darcs = appendPatches [ + # Cabal 3.12 support in Setup.hs + # https://hub.darcs.net/darcs/darcs-reviewed/patch/50d9b0b402a896c83aa7929a50a0e0449838600f + ./patches/darcs-cabal-3.12.patch + # GHC 9.10 patch plus lifted constraints for hashable + # https://hub.darcs.net/darcs/darcs-reviewed/patch/32646b190e019de21a103e950c4eccdd66f7eadc + ./patches/darcs-stackage-lts-23.patch + ] super.darcs; + # 2025-02-11: Too strict bounds on hedgehog < 1.5, hspec-hedgehog < 0.2 validation-selective = doJailbreak super.validation-selective; @@ -2326,6 +2572,27 @@ with haskellLib; } ); + # Pick bound changes from development branch, same commit also adds support for Cabal >= 3.14 + glirc = lib.pipe super.glirc [ + (warnAfterVersion "2.41") + # Revisions only partially (?) include the changes we want + (overrideCabal { + revision = null; + editedCabalFile = null; + }) + (appendPatch ( + pkgs.fetchpatch { + name = "glirc-bounds-plus-cabal-3.14.patch"; + url = "https://github.com/glguy/irc-core/commit/00ab04700e45f6f7f2ffe4ac992ca73505407516.patch"; + hash = "sha256-XX6y3lR/a6ofcpkuqczC2A5IyHsAsRfAB+x4hdKu9+o="; + includes = [ + "glirc.cabal" + "Setup.hs" + ]; + } + )) + ]; + # 2025-02-11: Too strict bounds on base < 4.17 ema = doJailbreak super.ema; @@ -2370,6 +2637,13 @@ with haskellLib; # 2025-01-07: unreleased upstream supports hedgehog 1.5 but drifted quite a bit from hackage revisions so hard to patch hw-hspec-hedgehog = doJailbreak super.hw-hspec-hedgehog; + # 2025-09-03: allow QuickCheck 2.15 + # https://github.com/haskell-works/hw-prim/issues/150 + hw-prim = lib.pipe super.hw-prim [ + (warnAfterVersion "0.6.3.2") + doJailbreak + ]; + # Test suite doesn't support hspec 2.8 # https://github.com/zellige/hs-geojson/issues/29 geojson = dontCheck super.geojson; @@ -2389,11 +2663,15 @@ with haskellLib; }) ] super.hookup; - # Raise version bounds: https://github.com/kosmikus/records-sop/pull/15 - records-sop = appendPatch (fetchpatch { - url = "https://github.com/kosmikus/records-sop/commit/fb149f453a816ff14d0cb20b3ea56b80ff49d9f1.patch"; - sha256 = "sha256-iHiF4EWL/GjJFnr/6aR+yMZKLMLAZK+gsgSxG8YaeDI="; - }) super.records-sop; + basic-sop = appendPatch (fetchpatch { + # https://github.com/well-typed/basic-sop/pull/13 + name = "increase-upper-bounds.patch"; + url = "https://github.com/well-typed/basic-sop/commit/f1873487dd3e3955a82d6d9f37a6b164be36851f.patch"; + sha256 = "sha256-uBH+LmiSO91diVe4uX75/DdWT2wuyqEL+XUlSHnJk5k="; + }) super.basic-sop; + + # Unmaintained + records-sop = doJailbreak super.records-sop; # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20) polynomial = @@ -2441,35 +2719,11 @@ with haskellLib; }) ] super.krank; - hermes-json = overrideCabal (drv: { - # 2025-02-11: Upper bounds on hedgehog < 1.5 too strict. - jailbreak = true; + # 2025-08-06: Upper bounds on containers <0.7 and hedgehog < 1.5 too strict. + hermes-json = doJailbreak super.hermes-json; - # vendored simdjson breaks with clang-19. apply patches that work with - # a more recent simdjson so we can un-vendor it - patches = drv.patches or [ ] ++ [ - (fetchpatch { - url = "https://github.com/velveteer/hermes/commit/6fd9904d93a5c001aadb27c114345a6958904d71.patch"; - hash = "sha256-Pv09XP0/VjUiAFp237Adj06PIZU21mQRh7guTlKksvA="; - excludes = [ - ".github/*" - "hermes-bench/*" - ]; - }) - (fetchpatch { - url = "https://github.com/velveteer/hermes/commit/ca8dddbf52f9d7788460a056fefeb241bcd09190.patch"; - hash = "sha256-tDDGS0QZ3YWe7+SP09wnxx6lIWL986ce5Zhqr7F2sBk="; - excludes = [ - "README.md" - ".github/*" - "hermes-bench/*" - ]; - }) - ]; - postPatch = drv.postPatch or "" + '' - ln -fs ${pkgs.simdjson.src} simdjson - ''; - }) super.hermes-json; + # Allow containers >= 0.7, https://github.com/nomeata/arbtt/issues/181 + arbtt = doJailbreak super.arbtt; # hexstring is not compatible with newer versions of base16-bytestring # See https://github.com/solatis/haskell-hexstring/issues/3 @@ -2515,7 +2769,6 @@ with haskellLib; let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. - # TODO: maybe unify with the spago overlay in configuration-nix.nix? purescriptOverlay = self: super: { # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, # but it has a problem with parsing the `async` keyword. It doesn't allow @@ -2575,27 +2828,38 @@ with haskellLib; # Overly strict bounds on tasty-quickcheck (test suite) (< 0.11) hashable = doJailbreak super.hashable; + cborg = lib.pipe super.cborg [ - # Fix build on 32-bit: https://github.com/well-typed/cborg/pull/322 - (appendPatches ( - lib.optionals pkgs.stdenv.hostPlatform.is32bit [ - (pkgs.fetchpatch { - name = "cborg-i686-1.patch"; - url = "https://github.com/well-typed/cborg/commit/a4757c46219afe6d235652ae642786f2e2977020.patch"; - sha256 = "01n0x2l605x7in9hriz9asmzsfb5f8d6zkwgypckfj1r18qbs2hj"; - includes = [ "**/Codec/CBOR/**" ]; - stripLen = 1; - }) - (pkgs.fetchpatch { - name = "cborg-i686-2.patch"; - url = "https://github.com/well-typed/cborg/commit/94a856e4e544a5bc7f927cfb728de385d6260af4.patch"; - sha256 = "03iz85gsll38q5bl3m024iv7yb1k5sisly7jvgf66zic8fbvkhcn"; - includes = [ "**/Codec/CBOR/**" ]; - stripLen = 1; - }) - ] - )) + (appendPatches [ + # This patch changes CPP macros form gating on the version of ghc-prim to base + # since that's where the definitions are imported from. The source commit + # also changes the cabal file metadata which we filter out since we are + # only interested in this change as a dependency of cborg-i686-support-upstream.patch. + (pkgs.fetchpatch { + name = "cborg-no-gate-on-ghc-prim-version.patch"; + url = "https://github.com/well-typed/cborg/commit/a33f94f616f5047e45608a34ca16bfb1304ceaa1.patch"; + hash = "sha256-30j4Dksh2nnLKAcUF5XJw3Z/UjfV3F+JFnHeXSUs9Rk="; + includes = [ "**/Codec/CBOR/**" ]; + stripLen = 1; + }) + # Fixes compilation on 32-bit platforms. Unreleased patch committed to the + # upstream master branch: https://github.com/well-typed/cborg/pull/351 + (pkgs.fetchpatch { + name = "cborg-i686-support-upstream.patch"; + url = "https://github.com/well-typed/cborg/commit/ecc1360dcf9e9ee27d08de5206b844e075c88ca4.patch"; + hash = "sha256-9m2FlG6ziRxA1Dy22mErBaIjiZHa1dqtkbmFnMMFrTI="; + stripLen = 1; + }) + ]) + # Make sure patches to cborg.cabal apply + (overrideCabal (drv: { + prePatch = '' + ${drv.prePatch or ""} + ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal + ''; + })) ]; + # Doesn't compile with tasty-quickcheck == 0.11 (see issue above) serialise = dontCheck super.serialise; # https://github.com/Bodigrim/data-array-byte/issues/1 @@ -2612,19 +2876,6 @@ with haskellLib; # https://github.com/phadej/aeson-extra/issues/62 aeson-extra = doJailbreak super.aeson-extra; - # Support tasty-quickcheck 0.11: https://github.com/Bodigrim/mod/pull/26 - mod = appendPatch (fetchpatch { - url = "https://github.com/Bodigrim/mod/commit/30596fb9d85b69ec23ecb05ef9a7c91d67901cfd.patch"; - sha256 = "sha256-9XuzIxEbepaw5bRoIOUka8fkiZBfturIybh/9nhGmWQ="; - }) super.mod; - - # Fixes build of test suite: not yet released - primitive-unlifted = appendPatch (fetchpatch { - url = "https://github.com/haskell-primitive/primitive-unlifted/commit/26922952ef20c4771d857f3e96c9e710cb3c2df9.patch"; - sha256 = "0h9xxrv78spqi93l9206398gmsliaz0w6xy37nrvx3daqr1y4big"; - excludes = [ "*.cabal" ]; - }) super.primitive-unlifted; - # composite-aeson <0.8, composite-base <0.8 compdoc = doJailbreak super.compdoc; @@ -2652,36 +2903,35 @@ with haskellLib; # Test failure https://gitlab.com/lysxia/ap-normalize/-/issues/2 ap-normalize = dontCheck super.ap-normalize; + # Fixes test that checks error messages which is sensitive to GHC/Cabal version changes + heist = appendPatches [ + (pkgs.fetchpatch { + name = "heist-fix-ghc-errorr-message-test.patch"; + url = "https://github.com/snapframework/heist/commit/9c8c963021608f09e93d486e5339e45073c757bc.patch"; + sha256 = "sha256-lenMCb6o0aAJ8D450JB76cZ49o+LVl2UO9hhAZYPacI="; + }) + ] super.heist; + heist-extra = doJailbreak super.heist-extra; # base <4.18.0.0.0 unionmount = doJailbreak super.unionmount; # base <4.18 tailwind = doJailbreak super.tailwind; # base <=4.17.0.0 commonmark-wikilink = doJailbreak super.commonmark-wikilink; # base <4.18.0.0.0 - # 2024-03-02: Apply unreleased changes necessary for compatibility - # with commonmark-extensions-0.2.5.3. - commonmark-simple = warnAfterVersion "0.1.0.0" ( - appendPatches (map - ( - { rev, hash }: - fetchpatch { - name = "commonmark-simple-${lib.substring 0 7 rev}.patch"; - url = "https://github.com/srid/commonmark-simple/commit/${rev}.patch"; - includes = [ "src/Commonmark/Simple.hs" ]; - inherit hash; - } - ) - [ - { - rev = "71f5807ed4cbd8da915bf5ba04cd115b49980bcb"; - hash = "sha256-ibDQbyTd2BoA0V+ldMOr4XYurnqk1nWzbJ15tKizHrM="; - } - { - rev = "fc106c94f781f6a35ef66900880edc08cbe3b034"; - hash = "sha256-9cpgRNFWhpSuSttAvnwPiLmi1sIoDSYbp0sMwcKWgDQ="; - } - ] - ) (doJailbreak super.commonmark-simple) - ); + # 2025-09-03: Disable tests until this is solved: + # https://github.com/clash-lang/ghc-typelits-extra/issues/60 + ghc-typelits-extra = lib.pipe super.ghc-typelits-extra [ + (warnAfterVersion "0.4.8") + dontCheck + ]; + + # 2025-09-16: 0.5 adds support for GHC 9.12 and doesn't actually seem to contain a + # breaking change, so we can upgrade beyond Stackage. + # https://github.com/clash-lang/ghc-tcplugins-extra/pull/29#issuecomment-3299008674 + # https://github.com/clash-lang/ghc-tcplugins-extra/compare/702dda2095c66c4f5148a749c8b7dbcc8a09f5c...v0.5.0 + ghc-tcplugins-extra = doDistribute self.ghc-tcplugins-extra_0_5; + # 2025-09-11: Tests have been fixed in 0.7.12, but it requests ghc-tcplugins-extra >= 0.5 + # which Stackage LTS won't update to, but we can. + ghc-typelits-natnormalise = doDistribute self.ghc-typelits-natnormalise_0_7_12; # Test files missing from sdist # https://github.com/tweag/webauthn/issues/166 @@ -2719,6 +2969,8 @@ with haskellLib; hasql-notifications = dontCheck super.hasql-notifications_0_2_2_2; hasql-pool = dontCheck super.hasql-pool_1_0_1; hasql-transaction = dontCheck super.hasql-transaction_1_1_0_1; + text-builder = super.text-builder_0_6_10; + text-builder-dev = super.text-builder-dev_0_3_10; } )) [ @@ -2736,12 +2988,12 @@ with haskellLib; doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { - version = "13.0.4"; + version = "13.0.7"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-Y9Nxfs2w3Iinx61Om7dd+R8TTsK12oWD+3vki3WUz9Y="; + hash = "sha256-5bWemChm2MpogtGuiBuuep4lhRBhnKOOeBqm+Sqcgl4="; }; }) ]; @@ -2805,9 +3057,6 @@ with haskellLib; libraryToolDepends = (drv.libraryToolDepends or [ ]) ++ [ pkgs.buildPackages.git ]; }) super.kmonad; - # 2024-03-17: broken - vaultenv = dontDistribute super.vaultenv; - # 2024-01-24: support optparse-applicative 0.18 niv = appendPatches [ (fetchpatch { @@ -2826,11 +3075,12 @@ with haskellLib; # 2024-03-25: HSH broken because of the unix-2.8.0.0 breaking change HSH = appendPatches [ ./patches/HSH-unix-openFd.patch ] super.HSH; - # Support unix < 2.8 to build in older ghc than 9.6 - linux-namespaces = appendPatch (fetchpatch { - url = "https://github.com/redneb/hs-linux-namespaces/commit/f4a3546541bb6c7172fdd03e177a961da60e3951.patch"; - sha256 = "sha256-6Qv7NWIbzR3ktMGFogw5597bIqPH7Z4hoFvvBQAoquY="; - }) super.linux-namespaces; + # 2025-09-03: allow base 4.20 + # https://github.com/phadej/aeson-optics/issues/20 + aeson-optics = lib.pipe super.aeson-optics [ + (warnAfterVersion "1.2.1") + doJailbreak + ]; # Use recent git version as the hackage version is outdated and not building on recent GHC versions haskell-to-elm = overrideSrc { @@ -2877,11 +3127,45 @@ with haskellLib; + (drv.postPatch or ""); }) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext))); - proto3-wire = appendPatch (fetchpatch { - # https://github.com/awakesecurity/proto3-wire/pull/109 - url = "https://github.com/awakesecurity/proto3-wire/commit/b32f3db6f8d36ea0708fb2f371f62d439ea45b42.patch"; - hash = "sha256-EGFyk3XawU0+zk299WGwFKB2uW9eJrCDM6NgfIKWgRY="; - }) super.proto3-wire; + # QuickCheck <2.15 + # https://github.com/google/proto-lens/issues/403 + proto-lens-arbitrary = doJailbreak super.proto-lens-arbitrary; + + proto3-wire = appendPatches [ + (fetchpatch { + # https://github.com/awakesecurity/proto3-wire/pull/109 + name = "bump-outdated-bounds.patch"; + url = "https://github.com/awakesecurity/proto3-wire/commit/b32f3db6f8d36ea0708fb2f371f62d439ea45b42.patch"; + hash = "sha256-EGFyk3XawU0+zk299WGwFKB2uW9eJrCDM6NgfIKWgRY="; + }) + (fetchpatch { + # https://github.com/awakesecurity/proto3-wire/pull/110 + name = "support-GHC-9.10.patch"; + url = "https://github.com/awakesecurity/proto3-wire/commit/6fdf0eb93b2028ade0e3e011ce8429c94546839e.patch"; + hash = "sha256-jK0ztjuhM7qRH5T7xo75aX7wqmZFymOgWDx6UrlcqWQ="; + includes = [ + "*.cabal" + "*.hs" + ]; + }) + (fetchpatch { + # https://github.com/awakesecurity/proto3-wire/pull/108 + name = "add-reverse-encoders-for-packed-repeated-fields.patch"; + url = "https://github.com/awakesecurity/proto3-wire/commit/d4376fb6f1c1ac03ee8ec5c5793700ca6508ea70.patch"; + hash = "sha256-vtEYg/jLoTn1YRVhQJi6kyta+U4XiWeS7i1ZSN7BYf8="; + includes = [ + "**.cabal" + "*.hs" + ]; + }) + (fetchpatch { + # https://github.com/awakesecurity/proto3-wire/pull/111 + name = "support-LTS-24.patch"; + url = "https://github.com/awakesecurity/proto3-wire/commit/35fd88c4daf6643135db6da9ab6ed6d6f33eb3de.patch"; + hash = "sha256-GzXlweRshVLA29xVHhJSRIU40y+KtAplIqfvp0I8cY0="; + }) + + ] super.proto3-wire; # 2024-07-27: building test component requires non-trivial custom build steps # https://github.com/awakesecurity/proto3-suite/blob/bec9d40e2767143deed5b2d451197191f1d8c7d5/nix/overlays/haskell-packages.nix#L311 @@ -2927,21 +3211,17 @@ with haskellLib; }) ] (doJailbreak super.http2-client); + # doctests are failing https://github.com/alpmestan/taggy-lens/issues/8 + taggy-lens = dontCheck super.taggy-lens; + # https://github.com/snoyberg/http-client/pull/563 http-client-tls = doJailbreak super.http-client-tls; - # agda2hs 1.3 is not compatible with Agda 2.8.0 - agda2hs = lib.pipe super.agda2hs [ - (warnAfterVersion "1.3") - (overrideSrc rec { - version = "1.4"; - src = pkgs.fetchFromGitHub { - owner = "agda"; - repo = "agda2hs"; - rev = "v${version}"; - hash = "sha256-ZhemGUY6V0cplSwDAXkny+s6yQWKDDShTiUotIDhTXY="; - }; - }) + # 2025-09-03: allow bytestring 0.12 + # https://github.com/wangbj/hashing/issues/4 + hashing = lib.pipe super.hashing [ + (warnAfterVersion "0.1.1.0") + doJailbreak ]; bsb-http-chunked = lib.pipe super.bsb-http-chunked [ @@ -2967,39 +3247,12 @@ with haskellLib; # jailbreak to allow deepseq >= 1.5, https://github.com/jumper149/blucontrol/issues/3 blucontrol = doJailbreak super.blucontrol; - # Needs to match pandoc, see: - # https://github.com/jgm/pandoc/commit/97b36ecb7703b434ed4325cc128402a9eb32418d - commonmark-pandoc = doDistribute self.commonmark-pandoc_0_2_2_3; - - pandoc = lib.pipe super.pandoc [ - dontCheck # test errors in "jats-writer" possibly fixed in newer release - # Test output changes with newer version of texmath - (appendPatch (fetchpatch { - name = "jats:update-for-texmath"; - url = "https://github.com/jgm/pandoc/commit/e2a0cc9ddaf9e7d35cbd3c76f37e39737a79c2bf.patch"; - sha256 = "sha256-qA9mfYS/VhWwYbB9yu7wbHwozz3cqequ361PxkbAt08="; - includes = [ "test/*" ]; - })) - (appendPatch (fetchpatch { - name = "jats:update-for-mathml"; - url = "https://github.com/jgm/pandoc/commit/4ba0bac5c118da4da1d44e3bbb38d7c7aef19e3b.patch"; - sha256 = "sha256-ayRKeCqYKgZVA826xgAXxGhttm0Gx4ZrIRJlFlXPKhw="; - })) - (appendPatch (fetchpatch { - name = "jats:use-texmath-0.12.10.1"; - url = "https://github.com/jgm/pandoc/commit/d3d5366e5197330e035f9f1700929c9b5a24d532.patch"; - sha256 = "sha256-skG7LbKl4ypVnEYA9xMtDbUmHrjuXWfuchV8iMn8Yy0="; - includes = [ "test/*" ]; - })) - ]; - HList = lib.pipe super.HList [ # Fixes syntax error in tests (appendPatch (fetchpatch { url = "https://bitbucket.org/HList/hlist/commits/e688f11d7432c812c2b238464401a86f588f81e1/raw"; sha256 = "sha256-XIBIrR2MFmhKaocZJ4p57CgmAaFmMU5Z5a0rk2CjIcM="; })) - ]; # 2025-04-09: jailbreak to allow hedgehog >= 1.5 @@ -3008,9 +3261,19 @@ with haskellLib; # 2025-04-09: jailbreak to allow tasty-quickcheck >= 0.11 chimera = warnAfterVersion "0.4.1.0" (doJailbreak super.chimera); + # 2025-09-03: allow QuickCheck 2.15, containers 0.7, filepath 1.5, witch 1.3 + hevm = lib.pipe super.hevm [ + (warnAfterVersion "0.55.1") + doJailbreak + ]; + # 2025-04-09: jailbreak to allow tasty-quickcheck >= 0.11 bzlib = warnAfterVersion "0.5.2.0" (doJailbreak super.bzlib); + # 2025-07-29: test suite "test" fails to build because of missing source files, + # fixed by https://github.com/commercialhaskell/path/pull/193 + path = warnAfterVersion "0.9.6" (dontCheck super.path); + inherit (lib.mapAttrs ( _: pkg: @@ -3050,7 +3313,7 @@ with haskellLib; pipes-text = warnAfterVersion "1.0.1" (doJailbreak super.pipes-text); # 2025-04-09: jailbreak to allow bytestring >= 0.12 - array-builder = warnAfterVersion "0.1.4.1" (doJailbreak super.array-builder); + array-builder = warnAfterVersion "0.2.0.0" (doJailbreak super.array-builder); # 2025-04-09: missing dependency - somehow it's not listed on hackage broadcast-chan = addExtraLibrary self.conduit super.broadcast-chan; @@ -3058,9 +3321,6 @@ with haskellLib; # 2025-04-09: jailbreak to allow template-haskell >= 2.21, th-abstraction >= 0.7 kind-generics-th = warnAfterVersion "0.2.3.3" (doJailbreak super.kind-generics-th); - # 2025-04-09: jailbreak to allow tasty >= 1.5 - cvss = warnAfterVersion "0.1" (doJailbreak super.cvss); - # 2025-04-09: jailbreak to allow aeson >= 2.2, base >= 4.19, text >= 2.1 ebird-api = warnAfterVersion "0.2.0.0" (doJailbreak super.ebird-api); @@ -3079,26 +3339,43 @@ 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 ( - super.crucible.override { + monad-bayes = + # Floating point precision issues. Test suite is only checked on x86_64. + # https://github.com/tweag/monad-bayes/issues/368 + 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 + ) + # Too strict bounds on brick (<2.6), vty (<6.3) + # https://github.com/tweag/monad-bayes/issues/378 + (doJailbreak super.monad-bayes); + + crucible = + lib.pipe + (super.crucible.override { what4 = self.what4_1_7; - } - ) - ); + }) + [ + # 2025-04-13: jailbreak to allow th-abstraction >= 0.7 + (warnAfterVersion "0.7.2") + doJailbreak + + # Prevent clashes with now exported Prelude.foldl' + (appendPatch ( + pkgs.fetchpatch { + name = "base-4.20-foldl'.patch"; + url = "https://github.com/GaloisInc/crucible/commit/10f372e4b0389dd3966e04163dcd67d71e651709.patch"; + relative = "crucible"; + sha256 = "sha256-frxTs5SB1ENjH+X0lIlQ8k6pDIDOANylrqIOQpEtObU="; + } + )) + ]; crucible-llvm = super.crucible-llvm.override { what4 = self.what4_1_7; @@ -3140,6 +3417,17 @@ with haskellLib; # 2025-04-23: missing test data llvm-pretty-bc-parser = dontCheck super.llvm-pretty-bc-parser; + # diagrams-builder wants diagrams-cairo < 1.5 for its cairo executable, + # but Stackage LTS 24 contains diagrams-cairo >= 1.5. + # As such it is difficult to provide (2025-09-13) + # ATTN: This needs to match ../../tools/graphics/diagrams-builder/default.nix:/backends + # TODO: can we reinstate this by manually passing an older version? + diagrams-builder = disableCabalFlag "cairo" ( + super.diagrams-builder.override { + diagrams-cairo = null; + } + ); + # 2025-04-23: Allow bytestring >= 0.12 # https://github.com/mrkkrp/wave/issues/48 wave = doJailbreak super.wave; @@ -3186,6 +3474,12 @@ with haskellLib; # 2025-5-15: Too strict bounds on base <4.19, see: https://github.com/zachjs/sv2v/issues/317 sv2v = doJailbreak super.sv2v; + # 2025-09-20: New revision already on hackage. + nvfetcher = lib.pipe super.nvfetcher [ + (warnAfterVersion "0.7.0.0") + doJailbreak + ]; + # 2025-06-25: Upper bounds of transformers and bytestring too strict, # as haskore 0.2.0.8 was released in 2016 and is quite outdated. # Tests fail with: @@ -3196,6 +3490,36 @@ with haskellLib; # Needs to be fixed upstream haskore = dontCheck (doJailbreak super.haskore); + # 2025-07-10: Hackage release is outdated, https://github.com/portnov/libssh2-hs/issues/77 + libssh2 = overrideSrc { + version = "0.2.0.9-unstable-2025-04-03"; + src = + pkgs.fetchFromGitHub { + owner = "portnov"; + repo = "libssh2-hs"; + rev = "d35fa047cd872a73cd4db83aa3185463ac88a1d7"; + sha256 = "sha256-m3VVx9mgI3OqtWHC8qY63/Wns808q5iITD5regdMILo="; + } + + "/libssh2"; + } super.libssh2; + + # 2025-8-19: dontCheck because of: https://github.com/ucsd-progsys/liquid-fixpoint/issues/760 + # i.e. tests assume existence of .git and also fail for some versions of CVC5, + # including the current one in nixpkgs. + liquid-fixpoint = dontCheck super.liquid-fixpoint; + + # 2025-09-20: Too strict upper bound on text (<2.1.3) + # https://github.com/mchav/dataframe/issues/61 + dataframe = doJailbreak (warnAfterVersion "0.3.0.4" super.dataframe); + + # 2025-8-26: Too strict bounds on containers and text, see: https://github.com/stackbuilders/inflections-hs/pull/83 + inflections = doJailbreak super.inflections; + + # 2025-8-26: Too strict bounds on base <=4.19, see https://github.com/typeclasses/stripe/pull/11 + stripe-concepts = doJailbreak super.stripe-concepts; + stripe-signature = doJailbreak super.stripe-signature; + stripe-wreq = doJailbreak super.stripe-wreq; + # 2025-08-01: Fixes few build errors related to pointers. # https://github.com/haskell-cryptography/botan/pull/17 botan-bindings = appendPatch (pkgs.fetchpatch2 { @@ -3353,13 +3677,13 @@ with haskellLib; amazonkaSrc = pkgs.fetchFromGitHub { owner = "brendanhay"; repo = "amazonka"; - rev = "f3a7fca02fdbb832cc348e991983b1465225d50c"; - sha256 = "sha256-u+R+4WeCd16X8H2dkDHzD3nOLsvsTB0lLNUsbRT23aE="; + rev = "7645bd335f008912b9e5257486f622b674de7afa"; + sha256 = "sha256-ObamDnJdcLA2BlX9iGIxkaknUeL3Po3madKO4JA/em0="; }; setAmazonkaSourceRoot = dir: drv: (overrideSrc { - version = "2.0"; + version = "2.0-unstable-2025-04-16"; src = amazonkaSrc + "/${dir}"; }) drv; @@ -3733,5 +4057,8 @@ with haskellLib; amazonka = warnAfterVersion "2.0" ( setAmazonkaSourceRoot "lib/amazonka" (doJailbreak super.amazonka) ); + amazonka-test = warnAfterVersion "2.0" ( + setAmazonkaSourceRoot "lib/amazonka-test" (doJailbreak super.amazonka-test) + ); } ) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 5967401419b17..f3387cd2ce7fb 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -356,18 +356,18 @@ self: super: # the latter in the future! cabal2nix = overrideCabal (old: { postInstall = '' - remove-references-to -t ${self.hpack} "$out/bin/cabal2nix" + remove-references-to -t ${self.hpack} "''${!outputBin}/bin/cabal2nix" # Note: The `data` output is needed at runtime. - remove-references-to -t ${self.distribution-nixpkgs.out} "$out/bin/hackage2nix" + remove-references-to -t ${self.distribution-nixpkgs.out} "''${!outputBin}/bin/hackage2nix" ${old.postInstall or ""} ''; }) super.cabal2nix; cabal2nix-unstable = overrideCabal (old: { postInstall = '' - remove-references-to -t ${self.hpack} "$out/bin/cabal2nix" + remove-references-to -t ${self.hpack} "''${!outputBin}/bin/cabal2nix" # Note: The `data` output is needed at runtime. - remove-references-to -t ${self.distribution-nixpkgs-unstable.out} "$out/bin/hackage2nix" + remove-references-to -t ${self.distribution-nixpkgs-unstable.out} "''${!outputBin}/bin/hackage2nix" ${old.postInstall or ""} ''; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 3cd9002c3a028..a204f4d41fb34 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -65,6 +65,15 @@ self: super: { # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; + # Becomes a core package in GHC >= 9.10 + os-string = doDistribute self.os-string_1_0_0; + + # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available + ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; + # Only required for ghc >= 9.2 nothunks = super.nothunks.override { wherefrom-compat = null; @@ -82,18 +91,17 @@ self: super: { # For GHC < 9.4, some packages need data-array-byte as an extra dependency primitive = addBuildDepends [ self.data-array-byte ] super.primitive; - # For GHC < 9.2, os-string is not required. - hashable = + # hashable >= 1.5 only supports GHC >= 9.6 / base >= 4.18 + hashable = self.hashable_1_4_7_0; + hashable_1_4_7_0 = + # extra deps for GHC < 9.4 addBuildDepends [ self.data-array-byte self.base-orphans ] - ( - super.hashable.override { - os-string = null; - } - ); + # For GHC < 9.2, os-string is not required + (super.hashable_1_4_7_0.override { os-string = null; }); # Too strict lower bounds on base primitive-addr = doJailbreak super.primitive-addr; @@ -116,7 +124,7 @@ self: super: { (markBroken super.haskell-language-server); # test suite depends on vcr since hpack >= 0.38.1 which requires GHC2021 - hpack_0_38_1 = dontCheck super.hpack_0_38_1; + hpack = dontCheck super.hpack; # Needs to use ghc-lib due to incompatible GHC ghc-tags = doDistribute self.ghc-tags_1_5; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index fbac3690a708d..9bf63d98ac6bb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -64,51 +64,26 @@ in unix = null; xhtml = null; + # “Unfortunately we are unable to support GHC 9.10.” + apply-refact = dontDistribute (markBroken super.apply-refact); + # # Version upgrades # # Upgrade to accommodate new core library versions, where the authors have # already made the relevant changes. - # 2025-04-09: jailbreak to allow hedgehog >= 1.5, hspec-hedgehog >=0.2 - extensions = doJailbreak (doDistribute self.extensions_0_1_0_2); - fourmolu = doDistribute self.fourmolu_0_16_0_0; - # https://github.com/digital-asset/ghc-lib/issues/600 - ghc-lib = doDistribute self.ghc-lib_9_10_2_20250515; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_2_20250515; - ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; - htree = doDistribute self.htree_0_2_0_0; - ormolu = doDistribute self.ormolu_0_7_7_0; - stylish-haskell = doDistribute self.stylish-haskell_0_15_0_1; - - # A given major version of ghc-exactprint only supports one version of GHC. - ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; - ghc-exactprint_1_9_0_0 = addBuildDepends [ - self.Diff - self.extra - self.ghc-paths - self.silently - self.syb - self.HUnit - ] super.ghc-exactprint_1_9_0_0; # # Jailbreaks # - # 2025-04-09: base <4.20, containers <0.7, filepath <1.5, Cabal-syntax <3.11 - cabal-install-parsers = - assert super.cabal-install-parsers.version == "0.6.1.1"; - doJailbreak super.cabal-install-parsers; floskell = doJailbreak super.floskell; # base <4.20 # 2025-04-09: filepath <1.5 haddock-library = assert super.haddock-library.version == "1.11.0"; doJailbreak super.haddock-library; - large-generics = doJailbreak super.large-generics; # base <4.20 tree-sitter = doJailbreak super.tree-sitter; # containers <0.7, filepath <1.5 - hashable_1_5_0_0 = doJailbreak super.hashable_1_5_0_0; # relax bounds for QuickCheck, tasty, and tasty-quickcheck - # # Test suite issues # @@ -116,12 +91,4 @@ in fsnotify = dontCheck super.fsnotify; # https://github.com/haskell-fswatch/hfsnotify/issues/115 hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38 monad-dijkstra = dontCheck super.monad-dijkstra; # needs hlint 3.10 - - haskell-language-server = super.haskell-language-server.override { - floskell = null; - retrie = null; - hlint = null; - apply-refact = null; - }; - } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index 79afa7b31ccb2..c0a06d50b4782 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -71,37 +71,20 @@ with haskellLib; # Hand pick versions that are compatible with ghc 9.12 and base 4.21 # - extra = doDistribute self.extra_1_8; - htree = doDistribute self.htree_0_2_0_0; - tagged = doDistribute self.tagged_0_8_9; - time-compat = doDistribute self.time-compat_1_9_8; extensions = doDistribute self.extensions_0_1_0_3; - doctest = doDistribute self.doctest_0_24_2; # see :/doctest_0_24_2 =/ below - ghc-syntax-highlighter = doDistribute self.ghc-syntax-highlighter_0_0_13_0; - ghc-lib = doDistribute self.ghc-lib_9_12_2_20250421; ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_12_2_20250421; - ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_12_0_0; - hlint = doDistribute self.hlint_3_10; - # fourmolu checks require Diff > 1.0, which is not yet supported by various other deps of hls. - fourmolu = doDistribute (dontCheck self.fourmolu_0_18_0_0); - ormolu = doDistribute self.ormolu_0_8_0_0; - stylish-haskell = doDistribute self.stylish-haskell_0_15_1_0; - apply-refact = doDistribute self.apply-refact_0_15_0_0; # # Jailbreaks # large-generics = doJailbreak super.large-generics; # base <4.20 - time-compat_1_9_8 = doJailbreak super.time-compat_1_9_8; # too strict lower bound on QuickCheck cpphs = overrideCabal (drv: { # jail break manually the conditional dependencies postPatch = '' sed -i 's/time >=1.5 \&\& <1.13/time >=1.5 \&\& <=1.14/g' cpphs.cabal ''; }) super.cpphs; - vector = doJailbreak super.vector; # doctest >=0.15 && <0.24 cabal-install-parsers = doJailbreak super.cabal-install-parsers; # base, Cabal-syntax, etc. ghc-exactprint_1_12_0_0 = addBuildDepends [ # somehow buildDepends was missing @@ -126,15 +109,6 @@ with haskellLib; relude = dontCheck super.relude; - doctest_0_24_2 = overrideCabal (drv: { - testFlags = drv.testFlags or [ ] ++ [ - # These tests require cabal-install (would cause infinite recursion) - "--skip=/Cabal.Options" - "--skip=/Cabal.Paths/paths" - "--skip=/Cabal.ReplOptions" # >= 0.23 - ]; - }) super.doctest_0_24_2; - # https://gitlab.haskell.org/ghc/ghc/-/issues/25930 generic-lens = dontCheck super.generic-lens; @@ -154,27 +128,4 @@ with haskellLib; interpolate = assert super.ghc.version == "9.12.2"; dontCheck super.interpolate; - - # - # Multiple issues - # - - doctest-parallel = overrideCabal (drv: { - patches = drv.patches or [ ] ++ [ - (pkgs.fetchpatch { - name = "doctest-0.23.0-ghc-9.12.patch"; - url = "https://github.com/martijnbastiaan/doctest-parallel/commit/d3df7aa5d223f3daeb676c8a7efe093ee743d54f.patch"; - sha256 = "sha256-92CtqBCulfOTjLAeC205cIrqL/2CBP1YFLijTVcTD2M="; - includes = [ "src/Test/DocTest/Helpers.hs" ]; - }) - ]; - }) (dontCheck (doJailbreak super.doctest-parallel)); # Cabal >=2.4 && <3.13 - - haskell-language-server = super.haskell-language-server.override { - floskell = null; - retrie = null; - }; - - # Allow Cabal 3.14 - hpack = doDistribute self.hpack_0_38_1; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix similarity index 81% rename from pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix rename to pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix index 555870017bcf2..0ff76cae4892c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix @@ -45,12 +45,7 @@ self: super: { stm = null; system-cxx-std-lib = null; template-haskell = null; - # GHC only builds terminfo if it is a native compiler - terminfo = - if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then - null - else - haskellLib.doDistribute self.terminfo_0_4_1_7; + terminfo = null; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 10e5d2bd55d9b..8bc8c6b6d2a93 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -62,9 +62,18 @@ self: super: { # their existence to callPackages, but their is no shim for lower GHC versions. system-cxx-std-lib = null; + # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available + ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; + # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; + # Becomes a core package in GHC >= 9.10 + os-string = doDistribute self.os-string_2_0_8; + # weeder >= 2.5 requires GHC 9.4 weeder = doDistribute self.weeder_2_4_1; # Allow dhall 1.42.* @@ -81,8 +90,10 @@ self: super: { "haskell-language-server has dropped support for ghc 9.2 in version 2.10.0.0, please use a newer ghc version or an older nixpkgs version" (markBroken super.haskell-language-server); + # hashable >= 1.5 doesn't support base < 4.18 + hashable = self.hashable_1_4_7_0; # For GHC < 9.4, some packages need data-array-byte as an extra dependency - hashable = addBuildDepends [ self.data-array-byte ] super.hashable; + hashable_1_4_7_0 = addBuildDepends [ self.data-array-byte ] super.hashable_1_4_7_0; primitive = addBuildDepends [ self.data-array-byte ] super.primitive; primitive-unlifted = super.primitive-unlifted_0_1_3_1; # Too strict lower bound on base diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 924f7c1309f80..7673e54c2e74c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -54,11 +54,22 @@ self: super: { # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; + # Becomes a core package in GHC >= 9.10 + os-string = doDistribute self.os-string_2_0_8; + + # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available + ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; + # only broken for >= 9.6 calligraphy = doDistribute (unmarkBroken super.calligraphy); # Jailbreaks & Version Updates + # hashable >= 1.5 needs base >= 4.18 + hashable = self.hashable_1_4_7_0; hashable-time = doJailbreak super.hashable-time; libmpd = doJailbreak super.libmpd; @@ -105,8 +116,12 @@ self: super: { } ); + # Last version to not depend on file-io and directory-ospath-streaming, + # which both need unix >= 2.8. + tar = self.tar_0_6_3_0; + # A given major version of ghc-exactprint only supports one version of GHC. - ghc-exactprint = super.ghc-exactprint_1_6_1_3; + ghc-exactprint = dontCheck super.ghc-exactprint_1_6_1_3; # Too strict upper bound on template-haskell # https://github.com/mokus0/th-extras/issues/18 @@ -115,22 +130,32 @@ self: super: { # https://github.com/kowainik/relude/issues/436 relude = dontCheck super.relude; + haddock-library = doJailbreak super.haddock-library; + apply-refact = addBuildDepend self.data-default-class super.apply-refact; + path = self.path_0_9_5; inherit ( let hls_overlay = lself: lsuper: { Cabal-syntax = lself.Cabal-syntax_3_10_3_0; Cabal = lself.Cabal_3_10_3_0; + extensions = dontCheck (doJailbreak (lself.extensions_0_1_0_1)); }; in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { - haskell-language-server = allowInconsistentDependencies super.haskell-language-server; - fourmolu = doJailbreak self.fourmolu_0_14_0_0; # ansi-terminal, Diff + haskell-language-server = allowInconsistentDependencies ( + addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server + ); + fourmolu = doJailbreak (dontCheck self.fourmolu_0_14_0_0); # ansi-terminal, Diff ormolu = doJailbreak self.ormolu_0_7_2_0; # ansi-terminal hlint = self.hlint_3_6_1; stylish-haskell = self.stylish-haskell_0_14_5_0; + retrie = doJailbreak (unmarkBroken super.retrie); + floskell = doJailbreak super.floskell; } ) + retrie + floskell haskell-language-server fourmolu ormolu diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index bfc688281f227..ba8c067651f40 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -62,6 +62,15 @@ in # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; + # Becomes a core package in GHC >= 9.10 + os-string = doDistribute self.os-string_2_0_8; + + # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available + ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; + # Needs base-orphans for GHC < 9.8 / base < 4.19 some = addBuildDepend self.base-orphans super.some; @@ -100,7 +109,6 @@ in stm-containers = dontCheck super.stm-containers; regex-tdfa = dontCheck super.regex-tdfa; hiedb = dontCheck super.hiedb; - retrie = dontCheck super.retrie; # https://github.com/kowainik/relude/issues/436 relude = dontCheck (doJailbreak super.relude); @@ -188,17 +196,38 @@ in # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = addBuildDepend self.extra super.ghc-exactprint_1_7_1_0; + + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; + haddock-library = doJailbreak super.haddock-library; + apply-refact = addBuildDepend self.data-default-class super.apply-refact; + inherit + ( + let + hls_overlay = lself: lsuper: { + Cabal-syntax = lself.Cabal-syntax_3_10_3_0; + Cabal = lself.Cabal_3_10_3_0; + extensions = dontCheck (doJailbreak lself.extensions_0_1_0_1); + }; + in + lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { + haskell-language-server = allowInconsistentDependencies ( + addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server + ); + ormolu = doDistribute self.ormolu_0_7_4_0; + fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0)); + hlint = doDistribute self.hlint_3_8; + stylish-haskell = self.stylish-haskell_0_14_6_0; + retrie = doJailbreak (unmarkBroken super.retrie); + floskell = doJailbreak super.floskell; + } + ) + retrie + floskell + haskell-language-server + fourmolu + ormolu + hlint + stylish-haskell + ; } -# super.ghc is required to break infinite recursion as Nix is strict in the attrNames -// - lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && lib.versionOlder super.ghc.version "9.6.4") - { - # The NCG backend for aarch64 generates invalid jumps in some situations, - # the workaround on 9.6 is to revert to the LLVM backend (which is used - # for these sorts of situations even on 9.2 and 9.4). - # https://gitlab.haskell.org/ghc/ghc/-/issues/23746#note_525318 - inherit (lib.mapAttrs (_: self.forceLlvmCodegenBackend) super) - tls - mmark - ; - } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index e70da8a3e6882..f739c9ddea641 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -12,7 +12,7 @@ let ver: pkg: lib.warnIf (lib.versionOlder ver super.${pkg.pname}.version - ) "override for haskell.packages.ghc912.${pkg.pname} may no longer be needed" pkg; + ) "override for haskell.packages.ghc98.${pkg.pname} may no longer be needed" pkg; in @@ -62,10 +62,18 @@ in unix = null; xhtml = null; + # Becomes a core package in GHC >= 9.10 + os-string = doDistribute self.os-string_2_0_8; + + # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available + ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; + # # Version upgrades # - megaparsec = doDistribute self.megaparsec_9_7_0; ghc-tags = self.ghc-tags_1_8; # @@ -93,14 +101,40 @@ in # A factor of 100 is insufficient, 200 seems seems to work. hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip; - # 2025-04-21: "flavor" for GHC 9.8.5 is missing a fix introduced for 9.8.4. See: - # https://github.com/digital-asset/ghc-lib/pull/571#discussion_r2052684630 - ghc-lib-parser = warnAfterVersion "9.8.5.20250214" ( - overrideCabal { - postPatch = '' - substituteInPlace compiler/cbits/genSym.c \ - --replace-fail "HsWord64 u = atomic_inc64" "HsWord64 u = atomic_inc" - ''; - } super.ghc-lib-parser - ); + # A given major version of ghc-exactprint only supports one version of GHC. + ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0; + + haddock-library = doJailbreak super.haddock-library; + apply-refact = addBuildDepend self.data-default-class super.apply-refact; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; + inherit + ( + let + hls_overlay = lself: lsuper: { + Cabal-syntax = lself.Cabal-syntax_3_10_3_0; + Cabal = lself.Cabal_3_10_3_0; + extensions = dontCheck (doJailbreak super.extensions_0_1_0_1); + }; + in + lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { + haskell-language-server = allowInconsistentDependencies ( + addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server + ); + ormolu = doDistribute self.ormolu_0_7_4_0; + fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0)); + hlint = doDistribute self.hlint_3_8; + stylish-haskell = self.stylish-haskell_0_14_6_0; + retrie = doJailbreak (unmarkBroken super.retrie); + floskell = doJailbreak super.floskell; + } + ) + retrie + floskell + haskell-language-server + fourmolu + ormolu + hlint + stylish-haskell + ; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 596ba0796b47c..e2c5b85c0483a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -21,6 +21,7 @@ broken-packages: - AC-MiniTest # failure in job https://hydra.nixos.org/build/233216015 at 2023-09-02 - AC-Terminal # failure in job https://hydra.nixos.org/build/233192747 at 2023-09-02 - AC-VanillaArray # failure in job https://hydra.nixos.org/build/233216801 at 2023-09-02 + - accelerate # failure in job https://hydra.nixos.org/build/307516269 at 2025-09-19 - accelerate-fftw # failure in job https://hydra.nixos.org/build/296049868 at 2025-05-02 - accelerate-random # failure in job https://hydra.nixos.org/build/296049869 at 2025-05-02 - accelerate-utility # failure in job https://hydra.nixos.org/build/296049871 at 2025-05-02 @@ -65,6 +66,7 @@ broken-packages: - adaptive-containers # failure in job https://hydra.nixos.org/build/233243181 at 2023-09-02 - adaptive-tuple # failure in job https://hydra.nixos.org/build/233244881 at 2023-09-02 - adb # failure in job https://hydra.nixos.org/build/233193888 at 2023-09-02 + - adblock2privoxy # failure in job https://hydra.nixos.org/build/307609942 at 2025-09-19 - addy # failure in job https://hydra.nixos.org/build/233240594 at 2023-09-02 - adhoc-fixtures-hspec # failure in job https://hydra.nixos.org/build/252725981 at 2024-03-16 - adjunction # failure in job https://hydra.nixos.org/build/233237774 at 2023-09-02 @@ -74,6 +76,7 @@ broken-packages: - AERN-Basics # failure in job https://hydra.nixos.org/build/233246999 at 2023-09-02 - aeson-applicative # failure in job https://hydra.nixos.org/build/233213824 at 2023-09-02 - aeson-bson # failure in job https://hydra.nixos.org/build/233201964 at 2023-09-02 + - aeson-combinators # failure in job https://hydra.nixos.org/build/307516309 at 2025-09-19 - aeson-commit # failure in job https://hydra.nixos.org/build/233198515 at 2023-09-02 - aeson-compat # failure in job https://hydra.nixos.org/build/233208257 at 2023-09-02 - aeson-decode # failure in job https://hydra.nixos.org/build/233251197 at 2023-09-02 @@ -85,6 +88,7 @@ broken-packages: - aeson-flat # failure in job https://hydra.nixos.org/build/233220787 at 2023-09-02 - aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02 - aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02 + - aeson-generic-default # failure in job https://hydra.nixos.org/build/307516312 at 2025-09-19 - aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07 - aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02 - aeson-iproute # failure in job https://hydra.nixos.org/build/295091261 at 2025-04-22 @@ -196,6 +200,7 @@ broken-packages: - antisplice # failure in job https://hydra.nixos.org/build/233238144 at 2023-09-02 - antlr-haskell # failure in job https://hydra.nixos.org/build/233208196 at 2023-09-02 - anydbm # failure in job https://hydra.nixos.org/build/233195447 at 2023-09-02 + - aoc # failure in job https://hydra.nixos.org/build/307516728 at 2025-09-19 - Aoide # failure in job https://hydra.nixos.org/build/233239286 at 2023-09-02 - aop-prelude # failure in job https://hydra.nixos.org/build/295091671 at 2025-04-22 - aosd # failure in job https://hydra.nixos.org/build/233207331 at 2023-09-02 @@ -211,7 +216,6 @@ broken-packages: - appc # failure in job https://hydra.nixos.org/build/233200853 at 2023-09-02 - appendful-persistent # failure in job https://hydra.nixos.org/build/233249677 at 2023-09-02 - apple # failure in job https://hydra.nixos.org/build/269877626 at 2024-08-19 - - AppleScript # failure in job https://hydra.nixos.org/build/233231626 at 2023-09-02 - applicative-fail # failure in job https://hydra.nixos.org/build/233237624 at 2023-09-02 - applicative-parsec # failure in job https://hydra.nixos.org/build/233221615 at 2023-09-02 - applicative-quoters # failure in job https://hydra.nixos.org/build/233191023 at 2023-09-02 @@ -241,6 +245,7 @@ broken-packages: - arpa # failure in job https://hydra.nixos.org/build/233200212 at 2023-09-02 - arpack # failure in job https://hydra.nixos.org/build/233240937 at 2023-09-02 - array-list # failure in job https://hydra.nixos.org/build/233197669 at 2023-09-02 + - array-mhs # failure in job https://hydra.nixos.org/build/307610290 at 2025-09-19 - array-primops # failure in job https://hydra.nixos.org/build/233191559 at 2023-09-02 - arrayfire # failure in job https://hydra.nixos.org/build/233225004 at 2023-09-02 - ArrayRef # failure in job https://hydra.nixos.org/build/233196329 at 2023-09-02 @@ -253,7 +258,9 @@ broken-packages: - artery # failure in job https://hydra.nixos.org/build/233206830 at 2023-09-02 - artifact # failure in job https://hydra.nixos.org/build/233233300 at 2023-09-02 - asap # failure in job https://hydra.nixos.org/build/233214968 at 2023-09-02 + - ascii-caseless # failure in job https://hydra.nixos.org/build/307516784 at 2025-09-19 - ascii-flatten # failure in job https://hydra.nixos.org/build/233229168 at 2023-09-02 + - ascii-group # failure in job https://hydra.nixos.org/build/307516787 at 2025-09-19 - ascii-string # failure in job https://hydra.nixos.org/build/233249978 at 2023-09-02 - ascii-vector-avc # failure in job https://hydra.nixos.org/build/233208533 at 2023-09-02 - ascii85-conduit # failure in job https://hydra.nixos.org/build/233235427 at 2023-09-02 @@ -264,7 +271,6 @@ broken-packages: - asn1-ber-syntax # failure in job https://hydra.nixos.org/build/233235772 at 2023-09-02 - asn1-codec # failure in job https://hydra.nixos.org/build/233217242 at 2023-09-02 - asn1-data # failure in job https://hydra.nixos.org/build/233252918 at 2023-09-02 - - AspectAG # failure in job https://hydra.nixos.org/build/233231125 at 2023-09-02 - assert # failure in job https://hydra.nixos.org/build/233257692 at 2023-09-02 - assertions # failure in job https://hydra.nixos.org/build/233215277 at 2023-09-02 - asset-map # failure in job https://hydra.nixos.org/build/233218566 at 2023-09-02 @@ -281,10 +287,12 @@ broken-packages: - async-manager # failure in job https://hydra.nixos.org/build/233246552 at 2023-09-02 - async-timer # failure in job https://hydra.nixos.org/build/233200611 at 2023-09-02 - asynchronous-exceptions # failure in job https://hydra.nixos.org/build/233218419 at 2023-09-02 + - AsyncRattus # failure in job https://hydra.nixos.org/build/307515919 at 2025-09-19 - aterm # failure in job https://hydra.nixos.org/build/233226675 at 2023-09-02 - atlassian-connect-descriptor # failure in job https://hydra.nixos.org/build/233249503 at 2023-09-02 - atndapi # failure in job https://hydra.nixos.org/build/233223849 at 2023-09-02 - atom # failure in job https://hydra.nixos.org/build/233193561 at 2023-09-02 + - atomic-css # failure in job https://hydra.nixos.org/build/307516853 at 2025-09-19 - atomic-modify # failure in job https://hydra.nixos.org/build/233220400 at 2023-09-02 - atomic-modify-general # failure in job https://hydra.nixos.org/build/295091770 at 2025-04-22 - atomic-primops-vector # failure in job https://hydra.nixos.org/build/233228512 at 2023-09-02 @@ -315,7 +323,6 @@ broken-packages: - auto # failure in job https://hydra.nixos.org/build/233211088 at 2023-09-02 - auto-split # failure in job https://hydra.nixos.org/build/295091795 at 2025-04-22 - autoapply # failure in job https://hydra.nixos.org/build/295091805 at 2025-04-22 - - autodocodec-exact # failure in job https://hydra.nixos.org/build/302801281 at 2025-07-27 - autom # failure in job https://hydra.nixos.org/build/234461198 at 2023-09-13 - automata # failure in job https://hydra.nixos.org/build/295091890 at 2025-04-22 - autonix-deps # failure in job https://hydra.nixos.org/build/233258269 at 2023-09-02 @@ -325,6 +332,7 @@ broken-packages: - aviation-units # failure in job https://hydra.nixos.org/build/233245762 at 2023-09-02 - avl-static # failure in job https://hydra.nixos.org/build/233199062 at 2023-09-02 - avr-shake # failure in job https://hydra.nixos.org/build/233223187 at 2023-09-02 + - avro # failure in job https://hydra.nixos.org/build/307610307 at 2025-09-19 - avro-piper # failure in job https://hydra.nixos.org/build/233197510 at 2023-09-02 - avwx # failure in job https://hydra.nixos.org/build/233258167 at 2023-09-02 - awesome-prelude # failure in job https://hydra.nixos.org/build/233232761 at 2023-09-02 @@ -341,6 +349,7 @@ broken-packages: - aws-performance-tests # failure in job https://hydra.nixos.org/build/233259271 at 2023-09-02 - aws-route53 # failure in job https://hydra.nixos.org/build/233218200 at 2023-09-02 - aws-sdk-text-converter # failure in job https://hydra.nixos.org/build/233237525 at 2023-09-02 + - aws-secrets # failure in job https://hydra.nixos.org/build/307516873 at 2025-09-19 - aws-ses-easy # failure building library in job https://hydra.nixos.org/build/237249788 at 2023-10-21 - aws-simple # failure building library in job https://hydra.nixos.org/build/237242730 at 2023-10-21 - awsspendsummary # failure in job https://hydra.nixos.org/build/295091850 at 2025-04-22 @@ -361,6 +370,7 @@ broken-packages: - bag # failure in job https://hydra.nixos.org/build/233250281 at 2023-09-02 - Baggins # failure in job https://hydra.nixos.org/build/233192786 at 2023-09-02 - bake # failure in job https://hydra.nixos.org/build/233211889 at 2023-09-02 + - bamse # failure in job https://hydra.nixos.org/build/307516881 at 2025-09-19 - Bang # failure in job https://hydra.nixos.org/build/233226846 at 2023-09-02 - banwords # failure in job https://hydra.nixos.org/build/233229703 at 2023-09-02 - barbies-th # failure in job https://hydra.nixos.org/build/233251598 at 2023-09-02 @@ -416,6 +426,7 @@ broken-packages: - bert # failure in job https://hydra.nixos.org/build/233195424 at 2023-09-02 - besout # failure in job https://hydra.nixos.org/build/233194433 at 2023-09-02 - bet # failure in job https://hydra.nixos.org/build/233205655 at 2023-09-02 + - betacode # failure in job https://hydra.nixos.org/build/307516959 at 2025-09-19 - betris # failure in job https://hydra.nixos.org/build/233200110 at 2023-09-02 - bff-mono # failure in job https://hydra.nixos.org/build/252710505 at 2024-03-16 - bglib # failure in job https://hydra.nixos.org/build/265955624 at 2024-07-14 @@ -473,7 +484,6 @@ broken-packages: - bindings-wlc # failure in job https://hydra.nixos.org/build/233332720 at 2023-09-02 - bindynamic # failure in job https://hydra.nixos.org/build/295091957 at 2025-04-22 - binembed # failure in job https://hydra.nixos.org/build/233219100 at 2023-09-02 - - binrep-instances # failure in job https://hydra.nixos.org/build/295092045 at 2025-04-22 - binsm # failure in job https://hydra.nixos.org/build/233232355 at 2023-09-02 - bio # failure in job https://hydra.nixos.org/build/233225273 at 2023-09-02 - bio-sequence # failure in job https://hydra.nixos.org/build/233236140 at 2023-09-02 @@ -528,13 +538,17 @@ broken-packages: - blosum # failure in job https://hydra.nixos.org/build/233198029 at 2023-09-02 - blubber-server # failure in job https://hydra.nixos.org/build/233199530 at 2023-09-02 - bludigon # failure in job https://hydra.nixos.org/build/233248190 at 2023-09-02 + - bluefin-algae # failure in job https://hydra.nixos.org/build/307517064 at 2025-09-19 + - bluefin-random # failure in job https://hydra.nixos.org/build/307517069 at 2025-09-19 - Blueprint # failure in job https://hydra.nixos.org/build/233252987 at 2023-09-02 - bluetileutils # failure in job https://hydra.nixos.org/build/233197334 at 2023-09-02 - blunk-hask-tests # failure in job https://hydra.nixos.org/build/233240288 at 2023-09-02 + - boardgame # failure in job https://hydra.nixos.org/build/307517065 at 2025-09-19 - bogocopy # failure in job https://hydra.nixos.org/build/233232322 at 2023-09-02 - boilerplate # failure in job https://hydra.nixos.org/build/233252821 at 2023-09-02 - bolt # failure in job https://hydra.nixos.org/build/233234045 at 2023-09-02 - boltzmann-brain # failure in job https://hydra.nixos.org/build/233220308 at 2023-09-02 + - bookhound # failure in job https://hydra.nixos.org/build/307517066 at 2025-09-19 - bookhound-format # failure in job https://hydra.nixos.org/build/233202674 at 2023-09-02 - bookkeeping # failure in job https://hydra.nixos.org/build/233241963 at 2023-09-02 - boolean-like # failure in job https://hydra.nixos.org/build/233190873 at 2023-09-02 @@ -564,6 +578,7 @@ broken-packages: - brick-panes # failure in job https://hydra.nixos.org/build/233207542 at 2023-09-02 - bricks-internal # failure in job https://hydra.nixos.org/build/233215572 at 2023-09-02 - brillig # failure in job https://hydra.nixos.org/build/233208148 at 2023-09-02 + - brillo-algorithms # failure in job https://hydra.nixos.org/build/307517131 at 2025-09-19 - brittany # failure in job https://hydra.nixos.org/build/233234100 at 2023-09-02 - broadcast-chan-conduit # failure in job https://hydra.nixos.org/build/295092082 at 2025-04-22 - broadcast-chan-tests # failure in job https://hydra.nixos.org/build/233202605 at 2023-09-02 @@ -587,6 +602,7 @@ broken-packages: - buffon-machines # failure in job https://hydra.nixos.org/build/233257929 at 2023-09-02 - bugsnag-haskell # failure in job https://hydra.nixos.org/build/295092087 at 2025-04-22 - bugzilla # failure in job https://hydra.nixos.org/build/233223784 at 2023-09-02 + - build # failure in job https://hydra.nixos.org/build/307517140 at 2025-09-19 - build-env # failure in job https://hydra.nixos.org/build/252734826 at 2024-03-16 - buildable # failure in job https://hydra.nixos.org/build/233199077 at 2023-09-02 - buildbox # failure in job https://hydra.nixos.org/build/233216315 at 2023-09-02 @@ -603,6 +619,7 @@ broken-packages: - buttplug-hs-core # failure in job https://hydra.nixos.org/build/233223928 at 2023-09-02 - bv-sized-lens # failure in job https://hydra.nixos.org/build/233237486 at 2023-09-02 - by-other-names # failure in job https://hydra.nixos.org/build/252732245 at 2024-03-16 + - byte-containers # failure in job https://hydra.nixos.org/build/307610340 at 2025-09-19 - bytearray-parsing # failure in job https://hydra.nixos.org/build/233244355 at 2023-09-02 - bytepatch # failure in job https://hydra.nixos.org/build/236678340 at 2023-10-04 - bytestring-arbitrary # failure in job https://hydra.nixos.org/build/233195013 at 2023-09-02 @@ -612,6 +629,7 @@ broken-packages: - bytestring-delta # failure in job https://hydra.nixos.org/build/233207977 at 2023-09-02 - bytestring-handle # failure in job https://hydra.nixos.org/build/233192234 at 2023-09-02 - bytestring-mmap # failure in job https://hydra.nixos.org/build/252733270 at 2024-03-16 + - bytestring-nums # failure in job https://hydra.nixos.org/build/307517167 at 2025-09-19 - bytestring-plain # failure in job https://hydra.nixos.org/build/233230746 at 2023-09-02 - bytestring-rematch # failure in job https://hydra.nixos.org/build/233228234 at 2023-09-02 - bytestring-show # failure in job https://hydra.nixos.org/build/233207681 at 2023-09-02 @@ -642,16 +660,19 @@ broken-packages: - cabal-dir # failure in job https://hydra.nixos.org/build/233194037 at 2023-09-02 - cabal-edit # failure in job https://hydra.nixos.org/build/233244268 at 2023-09-02 - cabal-file-th # failure in job https://hydra.nixos.org/build/233224650 at 2023-09-02 + - cabal-fix # failure in job https://hydra.nixos.org/build/307610355 at 2025-09-19 - cabal-ghc-dynflags # failure in job https://hydra.nixos.org/build/233244580 at 2023-09-02 - cabal-ghci # failure in job https://hydra.nixos.org/build/233239354 at 2023-09-02 - cabal-graphdeps # failure in job https://hydra.nixos.org/build/233221966 at 2023-09-02 - cabal-helper # failure in job https://hydra.nixos.org/build/252732588 at 2024-03-16 - cabal-hoogle # failure in job https://hydra.nixos.org/build/233191666 at 2023-09-02 + - Cabal-hooks # failure in job https://hydra.nixos.org/build/307515931 at 2025-09-19 - Cabal-ide-backend # failure in job https://hydra.nixos.org/build/233258880 at 2023-09-02 - cabal-info # failure in job https://hydra.nixos.org/build/233225001 at 2023-09-02 - cabal-install-bundle # failure in job https://hydra.nixos.org/build/233194629 at 2023-09-02 - cabal-install-ghc72 # failure in job https://hydra.nixos.org/build/233246160 at 2023-09-02 - cabal-install-ghc74 # failure in job https://hydra.nixos.org/build/233226625 at 2023-09-02 + - cabal-macosx # failure in job https://hydra.nixos.org/build/307517203 at 2025-09-19 - cabal-meta # failure in job https://hydra.nixos.org/build/233194466 at 2023-09-02 - cabal-mon # failure in job https://hydra.nixos.org/build/233217320 at 2023-09-02 - cabal-nirvana # failure in job https://hydra.nixos.org/build/233222083 at 2023-09-02 @@ -678,7 +699,6 @@ broken-packages: - cache-polysemy # failure in job https://hydra.nixos.org/build/233200602 at 2023-09-02 - cached # failure in job https://hydra.nixos.org/build/233249807 at 2023-09-02 - caching # failure in job https://hydra.nixos.org/build/233233548 at 2023-09-02 - - cacophony # failure in job https://hydra.nixos.org/build/233239380 at 2023-09-02 - caerbannog # failure in job https://hydra.nixos.org/build/252729101 at 2024-03-16 - cafeteria-prelude # failure in job https://hydra.nixos.org/build/233254881 at 2023-09-02 - cairo-canvas # failure in job https://hydra.nixos.org/build/252719057 at 2024-03-16 @@ -691,7 +711,6 @@ broken-packages: - call-alloy # failure in job https://hydra.nixos.org/build/233249056 at 2023-09-02 - call-haskell-from-anything # failure in job https://hydra.nixos.org/build/233222493 at 2023-09-02 - call-plantuml # failure in job https://hydra.nixos.org/build/233241670 at 2023-09-02 - - candid # failure in job https://hydra.nixos.org/build/295092213 at 2025-04-22 - canon # failure in job https://hydra.nixos.org/build/233235027 at 2023-09-02 - canonical-filepath # failure in job https://hydra.nixos.org/build/233233390 at 2023-09-02 - canteven-listen-http # failure in job https://hydra.nixos.org/build/233210500 at 2023-09-02 @@ -721,6 +740,7 @@ broken-packages: - cassandra-cql # failure in job https://hydra.nixos.org/build/233194724 at 2023-09-02 - Cassava # failure in job https://hydra.nixos.org/build/233245677 at 2023-09-02 - cassava-conduit # failure in job https://hydra.nixos.org/build/233220495 at 2023-09-02 + - cassava-generic # failure in job https://hydra.nixos.org/build/307517253 at 2025-09-19 - cassava-records # failure in job https://hydra.nixos.org/build/233259049 at 2023-09-02 - castle # failure in job https://hydra.nixos.org/build/233204027 at 2023-09-02 - catamorphism # failure in job https://hydra.nixos.org/build/233208488 at 2023-09-02 @@ -729,7 +749,6 @@ broken-packages: - category-printf # failure in job https://hydra.nixos.org/build/233216355 at 2023-09-02 - category-traced # failure in job https://hydra.nixos.org/build/233193963 at 2023-09-02 - catnplus # failure in job https://hydra.nixos.org/build/233241280 at 2023-09-02 - - cauldron # failure in job https://hydra.nixos.org/build/302801682 at 2025-07-27 - cautious-file # failure in job https://hydra.nixos.org/build/233218702 at 2023-09-02 - cautious-gen # failure in job https://hydra.nixos.org/build/233258367 at 2023-09-02 - cayene-lpp # failure in job https://hydra.nixos.org/build/233228959 at 2023-09-02 @@ -759,6 +778,7 @@ broken-packages: - cfenv # failure in job https://hydra.nixos.org/build/233235017 at 2023-09-02 - cfg # failure in job https://hydra.nixos.org/build/233236445 at 2023-09-02 - cfn-flip # failure in job https://hydra.nixos.org/build/233221000 at 2023-09-02 + - cfuture # failure in job https://hydra.nixos.org/build/307517278 at 2025-09-19 - cg # failure in job https://hydra.nixos.org/build/233212272 at 2023-09-02 - cgen # failure in job https://hydra.nixos.org/build/233198570 at 2023-09-02 - cgi-utils # failure in job https://hydra.nixos.org/build/233251773 at 2023-09-02 @@ -780,8 +800,9 @@ broken-packages: - check-cfg-ambiguity # failure in job https://hydra.nixos.org/build/233251852 at 2023-09-02 - checked # failure in job https://hydra.nixos.org/build/233223182 at 2023-09-02 - Checked # failure in job https://hydra.nixos.org/build/233257598 at 2023-09-02 - - checked-exceptions # failure in job https://hydra.nixos.org/build/295092260 at 2025-04-22 - checkmate # failure in job https://hydra.nixos.org/build/233248012 at 2023-09-02 + - chell-quickcheck # won't support QuickCheck >= 2.15 https://github.com/typeclasses/chell/issues/5#issuecomment-3152262118 + - chessica # failure in job https://hydra.nixos.org/build/307517327 at 2025-09-19 - chez-grater # failure in job https://hydra.nixos.org/build/233213537 at 2023-09-02 - chiasma # failure in job https://hydra.nixos.org/build/295122809 at 2025-04-22 - chiphunk # failure in job https://hydra.nixos.org/build/233232520 at 2023-09-02 @@ -875,14 +896,18 @@ broken-packages: - cmph # failure in job https://hydra.nixos.org/build/233225766 at 2023-09-02 - CMQ # failure in job https://hydra.nixos.org/build/233233168 at 2023-09-02 - cmt # failure in job https://hydra.nixos.org/build/233233474 at 2023-09-02 + - co-log-effectful # failure in job https://hydra.nixos.org/build/307517405 at 2025-09-19 + - co-log-json # failure in job https://hydra.nixos.org/build/307517383 at 2025-09-19 - co-log-polysemy-formatting # failure building executable 'example' in job https://hydra.nixos.org/build/237249360 at 2023-10-21 - co-log-sys # failure in job https://hydra.nixos.org/build/233206587 at 2023-09-02 - cobot-tools # failure in job https://hydra.nixos.org/build/233259173 at 2023-09-02 - code-builder # failure in job https://hydra.nixos.org/build/233239215 at 2023-09-02 - codec-beam # failure in job https://hydra.nixos.org/build/233198704 at 2023-09-02 + - Codec-Image-DevIL # failure in job https://hydra.nixos.org/build/307682428 at 2025-09-19 - codecov-haskell # failure in job https://hydra.nixos.org/build/233256758 at 2023-09-02 - codeforces-cli # failure in job https://hydra.nixos.org/build/233210719 at 2023-09-02 - codepad # failure in job https://hydra.nixos.org/build/233197730 at 2023-09-02 + - codet-plugin # failure in job https://hydra.nixos.org/build/307517392 at 2025-09-19 - codeworld-api # failure in job https://hydra.nixos.org/build/252720413 at 2024-03-16 - codex # failure in job https://hydra.nixos.org/build/233212311 at 2023-09-02 - codo-notation # failure in job https://hydra.nixos.org/build/233202566 at 2023-09-02 @@ -900,13 +925,13 @@ broken-packages: - colorless # failure in job https://hydra.nixos.org/build/233220728 at 2023-09-02 - colour-text # failure in job https://hydra.nixos.org/build/252712609 at 2024-03-16 - coltrane # failure in job https://hydra.nixos.org/build/233216437 at 2023-09-02 - - com # failure in job https://hydra.nixos.org/build/233213869 at 2023-09-02 - comark-syntax # failure in job https://hydra.nixos.org/build/233243043 at 2023-09-02 - combinat # failure in job https://hydra.nixos.org/build/233259056 at 2023-09-02 - combinat-compat # failure in job https://hydra.nixos.org/build/233201337 at 2023-09-02 - combinator-interactive # failure in job https://hydra.nixos.org/build/233233138 at 2023-09-02 - combinatorial-problems # failure in job https://hydra.nixos.org/build/233244505 at 2023-09-02 - combobuffer # failure in job https://hydra.nixos.org/build/233240114 at 2023-09-02 + - comma-and # failure in job https://hydra.nixos.org/build/307517425 at 2025-09-19 - Command # failure in job https://hydra.nixos.org/build/233249718 at 2023-09-02 - commander # failure in job https://hydra.nixos.org/build/233239812 at 2023-09-02 - Commando # failure in job https://hydra.nixos.org/build/233248911 at 2023-09-02 @@ -919,10 +944,12 @@ broken-packages: - compact-socket # failure in job https://hydra.nixos.org/build/245539349 at 2024-01-02 - compact-string # failure in job https://hydra.nixos.org/build/233204162 at 2023-09-02 - compact-string-fix # failure in job https://hydra.nixos.org/build/233238513 at 2023-09-02 + - compact-word-vectors # failure in job https://hydra.nixos.org/build/307517438 at 2025-09-19 - Compactable # failure in job https://hydra.nixos.org/build/233227285 at 2023-09-02 - compactable # failure in job https://hydra.nixos.org/build/233228106 at 2023-09-02 - compaREST # failure in job https://hydra.nixos.org/build/295122812 at 2025-04-22 - comparse # failure in job https://hydra.nixos.org/build/233220012 at 2023-09-02 + - compdata # failure in job https://hydra.nixos.org/build/307517440 at 2025-09-19 - compdata-dags # failure in job https://hydra.nixos.org/build/233216580 at 2023-09-02 - compdata-param # failure in job https://hydra.nixos.org/build/233227003 at 2023-09-02 - compendium-client # failure in job https://hydra.nixos.org/build/233231884 at 2023-09-02 @@ -946,12 +973,15 @@ broken-packages: - comptrans # failure in job https://hydra.nixos.org/build/233209853 at 2023-09-02 - computational-geometry # failure in job https://hydra.nixos.org/build/233220627 at 2023-09-02 - computations # failure in job https://hydra.nixos.org/build/233249992 at 2023-09-02 + - ConClusion # failure in job https://hydra.nixos.org/build/307515968 at 2025-09-19 - concrete-relaxng-parser # failure in job https://hydra.nixos.org/build/233192905 at 2023-09-02 - concrete-typerep # failure in job https://hydra.nixos.org/build/233234198 at 2023-09-02 - concurrent-buffer # failure in job https://hydra.nixos.org/build/233249002 at 2023-09-02 - Concurrent-Cache # failure in job https://hydra.nixos.org/build/233238494 at 2023-09-02 + - concurrent-machines # failure in job https://hydra.nixos.org/build/307517470 at 2025-09-19 - concurrent-st # failure in job https://hydra.nixos.org/build/233219451 at 2023-09-02 - concurrent-state # failure in job https://hydra.nixos.org/build/233248441 at 2023-09-02 + - concurrent-utilities # failure in job https://hydra.nixos.org/build/307517482 at 2025-09-19 - Concurrential # failure in job https://hydra.nixos.org/build/233221502 at 2023-09-02 - conditional-restriction-parser # failure in job https://hydra.nixos.org/build/233211470 at 2023-09-02 - condorcet # failure in job https://hydra.nixos.org/build/233208640 at 2023-09-02 @@ -967,6 +997,7 @@ broken-packages: - conduit-tokenize-attoparsec # failure in job https://hydra.nixos.org/build/233237152 at 2023-09-02 - conduit-vfs # failure in job https://hydra.nixos.org/build/233205270 at 2023-09-02 - conf # failure in job https://hydra.nixos.org/build/233213738 at 2023-09-02 + - conferer # failure in job https://hydra.nixos.org/build/307517496 at 2025-09-19 - conferer-hspec # failure in job https://hydra.nixos.org/build/233225311 at 2023-09-02 - conferer-provider-json # failure in job https://hydra.nixos.org/build/233195298 at 2023-09-02 - conferer-snap # failure in job https://hydra.nixos.org/build/233215013 at 2023-09-02 @@ -1014,6 +1045,8 @@ broken-packages: - contiguous-fft # failure in job https://hydra.nixos.org/build/233197368 at 2023-09-02 - continue # failure in job https://hydra.nixos.org/build/233231634 at 2023-09-02 - continued-fractions # failure in job https://hydra.nixos.org/build/233258785 at 2023-09-02 + - continuum # failure in job https://hydra.nixos.org/build/307517530 at 2025-09-19 + - continuum-client # failure in job https://hydra.nixos.org/build/307517531 at 2025-09-19 - contra-tracers # failure in job https://hydra.nixos.org/build/233197959 at 2023-09-02 - contracheck-applicative # failure in job https://hydra.nixos.org/build/233255104 at 2023-09-02 - Contract # failure in job https://hydra.nixos.org/build/233242103 at 2023-09-02 @@ -1026,13 +1059,14 @@ broken-packages: - contstuff-transformers # failure in job https://hydra.nixos.org/build/233244153 at 2023-09-02 - conversion-bytestring # failure in job https://hydra.nixos.org/build/295092506 at 2025-04-22 - convex-schema-parser # failure in job https://hydra.nixos.org/build/302801971 at 2025-07-27 + - convexHullNd # failure in job https://hydra.nixos.org/build/307517560 at 2025-09-19 - cookie-tray # failure in job https://hydra.nixos.org/build/295092527 at 2025-04-22 - cooklang-hs # failure in job https://hydra.nixos.org/build/295092511 at 2025-04-22 - copilot-bluespec # failure in job https://hydra.nixos.org/build/253685418 at 2024-03-31 - copilot-frp-sketch # copilot >=3.7 && <3.8, - copilot-verifier # failure in job https://hydra.nixos.org/build/297024747 at 2025-05-14 - copr # failure in job https://hydra.nixos.org/build/233252310 at 2023-09-02 - - COrdering # failure in job https://hydra.nixos.org/build/233232083 at 2023-09-02 + - coquina # failure in job https://hydra.nixos.org/build/307610386 at 2025-09-19 - core # failure in job https://hydra.nixos.org/build/233253971 at 2023-09-02 - core-compiler # failure in job https://hydra.nixos.org/build/233250303 at 2023-09-02 - core-effect-effectful # failure in job https://hydra.nixos.org/build/252723824 at 2024-03-16 @@ -1052,12 +1086,14 @@ broken-packages: - country-codes # failure in job https://hydra.nixos.org/build/233248159 at 2023-09-02 - courier # failure in job https://hydra.nixos.org/build/233215760 at 2023-09-02 - court # failure in job https://hydra.nixos.org/build/233192047 at 2023-09-02 + - covenant # failure in job https://hydra.nixos.org/build/307517574 at 2025-09-19 - coverage # failure in job https://hydra.nixos.org/build/233199365 at 2023-09-02 - cozo-hs # failure in job https://hydra.nixos.org/build/241432654 at 2023-11-19 - cparsing # failure in job https://hydra.nixos.org/build/233192377 at 2023-09-02 - cpio-conduit # failure in job https://hydra.nixos.org/build/233220518 at 2023-09-02 - CPL # failure in job https://hydra.nixos.org/build/252731771 at 2024-03-16 - cplusplus-th # failure in job https://hydra.nixos.org/build/233204461 at 2023-09-02 + - cpmonad # failure in job https://hydra.nixos.org/build/307517578 at 2025-09-19 - cps-except # failure in job https://hydra.nixos.org/build/252711064 at 2024-03-16 - cpuperf # failure in job https://hydra.nixos.org/build/233252964 at 2023-09-02 - cql-io # failure in job https://hydra.nixos.org/build/233245286 at 2023-09-02 @@ -1076,6 +1112,7 @@ broken-packages: - crem # failure in job https://hydra.nixos.org/build/233240415 at 2023-09-02 - critbit # failure in job https://hydra.nixos.org/build/233237880 at 2023-09-02 - criterion-cmp # failure in job https://hydra.nixos.org/build/233192619 at 2023-09-02 + - criterion-compare # failure in job https://hydra.nixos.org/build/307610403 at 2025-09-19 - criterion-plus # failure in job https://hydra.nixos.org/build/233194095 at 2023-09-02 - criterion-to-html # failure in job https://hydra.nixos.org/build/233209983 at 2023-09-02 - criu-rpc-types # failure in job https://hydra.nixos.org/build/252715844 at 2024-03-16 @@ -1083,8 +1120,11 @@ broken-packages: - crockford # failure in job https://hydra.nixos.org/build/233210759 at 2023-09-02 - crocodile # failure in job https://hydra.nixos.org/build/233222277 at 2023-09-02 - cronus # failure in job https://hydra.nixos.org/build/233225303 at 2023-09-02 + - crucible-debug # failure in job https://hydra.nixos.org/build/307610411 at 2025-09-19 + - crucible-symio # failure in job https://hydra.nixos.org/build/307610404 at 2025-09-19 - cruncher-types # failure in job https://hydra.nixos.org/build/233229024 at 2023-09-02 - crunghc # failure in job https://hydra.nixos.org/build/233193295 at 2023-09-02 + - crypt-sha512 # failure in job https://hydra.nixos.org/build/307517616 at 2025-09-19 - Crypto # failure in job https://hydra.nixos.org/build/252738609 at 2024-03-16 - crypto-cipher-benchmarks # failure in job https://hydra.nixos.org/build/233195297 at 2023-09-02 - crypto-enigma # failure in job https://hydra.nixos.org/build/252722224 at 2024-03-16 @@ -1121,6 +1161,7 @@ broken-packages: - cuddle # failure in job https://hydra.nixos.org/build/302802065 at 2025-07-27 - curl-aeson # failure in job https://hydra.nixos.org/build/233210106 at 2023-09-02 - curl-runnings # failure in job https://hydra.nixos.org/build/233258680 at 2023-09-02 + - curly-expander # failure in job https://hydra.nixos.org/build/307517676 at 2025-09-19 - currency-convert # failure in job https://hydra.nixos.org/build/233224509 at 2023-09-02 - curry-base # failure in job https://hydra.nixos.org/build/233246647 at 2023-09-02 - curry-frontend # failure in job https://hydra.nixos.org/build/233190895 at 2023-09-02 @@ -1162,8 +1203,16 @@ broken-packages: - data-concurrent-queue # failure in job https://hydra.nixos.org/build/233252841 at 2023-09-02 - data-construction # failure in job https://hydra.nixos.org/build/233251464 at 2023-09-02 - data-constructors # failure in job https://hydra.nixos.org/build/233241097 at 2023-09-02 + - data-default-instances-base # failure in job https://hydra.nixos.org/build/304235552 at 2025-08-11 + - data-default-instances-bytestring # failure in job https://hydra.nixos.org/build/304235538 at 2025-08-11 + - data-default-instances-case-insensitive # failure in job https://hydra.nixos.org/build/304235539 at 2025-08-11 + - data-default-instances-containers # failure in job https://hydra.nixos.org/build/304235541 at 2025-08-11 + - data-default-instances-dlist # failure in job https://hydra.nixos.org/build/304235550 at 2025-08-11 - data-default-instances-new-base # failure in job https://hydra.nixos.org/build/233256824 at 2023-09-02 + - data-default-instances-old-locale # failure in job https://hydra.nixos.org/build/304235551 at 2025-08-11 - data-default-instances-text # failure in job https://hydra.nixos.org/build/233209026 at 2023-09-02 + - data-default-instances-unordered-containers # failure in job https://hydra.nixos.org/build/304235558 at 2025-08-11 + - data-default-instances-vector # failure in job https://hydra.nixos.org/build/304235557 at 2025-08-11 - data-dispersal # failure in job https://hydra.nixos.org/build/233242611 at 2023-09-02 - data-diverse-lens # failure in job https://hydra.nixos.org/build/233221672 at 2023-09-02 - data-easy # failure in job https://hydra.nixos.org/build/233250802 at 2023-09-02 @@ -1172,6 +1221,8 @@ broken-packages: - data-fin # failure in job https://hydra.nixos.org/build/233216426 at 2023-09-02 - data-fin-simple # failure in job https://hydra.nixos.org/build/233191648 at 2023-09-02 - data-flagset # failure in job https://hydra.nixos.org/build/233211231 at 2023-09-02 + - data-forced # failure in job https://hydra.nixos.org/build/307517739 at 2025-09-19 + - data-forest # failure in job https://hydra.nixos.org/build/307517728 at 2025-09-19 - data-index # failure in job https://hydra.nixos.org/build/233197067 at 2023-09-02 - data-ivar # failure in job https://hydra.nixos.org/build/233239043 at 2023-09-02 - data-kiln # failure in job https://hydra.nixos.org/build/233220764 at 2023-09-02 @@ -1202,7 +1253,6 @@ broken-packages: - data-vector-growable # failure in job https://hydra.nixos.org/build/233244511 at 2023-09-02 - database-migrate # failure in job https://hydra.nixos.org/build/233201597 at 2023-09-02 - database-study # failure in job https://hydra.nixos.org/build/233222466 at 2023-09-02 - - datacrypto # failure in job https://hydra.nixos.org/build/295092721 at 2025-04-22 - datadog # failure in job https://hydra.nixos.org/build/233191124 at 2023-09-02 - DataIndex # failure in job https://hydra.nixos.org/build/233254506 at 2023-09-02 - datalog # failure in job https://hydra.nixos.org/build/233242707 at 2023-09-02 @@ -1215,14 +1265,17 @@ broken-packages: - dawdle # failure in job https://hydra.nixos.org/build/233201776 at 2023-09-02 - dawg # failure in job https://hydra.nixos.org/build/233198731 at 2023-09-02 - dawg-ord # failure in job https://hydra.nixos.org/build/233192491 at 2023-09-02 + - dawgdic # failure in job https://hydra.nixos.org/build/307517863 at 2025-09-19 - daytripper # failure in job https://hydra.nixos.org/build/233233486 at 2023-09-02 - dbcleaner # failure in job https://hydra.nixos.org/build/233203745 at 2023-09-02 - dbf # failure in job https://hydra.nixos.org/build/233256644 at 2023-09-02 + - DBFunctor # failure in job https://hydra.nixos.org/build/307515955 at 2025-09-19 - DBlimited # failure in job https://hydra.nixos.org/build/233249214 at 2023-09-02 - dbm # failure in job https://hydra.nixos.org/build/233191264 at 2023-09-02 - dbmigrations # failure in job https://hydra.nixos.org/build/233242055 at 2023-09-02 - dbmonitor # failure in job https://hydra.nixos.org/build/234451674 at 2023-09-13 - DBus # failure in job https://hydra.nixos.org/build/233207529 at 2023-09-02 + - dbus-app-launcher # failure in job https://hydra.nixos.org/build/307610432 at 2025-09-19 - dbus-core # failure in job https://hydra.nixos.org/build/233228888 at 2023-09-02 - dbus-qq # failure in job https://hydra.nixos.org/build/233219927 at 2023-09-02 - dclabel # failure in job https://hydra.nixos.org/build/233231206 at 2023-09-02 @@ -1234,7 +1287,6 @@ broken-packages: - dead-simple-json # failure in job https://hydra.nixos.org/build/233204301 at 2023-09-02 - Deadpan-DDP # failure in job https://hydra.nixos.org/build/233221990 at 2023-09-02 - dear-imgui # failure in job https://hydra.nixos.org/build/295092776 at 2025-04-22 - - debruijn # failure in job https://hydra.nixos.org/build/283207128 at 2024-12-31 - debug-me # failure in job https://hydra.nixos.org/build/233213991 at 2023-09-02 - debug-trace-file # failure in job https://hydra.nixos.org/build/233231840 at 2023-09-02 - debug-tracy # failure in job https://hydra.nixos.org/build/233242924 at 2023-09-02 @@ -1253,8 +1305,10 @@ broken-packages: - deepseq-th # failure in job https://hydra.nixos.org/build/233233106 at 2023-09-02 - defaultable-map # failure in job https://hydra.nixos.org/build/252731762 at 2024-03-16 - definitive-base # failure in job https://hydra.nixos.org/build/233255489 at 2023-09-02 + - defun-bool # failure in job https://hydra.nixos.org/build/307517807 at 2025-09-19 - deiko-config # failure in job https://hydra.nixos.org/build/233210895 at 2023-09-02 - deka # failure in job https://hydra.nixos.org/build/233206540 at 2023-09-02 + - delaunayNd # failure in job https://hydra.nixos.org/build/307517814 at 2025-09-19 - Delta-Lambda # failure in job https://hydra.nixos.org/build/233239406 at 2023-09-02 - delta-store # failure in job https://hydra.nixos.org/build/299186683 at 2025-06-23 - delude # failure in job https://hydra.nixos.org/build/233231224 at 2023-09-02 @@ -1275,6 +1329,7 @@ broken-packages: - derive-has-field # failure in job https://hydra.nixos.org/build/252735604 at 2024-03-16 - derive-lifted-instances # failure in job https://hydra.nixos.org/build/233194868 at 2023-09-02 - derive-monoid # failure in job https://hydra.nixos.org/build/233205670 at 2023-09-02 + - derive-prim # failure in job https://hydra.nixos.org/build/307517819 at 2025-09-19 - derive-storable-plugin # failure in job https://hydra.nixos.org/build/295092800 at 2025-04-22 - derive-trie # failure in job https://hydra.nixos.org/build/233207961 at 2023-09-02 - deriveJsonNoPrefix # failure in job https://hydra.nixos.org/build/233242453 at 2023-09-02 @@ -1357,6 +1412,7 @@ broken-packages: - discrete # failure in job https://hydra.nixos.org/build/233206492 at 2023-09-02 - DiscussionSupportSystem # failure in job https://hydra.nixos.org/build/233244662 at 2023-09-02 - Dish # failure in job https://hydra.nixos.org/build/233233264 at 2023-09-02 + - disjoint-containers # failure in job https://hydra.nixos.org/build/307517921 at 2025-09-19 - disjoint-set # failure in job https://hydra.nixos.org/build/233201934 at 2023-09-02 - disjoint-set-stateful # failure in job https://hydra.nixos.org/build/233253300 at 2023-09-02 - disk-bytes # failure in job https://hydra.nixos.org/build/252722796 at 2024-03-16 @@ -1378,8 +1434,10 @@ broken-packages: - djembe # failure in job https://hydra.nixos.org/build/233201037 at 2023-09-02 - djinn-ghc # failure in job https://hydra.nixos.org/build/233250488 at 2023-09-02 - djinn-th # failure in job https://hydra.nixos.org/build/233219394 at 2023-09-02 + - dlist-nonempty # failure in job https://hydra.nixos.org/build/307517939 at 2025-09-19 - dmcc # failure in job https://hydra.nixos.org/build/233259362 at 2023-09-02 - dmenu # failure in job https://hydra.nixos.org/build/233230756 at 2023-09-02 + - dns-patterns # failure in job https://hydra.nixos.org/build/307517942 at 2025-09-19 - dnscache # failure in job https://hydra.nixos.org/build/233227512 at 2023-09-02 - dnsrbl # failure in job https://hydra.nixos.org/build/233196401 at 2023-09-02 - dnssd # failure in job https://hydra.nixos.org/build/233194195 at 2023-09-02 @@ -1421,6 +1479,7 @@ broken-packages: - dpor # failure in job https://hydra.nixos.org/build/233213785 at 2023-09-02 - dr-cabal # failure in job https://hydra.nixos.org/build/233253361 at 2023-09-02 - dragen # failure in job https://hydra.nixos.org/build/233254270 at 2023-09-02 + - drawille # failure in job https://hydra.nixos.org/build/307518024 at 2025-09-19 - drClickOn # failure in job https://hydra.nixos.org/build/233217916 at 2023-09-02 - dresdner-verkehrsbetriebe # failure in job https://hydra.nixos.org/build/233222542 at 2023-09-02 - DrIFT # failure in job https://hydra.nixos.org/build/233220463 at 2023-09-02 @@ -1454,6 +1513,7 @@ broken-packages: - dvault # failure in job https://hydra.nixos.org/build/233225259 at 2023-09-02 - dvdread # failure in job https://hydra.nixos.org/build/233227587 at 2023-09-02 - dvi-processing # failure in job https://hydra.nixos.org/build/233224281 at 2023-09-02 + - dvorak # failure in job https://hydra.nixos.org/build/307518010 at 2025-09-19 - dwarf # failure in job https://hydra.nixos.org/build/233244074 at 2023-09-02 - dwarfadt # failure in job https://hydra.nixos.org/build/233254895 at 2023-09-02 - dyckword # failure in job https://hydra.nixos.org/build/233256385 at 2023-09-02 @@ -1480,11 +1540,13 @@ broken-packages: - easy-api # failure in job https://hydra.nixos.org/build/233208757 at 2023-09-02 - easy-args # failure in job https://hydra.nixos.org/build/233221956 at 2023-09-02 - easy-bitcoin # failure in job https://hydra.nixos.org/build/233201882 at 2023-09-02 + - easy-logger # failure in job https://hydra.nixos.org/build/307518032 at 2025-09-19 - easyjson # failure in job https://hydra.nixos.org/build/233199317 at 2023-09-02 - easyplot # failure in job https://hydra.nixos.org/build/233213312 at 2023-09-02 - easyrender # failure in job https://hydra.nixos.org/build/252710524 at 2024-03-16 - easytest # failure in job https://hydra.nixos.org/build/233209710 at 2023-09-02 - ebeats # failure in job https://hydra.nixos.org/build/233235039 at 2023-09-02 + - ebird-api # failure in job https://hydra.nixos.org/build/307518027 at 2025-09-19 - ebird-client # failure in job https://hydra.nixos.org/build/295093002 at 2025-04-22 - ebnf-bff # failure in job https://hydra.nixos.org/build/233221694 at 2023-09-02 - ec2-unikernel # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237245061 at 2023-10-21 @@ -1504,9 +1566,11 @@ broken-packages: - editline # failure in job https://hydra.nixos.org/build/233259515 at 2023-09-02 - edits # failure in job https://hydra.nixos.org/build/295093075 at 2025-04-22 - effect-handlers # failure in job https://hydra.nixos.org/build/233234988 at 2023-09-02 + - effect-stack # failure in job https://hydra.nixos.org/build/307518043 at 2025-09-19 - effectful-st # failure in job https://hydra.nixos.org/build/233248591 at 2023-09-02 - effectful-zoo # failure in job https://hydra.nixos.org/build/283208805 at 2024-12-31 - effective-aspects # failure in job https://hydra.nixos.org/build/233223120 at 2023-09-02 + - effects # failure in job https://hydra.nixos.org/build/307518053 at 2025-09-19 - effet # failure in job https://hydra.nixos.org/build/233204265 at 2023-09-02 - effin # failure in job https://hydra.nixos.org/build/233212960 at 2023-09-02 - eflint # failure in job https://hydra.nixos.org/build/295122827 at 2025-04-22 @@ -1518,6 +1582,7 @@ broken-packages: - Eight-Ball-Pool-Hack-Cheats # failure in job https://hydra.nixos.org/build/233211937 at 2023-09-02 - eio # failure in job https://hydra.nixos.org/build/233256103 at 2023-09-02 - either-both # failure in job https://hydra.nixos.org/build/252717090 at 2024-03-16 + - either-list-functions # failure in job https://hydra.nixos.org/build/307518055 at 2025-09-19 - either-unwrap # failure in job https://hydra.nixos.org/build/233254495 at 2023-09-02 - EitherT # failure in job https://hydra.nixos.org/build/233217056 at 2023-09-02 - ejdb2-binding # failure in job https://hydra.nixos.org/build/233253666 at 2023-09-02 @@ -1540,6 +1605,7 @@ broken-packages: - elm-reactor # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. - elm-repl # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. - elm-server # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. + - elm-street # failure in job https://hydra.nixos.org/build/307610478 at 2025-09-19 - elm-websocket # failure in job https://hydra.nixos.org/build/233192201 at 2023-09-02 - elm-yesod # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. - elminator # failure in job https://hydra.nixos.org/build/252729949 at 2024-03-16 @@ -1549,6 +1615,7 @@ broken-packages: - email-header # failure in job https://hydra.nixos.org/build/233243713 at 2023-09-02 - email-postmark # failure in job https://hydra.nixos.org/build/233245426 at 2023-09-02 - emailaddress # failure in job https://hydra.nixos.org/build/233202700 at 2023-09-02 + - emanote # failure in job https://hydra.nixos.org/build/307610499 at 2025-09-19 - embed-config # failure in job https://hydra.nixos.org/build/233237733 at 2023-09-02 - embla # failure in job https://hydra.nixos.org/build/233206703 at 2023-09-02 - emgm # failure in job https://hydra.nixos.org/build/233257789 at 2023-09-02 @@ -1575,6 +1642,7 @@ broken-packages: - envelope # failure in job https://hydra.nixos.org/build/233199309 at 2023-09-02 - envstatus # failure in job https://hydra.nixos.org/build/233257940 at 2023-09-02 - envy-extensible # failure in job https://hydra.nixos.org/build/233229313 at 2023-09-02 + - eo-phi-normalizer # failure in job https://hydra.nixos.org/build/307518140 at 2025-09-19 - epanet-haskell # failure in job https://hydra.nixos.org/build/233197331 at 2023-09-02 - epass # failure in job https://hydra.nixos.org/build/233194117 at 2023-09-02 - epi-sim # failure in job https://hydra.nixos.org/build/233246076 at 2023-09-02 @@ -1592,6 +1660,7 @@ broken-packages: - erlang # failure in job https://hydra.nixos.org/build/233195837 at 2023-09-02 - erlang-ffi # failure in job https://hydra.nixos.org/build/233233314 at 2023-09-02 - eros # failure in job https://hydra.nixos.org/build/233247983 at 2023-09-02 + - erpnext-api-client # failure in job https://hydra.nixos.org/build/307610501 at 2025-09-19 - errno # failure in job https://hydra.nixos.org/build/252725782 at 2024-03-16 - error-context # failure in job https://hydra.nixos.org/build/233245027 at 2023-09-02 - error-continuations # failure in job https://hydra.nixos.org/build/233232357 at 2023-09-02 @@ -1647,16 +1716,17 @@ broken-packages: - exhaustive # failure in job https://hydra.nixos.org/build/233238024 at 2023-09-02 - exherbo-cabal # failure in job https://hydra.nixos.org/build/233206319 at 2023-09-02 - exif # failure in job https://hydra.nixos.org/build/233229247 at 2023-09-02 + - exiftool # failure in job https://hydra.nixos.org/build/307518175 at 2025-09-19 - exigo-schema # failure in job https://hydra.nixos.org/build/233197808 at 2023-09-02 - exinst-deepseq # failure in job https://hydra.nixos.org/build/233207947 at 2023-09-02 - exinst-hashable # failure in job https://hydra.nixos.org/build/233210438 at 2023-09-02 - exists # failure in job https://hydra.nixos.org/build/233243541 at 2023-09-02 - exitcode # failure in job https://hydra.nixos.org/build/233238454 at 2023-09-02 - - exotic-list-monads # failure in job https://hydra.nixos.org/build/302802593 at 2025-07-27 - exp-cache # failure in job https://hydra.nixos.org/build/233220561 at 2023-09-02 - exp-extended # failure in job https://hydra.nixos.org/build/233236139 at 2023-09-02 - experimenter # failure in job https://hydra.nixos.org/build/252726011 at 2024-03-16 - explain # failure in job https://hydra.nixos.org/build/233207210 at 2023-09-02 + - explainable-predicates # failure in job https://hydra.nixos.org/build/307518185 at 2025-09-19 - explicit-constraint-lens # failure in job https://hydra.nixos.org/build/233230188 at 2023-09-02 - explicit-determinant # failure in job https://hydra.nixos.org/build/233246543 at 2023-09-02 - explicit-iomodes # failure in job https://hydra.nixos.org/build/233247342 at 2023-09-02 @@ -1665,9 +1735,12 @@ broken-packages: - expressions # failure in job https://hydra.nixos.org/build/233212192 at 2023-09-02 - expresso # failure in job https://hydra.nixos.org/build/233208513 at 2023-09-02 - extcore # failure in job https://hydra.nixos.org/build/233230369 at 2023-09-02 + - extended # failure in job https://hydra.nixos.org/build/307518193 at 2025-09-19 - extended-categories # failure in job https://hydra.nixos.org/build/233258803 at 2023-09-02 - extended-containers # failure in job https://hydra.nixos.org/build/233226876 at 2023-09-02 + - extensible # failure in job https://hydra.nixos.org/build/307518230 at 2025-09-19 - extensible-data # failure in job https://hydra.nixos.org/build/233198917 at 2023-09-02 + - extensible-effects # failure in job https://hydra.nixos.org/build/307518197 at 2025-09-19 - extensible-effects-concurrent # failure in job https://hydra.nixos.org/build/233233685 at 2023-09-02 - extensioneer # failure in job https://hydra.nixos.org/build/233663099 at 2023-09-02 - external-sort # failure in job https://hydra.nixos.org/build/233244337 at 2023-09-02 @@ -1687,16 +1760,18 @@ broken-packages: - facts # failure in job https://hydra.nixos.org/build/233194410 at 2023-09-02 - Facts # failure in job https://hydra.nixos.org/build/233224533 at 2023-09-02 - fad # failure in job https://hydra.nixos.org/build/252716941 at 2024-03-16 + - fadno-braids # failure in job https://hydra.nixos.org/build/307610508 at 2025-09-19 + - fadno-xml # failure in job https://hydra.nixos.org/build/307518209 at 2025-09-19 - failable # failure in job https://hydra.nixos.org/build/252731566 at 2024-03-16 - failable-list # failure in job https://hydra.nixos.org/build/233198924 at 2023-09-02 - failure # failure in job https://hydra.nixos.org/build/252738855 at 2024-03-16 - failure-detector # failure in job https://hydra.nixos.org/build/233244451 at 2023-09-02 - fake # failure in job https://hydra.nixos.org/build/233199052 at 2023-09-02 - fake-type # failure in job https://hydra.nixos.org/build/233197081 at 2023-09-02 + - fakedata-quickcheck # failure in job https://hydra.nixos.org/build/307518270 at 2025-09-19 - faktory # failure in job https://hydra.nixos.org/build/233240158 at 2023-09-02 - falling-turnip # failure in job https://hydra.nixos.org/build/252737877 at 2024-03-16 - fast-combinatorics # failure in job https://hydra.nixos.org/build/233250615 at 2023-09-02 - - fast-digits # failure in job https://hydra.nixos.org/build/295093219 at 2025-04-22 - fast-downward # failure in job https://hydra.nixos.org/build/252721794 at 2024-03-16 - fast-nats # failure in job https://hydra.nixos.org/build/233238596 at 2023-09-02 - fast-tagsoup-utf8-only # failure in job https://hydra.nixos.org/build/233202322 at 2023-09-02 @@ -1712,6 +1787,7 @@ broken-packages: - fathead-util # failure in job https://hydra.nixos.org/build/233255882 at 2023-09-02 - fay # failure in job https://hydra.nixos.org/build/233197122 at 2023-09-02 - fb-persistent # failure in job https://hydra.nixos.org/build/233193999 at 2023-09-02 + - fb-stubs # failure in job https://hydra.nixos.org/build/307518242 at 2025-09-19 - fb-util # failure in job https://hydra.nixos.org/build/296519228 at 2025-05-14 - fbmessenger-api # failure in job https://hydra.nixos.org/build/233247641 at 2023-09-02 - fca # failure in job https://hydra.nixos.org/build/233205050 at 2023-09-02 @@ -1724,8 +1800,10 @@ broken-packages: - fclabels-monadlib # failure in job https://hydra.nixos.org/build/233192353 at 2023-09-02 - fcm-client # failure in job https://hydra.nixos.org/build/233241459 at 2023-09-02 - fdo-trash # failure in job https://hydra.nixos.org/build/233244987 at 2023-09-02 + - fearOfView # failure in job https://hydra.nixos.org/build/307518236 at 2025-09-19 - feather # failure in job https://hydra.nixos.org/build/233192230 at 2023-09-02 - feature-flipper # failure in job https://hydra.nixos.org/build/233192476 at 2023-09-02 + - fec # failure in job https://hydra.nixos.org/build/307518247 at 2025-09-19 - fedora-packages # failure in job https://hydra.nixos.org/build/233256230 at 2023-09-02 - fedora-repoquery # failure in job https://hydra.nixos.org/build/269676305 at 2024-08-19 - feed-cli # failure in job https://hydra.nixos.org/build/233234086 at 2023-09-02 @@ -1792,6 +1870,8 @@ broken-packages: - fixed-precision # failure in job https://hydra.nixos.org/build/233226433 at 2023-09-02 - fixed-storable-array # failure in job https://hydra.nixos.org/build/233200413 at 2023-09-02 - fixed-timestep # failure in job https://hydra.nixos.org/build/233252950 at 2023-09-02 + - fixed-vector-cborg # failure in job https://hydra.nixos.org/build/307518304 at 2025-09-19 + - fixed-vector-hetero # failure in job https://hydra.nixos.org/build/307518298 at 2025-09-19 - fixed-width # failure in job https://hydra.nixos.org/build/233236195 at 2023-09-02 - fixedprec # failure in job https://hydra.nixos.org/build/233231519 at 2023-09-02 - fixer # failure in job https://hydra.nixos.org/build/233246038 at 2023-09-02 @@ -1806,6 +1886,7 @@ broken-packages: - flat-mcmc # failure in job https://hydra.nixos.org/build/233234404 at 2023-09-02 - flatbuffers # failure in job https://hydra.nixos.org/build/252718245 at 2024-03-16 - flatbuffers-parser # failure in job https://hydra.nixos.org/build/295093316 at 2025-04-22 + - flexible-numeric-parsers # failure in job https://hydra.nixos.org/build/307518312 at 2025-09-19 - flexible-time # failure in job https://hydra.nixos.org/build/233208099 at 2023-09-02 - flickr # failure in job https://hydra.nixos.org/build/233212718 at 2023-09-02 - flink-statefulfun # failure in job https://hydra.nixos.org/build/252724456 at 2024-03-16 @@ -1824,7 +1905,6 @@ broken-packages: - fluffy-parser # failure in job https://hydra.nixos.org/build/233212110 at 2023-09-02 - fluid-idl # failure in job https://hydra.nixos.org/build/233214307 at 2023-09-02 - fluidsynth # failure in job https://hydra.nixos.org/build/233225998 at 2023-09-02 - - flux-monoid # failure in job https://hydra.nixos.org/build/233202845 at 2023-09-02 - fmark # failure in job https://hydra.nixos.org/build/233196159 at 2023-09-02 - FModExRaw # failure in job https://hydra.nixos.org/build/233259032 at 2023-09-02 - fn-extra # failure in job https://hydra.nixos.org/build/252737996 at 2024-03-16 @@ -1835,6 +1915,7 @@ broken-packages: - folds-common # failure in job https://hydra.nixos.org/build/233237316 at 2023-09-02 - follow # failure in job https://hydra.nixos.org/build/233255423 at 2023-09-02 - follow-file # failure in job https://hydra.nixos.org/build/252732901 at 2024-03-16 + - folly-clib # failure in job https://hydra.nixos.org/build/307518337 at 2025-09-19 - font-opengl-basic4x6 # failure in job https://hydra.nixos.org/build/233200978 at 2023-09-02 - fontconfig-pure # failure in job https://hydra.nixos.org/build/233254573 at 2023-09-02 - for-free # failure in job https://hydra.nixos.org/build/233235927 at 2023-09-02 @@ -1853,10 +1934,12 @@ broken-packages: - forml # failure in job https://hydra.nixos.org/build/295093386 at 2025-04-22 - formura # failure in job https://hydra.nixos.org/build/233193674 at 2023-09-02 - Fortnite-Hack-Cheats-Free-V-Bucks-Generator # failure in job https://hydra.nixos.org/build/233233147 at 2023-09-02 + - fortran-src # failure in job https://hydra.nixos.org/build/307610526 at 2025-09-19 - fortran-src-extras # failure in job https://hydra.nixos.org/build/295093418 at 2025-04-22 - fortran-vars # failure in job https://hydra.nixos.org/build/233257719 at 2023-09-02 - fortytwo # failure in job https://hydra.nixos.org/build/233209552 at 2023-09-02 - foscam-filename # failure in job https://hydra.nixos.org/build/233237326 at 2023-09-02 + - fp-ieee # failure in job https://hydra.nixos.org/build/307518380 at 2025-09-19 - FPretty # failure in job https://hydra.nixos.org/build/233196648 at 2023-09-02 - fptest # failure in job https://hydra.nixos.org/build/233233288 at 2023-09-02 - fquery # failure in job https://hydra.nixos.org/build/233196287 at 2023-09-02 @@ -1864,6 +1947,7 @@ broken-packages: - fractals # failure in job https://hydra.nixos.org/build/233205969 at 2023-09-02 - fraction # failure in job https://hydra.nixos.org/build/233204186 at 2023-09-02 - frag # failure in job https://hydra.nixos.org/build/234458411 at 2023-09-13 + - Frames # failure in job https://hydra.nixos.org/build/307609920 at 2025-09-19 - Frames-beam # failure in job https://hydra.nixos.org/build/241429730 at 2023-11-19 - Frames-streamly # failure in job https://hydra.nixos.org/build/241420906 at 2023-11-19 - franchise # failure in job https://hydra.nixos.org/build/233256790 at 2023-09-02 @@ -1873,7 +1957,9 @@ broken-packages: - free-alacarte # failure in job https://hydra.nixos.org/build/275141793 at 2024-10-21 - free-applicative-t # failure in job https://hydra.nixos.org/build/252715728 at 2024-03-16 - free-concurrent # failure in job https://hydra.nixos.org/build/233257070 at 2023-09-02 + - free-foil # failure in job https://hydra.nixos.org/build/307518377 at 2025-09-19 - free-http # failure in job https://hydra.nixos.org/build/233227362 at 2023-09-02 + - free-listt # failure in job https://hydra.nixos.org/build/307518376 at 2025-09-19 - free-operational # failure in job https://hydra.nixos.org/build/233201565 at 2023-09-02 - free-theorems # failure in job https://hydra.nixos.org/build/252725016 at 2024-03-16 - free-theorems-counterexamples # failure in job https://hydra.nixos.org/build/233231989 at 2023-09-02 @@ -1884,6 +1970,7 @@ broken-packages: - free-vector-spaces # failure in job https://hydra.nixos.org/build/299137660 at 2025-06-23 - freenect # failure in job https://hydra.nixos.org/build/233196105 at 2023-09-02 - freer-effects # failure in job https://hydra.nixos.org/build/233214270 at 2023-09-02 + - freer-simple # failure in job https://hydra.nixos.org/build/307518394 at 2025-09-19 - freer-simple-catching # failure in job https://hydra.nixos.org/build/295122831 at 2025-04-22 - freer-simple-http # failure in job https://hydra.nixos.org/build/295122832 at 2025-04-22 - freer-simple-profiling # failure in job https://hydra.nixos.org/build/295122835 at 2025-04-22 @@ -1911,6 +1998,7 @@ broken-packages: - fsutils # failure in job https://hydra.nixos.org/build/233204599 at 2023-09-02 - fswait # failure in job https://hydra.nixos.org/build/233247770 at 2023-09-02 - fswatch # failure in job https://hydra.nixos.org/build/233233447 at 2023-09-02 + - fswatcher # failure in job https://hydra.nixos.org/build/307610532 at 2025-09-19 - ft-generator # failure in job https://hydra.nixos.org/build/233205823 at 2023-09-02 - FTGL-bytestring # failure in job https://hydra.nixos.org/build/233256032 at 2023-09-02 - ftp-conduit # failure in job https://hydra.nixos.org/build/233244330 at 2023-09-02 @@ -1920,8 +2008,10 @@ broken-packages: - full-sessions # failure in job https://hydra.nixos.org/build/233254332 at 2023-09-02 - funbot-client # failure in job https://hydra.nixos.org/build/233255739 at 2023-09-02 - funcons-tools # failure in job https://hydra.nixos.org/build/295122838 at 2025-04-22 + - funcons-values # failure in job https://hydra.nixos.org/build/307518434 at 2025-09-19 - function-instances-algebra # failure in job https://hydra.nixos.org/build/233202209 at 2023-09-02 - functional-arrow # failure in job https://hydra.nixos.org/build/295093396 at 2025-04-22 + - functor-classes-compat # failure in job https://hydra.nixos.org/build/307518409 at 2025-09-19 - functor-friends # failure in job https://hydra.nixos.org/build/233208108 at 2023-09-02 - functor-infix # failure in job https://hydra.nixos.org/build/233228794 at 2023-09-02 - functor-utils # failure in job https://hydra.nixos.org/build/233213259 at 2023-09-02 @@ -1943,6 +2033,7 @@ broken-packages: - futures # failure in job https://hydra.nixos.org/build/233230206 at 2023-09-02 - fuzzy-parse # failure in job https://hydra.nixos.org/build/252728734 at 2024-03-16 - fuzzy-timings # failure in job https://hydra.nixos.org/build/233235765 at 2023-09-02 + - fuzzyfind # failure in job https://hydra.nixos.org/build/307518431 at 2025-09-19 - fvars # failure in job https://hydra.nixos.org/build/234461649 at 2023-09-13 - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02 - fwgl-javascript # broken by fwgl, manually entered here, because it does not appear in transitive-broken.yaml at 2024-07-09 @@ -1958,6 +2049,7 @@ broken-packages: - garepinoh # failure in job https://hydra.nixos.org/build/233238111 at 2023-09-02 - gas # failure in job https://hydra.nixos.org/build/233233966 at 2023-09-02 - gather # failure in job https://hydra.nixos.org/build/233208848 at 2023-09-02 + - gauge # failure in job https://hydra.nixos.org/build/307518458 at 2025-09-19 - gc-monitoring-wai # failure in job https://hydra.nixos.org/build/233209449 at 2023-09-02 - gconf # failure in job https://hydra.nixos.org/build/233259023 at 2023-09-02 - gdiff-th # failure in job https://hydra.nixos.org/build/233215065 at 2023-09-02 @@ -1968,8 +2060,10 @@ broken-packages: - gemstone # failure in job https://hydra.nixos.org/build/233202246 at 2023-09-02 - gen-imports # failure in job https://hydra.nixos.org/build/233216588 at 2023-09-02 - gen-passwd # failure in job https://hydra.nixos.org/build/233224836 at 2023-09-02 + - genai-lib # failure in job https://hydra.nixos.org/build/307610537 at 2025-09-19 - gender # failure in job https://hydra.nixos.org/build/233235712 at 2023-09-02 - genders # failure in job https://hydra.nixos.org/build/233238566 at 2023-09-02 + - general-allocate # failure in job https://hydra.nixos.org/build/307518463 at 2025-09-19 - general-prelude # failure in job https://hydra.nixos.org/build/233248628 at 2023-09-02 - GeneralTicTacToe # failure in job https://hydra.nixos.org/build/233207939 at 2023-09-02 - generator # failure in job https://hydra.nixos.org/build/233213384 at 2023-09-02 @@ -1998,6 +2092,7 @@ broken-packages: - genetics # failure in job https://hydra.nixos.org/build/233219599 at 2023-09-02 - genifunctors # failure in job https://hydra.nixos.org/build/233255126 at 2023-09-02 - geniplate # failure in job https://hydra.nixos.org/build/233233607 at 2023-09-02 + - geniplate-mirror # failure in job https://hydra.nixos.org/build/307518529 at 2025-09-19 - genprog # failure in job https://hydra.nixos.org/build/233198970 at 2023-09-02 - GenSmsPdu # failure in job https://hydra.nixos.org/build/253702098 at 2024-03-31 - gentlemark # failure in job https://hydra.nixos.org/build/233202158 at 2023-09-02 @@ -2033,6 +2128,7 @@ broken-packages: - ghc-events-parallel # failure in job https://hydra.nixos.org/build/233218757 at 2023-09-02 - ghc-gc-hook # failure in job https://hydra.nixos.org/build/233195053 at 2023-09-02 - ghc-generic-instances # failure in job https://hydra.nixos.org/build/233259298 at 2023-09-02 + - ghc-hie # failure in job https://hydra.nixos.org/build/307518574 at 2025-09-19 - ghc-hotswap # failure in job https://hydra.nixos.org/build/233220146 at 2023-09-02 - ghc-internal # failure in job https://hydra.nixos.org/build/260723678 at 2024-05-25 - ghc-justdoit # failure in job https://hydra.nixos.org/build/233221884 at 2023-09-02 @@ -2049,7 +2145,9 @@ broken-packages: - ghc-syb-utils # failure in job https://hydra.nixos.org/build/233229196 at 2023-09-02 - ghc-symbol # failure in job https://hydra.nixos.org/build/252710738 at 2024-03-16 - ghc-time-alloc-prof # failure in job https://hydra.nixos.org/build/233242289 at 2023-09-02 + - ghc-typelits-presburger # failure in job https://hydra.nixos.org/build/307518587 at 2025-09-19 - ghc-usage # failure in job https://hydra.nixos.org/build/233199565 at 2023-09-02 + - ghci-dap # failure in job https://hydra.nixos.org/build/307518603 at 2025-09-19 - ghci-diagrams # failure in job https://hydra.nixos.org/build/233194407 at 2023-09-02 - ghci-haskeline # failure in job https://hydra.nixos.org/build/233216940 at 2023-09-02 - ghci-history-parser # failure in job https://hydra.nixos.org/build/233204448 at 2023-09-02 @@ -2059,26 +2157,30 @@ broken-packages: - ghcide-test-utils # failure in job https://hydra.nixos.org/build/253687657 at 2024-03-31 - ghcjs-ajax # failure in job https://hydra.nixos.org/build/295093584 at 2025-04-22 - ghcjs-base-stub # timeout - - ghcjs-dom-jsffi # failure in job https://hydra.nixos.org/build/233215225 at 2023-09-02 - ghcjs-fetch # timeout - ghcjs-promise # failure in job https://hydra.nixos.org/build/233243985 at 2023-09-02 - ghcjs-websockets # Does not work on the js backend added in 9.6+, only on ghcjs, where we markUnbroken - ghcjs-xhr # failure in job https://hydra.nixos.org/build/233235693 at 2023-09-02 - ghclive # failure in job https://hydra.nixos.org/build/233231592 at 2023-09-02 + - ghcprofview # failure in job https://hydra.nixos.org/build/307610598 at 2025-09-19 - ghcup # failure in job https://hydra.nixos.org/build/295093612 at 2025-04-22 - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02 - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02 - gi-gstapp # failure in job https://hydra.nixos.org/build/253686159 at 2024-03-31 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 + - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/307610571 at 2025-09-19 + - gi-gtk-hs # failure in job https://hydra.nixos.org/build/307610574 at 2025-09-19 - gi-gtk4-layer-shell # failure in job https://hydra.nixos.org/build/302803068 at 2025-07-27 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02 - gi-keybinder # failure in job https://hydra.nixos.org/build/265273447 at 2024-07-14 + - gi-webkit # failure in job https://hydra.nixos.org/build/307610609 at 2025-09-19 - gi-webkit2webextension # failure in job https://hydra.nixos.org/build/254424710 at 2024-03-31 - gi-webkitwebprocessextension # failure in job https://hydra.nixos.org/build/233227647 at 2023-09-02 - giak # failure in job https://hydra.nixos.org/build/233242229 at 2023-09-02 - gibberish # failure in job https://hydra.nixos.org/build/255688714 at 2024-04-16 - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02 + - gigaparsec # failure in job https://hydra.nixos.org/build/307518669 at 2025-09-19 - ginger2 # failure in job https://hydra.nixos.org/build/302803092 at 2025-07-27 - gingersnap # failure in job https://hydra.nixos.org/build/233227186 at 2023-09-02 - ginsu # failure in job https://hydra.nixos.org/build/233223259 at 2023-09-02 @@ -2092,6 +2194,7 @@ broken-packages: - git-cuk # failure in job https://hydra.nixos.org/build/233211733 at 2023-09-02 - git-date # failure in job https://hydra.nixos.org/build/233259193 at 2023-09-02 - git-jump # failure in job https://hydra.nixos.org/build/233206544 at 2023-09-02 + - git-phoenix # failure in job https://hydra.nixos.org/build/307610604 at 2025-09-19 - git-repair # failure in job https://hydra.nixos.org/build/233222686 at 2023-09-02 - git-vogue # failure in job https://hydra.nixos.org/build/233249420 at 2023-09-02 - gitea-api # failure in job https://hydra.nixos.org/build/295093716 at 2025-04-22 @@ -2104,9 +2207,9 @@ broken-packages: - gitHUD # failure in job https://hydra.nixos.org/build/233221244 at 2023-09-02 - gitignore # failure in job https://hydra.nixos.org/build/233207356 at 2023-09-02 - gitlab-api # failure in job https://hydra.nixos.org/build/233256639 at 2023-09-02 + - gitlib # failure in job https://hydra.nixos.org/build/307518686 at 2025-09-19 - gitlib-cmdline # failure in job https://hydra.nixos.org/build/233230857 at 2023-09-02 - gitlib-utils # failure in job https://hydra.nixos.org/build/233190826 at 2023-09-02 - - gitrev-typed # failure in job https://hydra.nixos.org/build/299137966 at 2025-06-23 - gitter # failure in job https://hydra.nixos.org/build/233210040 at 2023-09-02 - glade # failure in job https://hydra.nixos.org/build/233229566 at 2023-09-02 - glambda # failure in job https://hydra.nixos.org/build/252728236 at 2024-03-16 @@ -2118,6 +2221,7 @@ broken-packages: - gli # failure in job https://hydra.nixos.org/build/233210279 at 2023-09-02 - glicko # failure in job https://hydra.nixos.org/build/233200868 at 2023-09-02 - glider-nlp # failure in job https://hydra.nixos.org/build/233229600 at 2023-09-02 + - gll # failure in job https://hydra.nixos.org/build/307518707 at 2025-09-19 - GLMatrix # failure in job https://hydra.nixos.org/build/233202880 at 2023-09-02 - glob-posix # failure in job https://hydra.nixos.org/build/233253059 at 2023-09-02 - global-variables # failure in job https://hydra.nixos.org/build/233204607 at 2023-09-02 @@ -2126,12 +2230,14 @@ broken-packages: - gloss-examples # failure in job https://hydra.nixos.org/build/252718124 at 2024-03-16 - gloss-export # failure in job https://hydra.nixos.org/build/234444988 at 2023-09-13 - gloss-game # failure in job https://hydra.nixos.org/build/234460935 at 2023-09-13 + - gloss-raster # failure in job https://hydra.nixos.org/build/307518723 at 2025-09-19 - gloss-raster-massiv # failure in job https://hydra.nixos.org/build/253683246 at 2024-03-31 - glpk-hs # failure in job https://hydra.nixos.org/build/295093740 at 2025-04-22 - glsl # failure in job https://hydra.nixos.org/build/233224139 at 2023-09-02 - gltf-codec # failure in job https://hydra.nixos.org/build/233205342 at 2023-09-02 - glualint # failure in job https://hydra.nixos.org/build/295093757 at 2025-04-22 - glue # failure in job https://hydra.nixos.org/build/233233587 at 2023-09-02 + - glue-ekg # failure in job https://hydra.nixos.org/build/307518731 at 2025-09-19 - gnutls # failure in job https://hydra.nixos.org/build/252734570 at 2024-03-16 - goa # failure in job https://hydra.nixos.org/build/233193916 at 2023-09-02 - goal-core # failure in job https://hydra.nixos.org/build/233242261 at 2023-09-02 @@ -2156,18 +2262,19 @@ broken-packages: - gogol-useraccounts # failure in job https://hydra.nixos.org/build/286425223 at 2025-01-25 - gooey # failure in job https://hydra.nixos.org/build/233192207 at 2023-09-02 - google-cloud # failure in job https://hydra.nixos.org/build/233218503 at 2023-09-02 + - google-cloud-pubsub # failure in job https://hydra.nixos.org/build/307610806 at 2025-09-19 - google-html5-slide # failure in job https://hydra.nixos.org/build/233233311 at 2023-09-02 - google-oauth2 # failure in job https://hydra.nixos.org/build/233223208 at 2023-09-02 - google-oauth2-easy # failure in job https://hydra.nixos.org/build/233251694 at 2023-09-02 - google-search # failure in job https://hydra.nixos.org/build/233214524 at 2023-09-02 - google-server-api # failure in job https://hydra.nixos.org/build/233218521 at 2023-09-02 + - google-static-maps # failure in job https://hydra.nixos.org/build/307610800 at 2025-09-19 - google-translate # failure in job https://hydra.nixos.org/build/233234076 at 2023-09-02 - GoogleCodeJam # failure in job https://hydra.nixos.org/build/233234738 at 2023-09-02 - googlepolyline # failure in job https://hydra.nixos.org/build/233209674 at 2023-09-02 - gopherbot # failure in job https://hydra.nixos.org/build/233207680 at 2023-09-02 - gopro-plus # failure in job https://hydra.nixos.org/build/233225073 at 2023-09-02 - gore-and-ash # failure in job https://hydra.nixos.org/build/233237810 at 2023-09-02 - - GOST34112012-Hash # failure in job https://hydra.nixos.org/build/295090921 at 2025-04-22 - gothic # failure in job https://hydra.nixos.org/build/233218967 at 2023-09-02 - GotoT-transformers # failure in job https://hydra.nixos.org/build/233229336 at 2023-09-02 - gotta-go-fast # failure in job https://hydra.nixos.org/build/233213439 at 2023-09-02 @@ -2183,11 +2290,13 @@ broken-packages: - Grafos # failure in job https://hydra.nixos.org/build/233201494 at 2023-09-02 - grakn # failure in job https://hydra.nixos.org/build/233218052 at 2023-09-02 - grammatical-parsers # failure in job https://hydra.nixos.org/build/233252219 at 2023-09-02 + - granite # failure in job https://hydra.nixos.org/build/307518928 at 2025-09-19 - graph-matchings # failure in job https://hydra.nixos.org/build/233245821 at 2023-09-02 - graph-rewriting # failure in job https://hydra.nixos.org/build/233191278 at 2023-09-02 - graph-serialize # failure in job https://hydra.nixos.org/build/233192162 at 2023-09-02 - graph-trace # failure in job https://hydra.nixos.org/build/295093918 at 2025-04-22 - graph-utils # failure in job https://hydra.nixos.org/build/233224932 at 2023-09-02 + - graph-wrapper # failure in job https://hydra.nixos.org/build/307518936 at 2025-09-19 - Graph500 # failure in job https://hydra.nixos.org/build/233257715 at 2023-09-02 - Graphalyze # failure in job https://hydra.nixos.org/build/233194082 at 2023-09-02 - graphbuilder # failure in job https://hydra.nixos.org/build/233190797 at 2023-09-02 @@ -2200,6 +2309,7 @@ broken-packages: - graphql-w-persistent # failure in job https://hydra.nixos.org/build/233228956 at 2023-09-02 - graphted # failure in job https://hydra.nixos.org/build/233227052 at 2023-09-02 - graphula-core # failure in job https://hydra.nixos.org/build/233259608 at 2023-09-02 + - graphwiz # failure in job https://hydra.nixos.org/build/307518943 at 2025-09-19 - graql # failure in job https://hydra.nixos.org/build/233219809 at 2023-09-02 - grasp # failure in job https://hydra.nixos.org/build/233213280 at 2023-09-02 - gray-code # failure in job https://hydra.nixos.org/build/233234283 at 2023-09-02 @@ -2210,6 +2320,8 @@ broken-packages: - Grempa # failure in job https://hydra.nixos.org/build/233256440 at 2023-09-02 - grenade # failure in job https://hydra.nixos.org/build/295093942 at 2025-04-22 - greplicate # failure in job https://hydra.nixos.org/build/233215148 at 2023-09-02 + - grfn # failure in job https://hydra.nixos.org/build/307610812 at 2025-09-19 + - grid # failure in job https://hydra.nixos.org/build/307518948 at 2025-09-19 - gridfs # failure in job https://hydra.nixos.org/build/233213958 at 2023-09-02 - grids # failure in job https://hydra.nixos.org/build/233218294 at 2023-09-02 - grm # failure in job https://hydra.nixos.org/build/233259788 at 2023-09-02 @@ -2221,14 +2333,15 @@ broken-packages: - groupBy # failure in job https://hydra.nixos.org/build/295093944 at 2025-04-22 - grouped-list # failure in job https://hydra.nixos.org/build/233240891 at 2023-09-02 - grow-vector # failure in job https://hydra.nixos.org/build/233196279 at 2023-09-02 + - growable-vector # failure in job https://hydra.nixos.org/build/307518962 at 2025-09-19 - growler # failure in job https://hydra.nixos.org/build/233207497 at 2023-09-02 - grpc-api-etcd # failure in job https://hydra.nixos.org/build/233239600 at 2023-09-02 - grpc-haskell-core # failure in job https://hydra.nixos.org/build/267997256 at 2024-07-31 - - gruvbox-colors # failure in job https://hydra.nixos.org/build/295454932 at 2025-05-02 - gsl-random # failure in job https://hydra.nixos.org/build/233191503 at 2023-09-02 - gstreamer # failure in job https://hydra.nixos.org/build/233239224 at 2023-09-02 - GTALib # failure in job https://hydra.nixos.org/build/233250568 at 2023-09-02 - gtk-helpers # failure in job https://hydra.nixos.org/build/233244213 at 2023-09-02 + - gtk-strut # failure in job https://hydra.nixos.org/build/307610816 at 2025-09-19 - gtk-toy # failure in job https://hydra.nixos.org/build/233208132 at 2023-09-02 - gtk2hs-cast-th # failure in job https://hydra.nixos.org/build/233244841 at 2023-09-02 - gtk2hs-hello # failure in job https://hydra.nixos.org/build/233232522 at 2023-09-02 @@ -2243,6 +2356,7 @@ broken-packages: - gulcii # failure in job https://hydra.nixos.org/build/233253472 at 2023-09-02 - gw # failure in job https://hydra.nixos.org/build/233252652 at 2023-09-02 - gyah-bin # failure in job https://hydra.nixos.org/build/233206981 at 2023-09-02 + - gym-hs # failure in job https://hydra.nixos.org/build/307518980 at 2025-09-19 - gym-http-api # failure in job https://hydra.nixos.org/build/233219968 at 2023-09-02 - h-booru # failure in job https://hydra.nixos.org/build/233258209 at 2023-09-02 - h-gpgme # failure in job https://hydra.nixos.org/build/233240826 at 2023-09-02 @@ -2275,7 +2389,6 @@ broken-packages: - haddock-api # failure in job https://hydra.nixos.org/build/233216515 at 2023-09-02 - haddock-leksah # failure in job https://hydra.nixos.org/build/233206878 at 2023-09-02 - haddock-test # failure in job https://hydra.nixos.org/build/233246641 at 2023-09-02 - - haddock-use-refs # failure in job https://hydra.nixos.org/build/295094009 at 2025-04-22 - hadoop-formats # failure in job https://hydra.nixos.org/build/233224647 at 2023-09-02 - hadoop-rpc # failure in job https://hydra.nixos.org/build/233247222 at 2023-09-02 - hadoop-streaming # failure in job https://hydra.nixos.org/build/233229895 at 2023-09-02 @@ -2299,7 +2412,6 @@ broken-packages: - hakyll-contrib-i18n # failure in job https://hydra.nixos.org/build/233218608 at 2023-09-02 - hakyll-contrib-links # failure in job https://hydra.nixos.org/build/233218456 at 2023-09-02 - hakyll-dir-list # failure in job https://hydra.nixos.org/build/233221518 at 2023-09-02 - - hakyll-filestore # failure in job https://hydra.nixos.org/build/295094015 at 2025-04-22 - hakyll-process # failure in job https://hydra.nixos.org/build/295094014 at 2025-04-22 - hakyll-R # failure in job https://hydra.nixos.org/build/233230132 at 2023-09-02 - hakyll-series # failure in job https://hydra.nixos.org/build/233257506 at 2023-09-02 @@ -2326,6 +2438,7 @@ broken-packages: - handle-like # failure in job https://hydra.nixos.org/build/233245789 at 2023-09-02 - HandlerSocketClient # failure in job https://hydra.nixos.org/build/233239906 at 2023-09-02 - handsy # failure in job https://hydra.nixos.org/build/233192732 at 2023-09-02 + - handwriting # failure in job https://hydra.nixos.org/build/307610841 at 2025-09-19 - Hangman # failure in job https://hydra.nixos.org/build/233257262 at 2023-09-02 - hangman # failure in job https://hydra.nixos.org/build/252718314 at 2024-03-16 - HangmanAscii # failure in job https://hydra.nixos.org/build/233192660 at 2023-09-02 @@ -2349,6 +2462,7 @@ broken-packages: - happstack-server-tls-cryptonite # failure in job https://hydra.nixos.org/build/233236252 at 2023-09-02 - happstack-util # failure in job https://hydra.nixos.org/build/233202063 at 2023-09-02 - happstack-yui # failure in job https://hydra.nixos.org/build/233221482 at 2023-09-02 + - happy-dot # failure in job https://hydra.nixos.org/build/307519045 at 2025-09-19 - happy-hour # failure in job https://hydra.nixos.org/build/252732958 at 2024-03-16 - happybara # failure in job https://hydra.nixos.org/build/233236198 at 2023-09-02 - happybara-webkit-server # failure in job https://hydra.nixos.org/build/233247667 at 2023-09-02 @@ -2368,6 +2482,7 @@ broken-packages: - has # failure in job https://hydra.nixos.org/build/233193689 at 2023-09-02 - hasbolt-extras # failure in job https://hydra.nixos.org/build/233211734 at 2023-09-02 - HasCacBDD # failure in job https://hydra.nixos.org/build/233238688 at 2023-09-02 + - hascal # failure in job https://hydra.nixos.org/build/307519053 at 2025-09-19 - hascalam # failure in job https://hydra.nixos.org/build/295094052 at 2025-04-22 - hascar # failure in job https://hydra.nixos.org/build/233197274 at 2023-09-02 - hascard # failure in job https://hydra.nixos.org/build/233238626 at 2023-09-02 @@ -2375,6 +2490,7 @@ broken-packages: - Haschoo # failure in job https://hydra.nixos.org/build/295090988 at 2025-04-22 - HasChor # failure in job https://hydra.nixos.org/build/295090966 at 2025-04-22 - hash # failure in job https://hydra.nixos.org/build/233219137 at 2023-09-02 + - hash-cons # failure in job https://hydra.nixos.org/build/307519073 at 2025-09-19 - hashable-extras # failure in job https://hydra.nixos.org/build/233191748 at 2023-09-02 - hashable-generics # failure in job https://hydra.nixos.org/build/233209175 at 2023-09-02 - hashable-orphans # failure in job https://hydra.nixos.org/build/252738804 at 2024-03-16 @@ -2382,6 +2498,8 @@ broken-packages: - hashabler # failure in job https://hydra.nixos.org/build/233236154 at 2023-09-02 - hashed-storage # failure in job https://hydra.nixos.org/build/233193382 at 2023-09-02 - hasherize # failure in job https://hydra.nixos.org/build/252712987 at 2024-03-16 + - hashids # failure in job https://hydra.nixos.org/build/307519058 at 2025-09-19 + - hashmap-io # failure in job https://hydra.nixos.org/build/307519070 at 2025-09-19 - hashring # failure in job https://hydra.nixos.org/build/233231092 at 2023-09-02 - hashtables-plus # failure in job https://hydra.nixos.org/build/233234463 at 2023-09-02 - hasim # failure in job https://hydra.nixos.org/build/233248675 at 2023-09-02 @@ -2395,6 +2513,7 @@ broken-packages: - haskell-admin-core # failure in job https://hydra.nixos.org/build/233242655 at 2023-09-02 - haskell-awk # failure in job https://hydra.nixos.org/build/233235921 at 2023-09-02 - haskell-bcrypt # failure in job https://hydra.nixos.org/build/233258991 at 2023-09-02 + - haskell-bee-pgmq # failure in job https://hydra.nixos.org/build/307610863 at 2025-09-19 - haskell-bitmex-rest # failure in job https://hydra.nixos.org/build/233244003 at 2023-09-02 - haskell-brainfuck # failure in job https://hydra.nixos.org/build/233233282 at 2023-09-02 - haskell-cnc # failure in job https://hydra.nixos.org/build/233229233 at 2023-09-02 @@ -2462,7 +2581,6 @@ broken-packages: - haskhol-core # failure in job https://hydra.nixos.org/build/233232550 at 2023-09-02 - haskmon # failure in job https://hydra.nixos.org/build/233228390 at 2023-09-02 - haskoin # failure in job https://hydra.nixos.org/build/233201668 at 2023-09-02 - - haskoin-store # failure in job https://hydra.nixos.org/build/299138382 at 2025-06-23 - haskoin-util # failure in job https://hydra.nixos.org/build/233222171 at 2023-09-02 - haskore-realtime # failure in job https://hydra.nixos.org/build/301391170 at 2025-07-01 - haskore-vintage # failure in job https://hydra.nixos.org/build/233230742 at 2023-09-02 @@ -2479,6 +2597,7 @@ broken-packages: - hasql-backend # failure in job https://hydra.nixos.org/build/233255310 at 2023-09-02 - hasql-class # failure in job https://hydra.nixos.org/build/233191053 at 2023-09-02 - hasql-cursor-query # failure in job https://hydra.nixos.org/build/295094141 at 2025-04-22 + - hasql-cursor-transaction # failure in job https://hydra.nixos.org/build/307610892 at 2025-09-19 - hasql-effectful # failure in job https://hydra.nixos.org/build/252721674 at 2024-03-16 - hasql-explain-tests # failure in job https://hydra.nixos.org/build/233247034 at 2023-09-02 - hasql-generic # failure in job https://hydra.nixos.org/build/233204654 at 2023-09-02 @@ -2491,11 +2610,13 @@ broken-packages: - hasql-streams-pipes # failure in job https://hydra.nixos.org/build/295094154 at 2025-04-22 - hasql-streams-streaming # failure in job https://hydra.nixos.org/build/295094151 at 2025-04-22 - hasql-streams-streamly # failure in job https://hydra.nixos.org/build/295094144 at 2025-04-22 + - hasql-transaction-io # failure in job https://hydra.nixos.org/build/307610877 at 2025-09-19 - hasql-url # failure in job https://hydra.nixos.org/build/233201809 at 2023-09-02 - hasqly-mysql # failure in job https://hydra.nixos.org/build/295094153 at 2025-04-22 - hastache # failure in job https://hydra.nixos.org/build/233224317 at 2023-09-02 - haste # failure in job https://hydra.nixos.org/build/233238510 at 2023-09-02 - haste-prim # failure in job https://hydra.nixos.org/build/233203281 at 2023-09-02 + - hastily # failure in job https://hydra.nixos.org/build/307610866 at 2025-09-19 - hat # failure in job https://hydra.nixos.org/build/233243655 at 2023-09-02 - hatex-guide # failure in job https://hydra.nixos.org/build/233258593 at 2023-09-02 - hats # failure in job https://hydra.nixos.org/build/233256724 at 2023-09-02 @@ -2508,13 +2629,13 @@ broken-packages: - haxr-th # failure in job https://hydra.nixos.org/build/233250109 at 2023-09-02 - hayland # failure in job https://hydra.nixos.org/build/233201482 at 2023-09-02 - hayoo-cli # failure in job https://hydra.nixos.org/build/233245478 at 2023-09-02 + - hBDD # failure in job https://hydra.nixos.org/build/307518994 at 2025-09-19 - hBDD-CMUBDD # failure in job https://hydra.nixos.org/build/233210132 at 2023-09-02 - hBDD-CUDD # failure in job https://hydra.nixos.org/build/233243982 at 2023-09-02 - hbeanstalk # failure in job https://hydra.nixos.org/build/233229856 at 2023-09-02 - hbeat # failure in job https://hydra.nixos.org/build/233228628 at 2023-09-02 - hblas # failure in job https://hydra.nixos.org/build/233232561 at 2023-09-02 - hblock # failure in job https://hydra.nixos.org/build/233205351 at 2023-09-02 - - hblosc # failure in job https://hydra.nixos.org/build/302803521 at 2025-07-27 - hburg # failure in job https://hydra.nixos.org/build/233247429 at 2023-09-02 - hcad # failure in job https://hydra.nixos.org/build/233219976 at 2023-09-02 - HCard # failure in job https://hydra.nixos.org/build/233231922 at 2023-09-02 @@ -2524,7 +2645,6 @@ broken-packages: - hcltest # failure in job https://hydra.nixos.org/build/233230099 at 2023-09-02 - hcoap # failure in job https://hydra.nixos.org/build/233233393 at 2023-09-02 - hcobs # failure in job https://hydra.nixos.org/build/233230173 at 2023-09-02 - - hcom # failure in job https://hydra.nixos.org/build/233201664 at 2023-09-02 - hcount # failure in job https://hydra.nixos.org/build/245788445 at 2024-01-07 - hcron # failure in job https://hydra.nixos.org/build/233235518 at 2023-09-02 - hCsound # failure in job https://hydra.nixos.org/build/233254871 at 2023-09-02 @@ -2535,7 +2655,6 @@ broken-packages: - HDBC-postgresql-hstore # failure in job https://hydra.nixos.org/build/233243932 at 2023-09-02 - hdevtools # failure in job https://hydra.nixos.org/build/233229115 at 2023-09-02 - hdf # failure in job https://hydra.nixos.org/build/233221986 at 2023-09-02 - - hdf5 # failure in job https://hydra.nixos.org/build/233244523 at 2023-09-02 - hDFA # failure in job https://hydra.nixos.org/build/233229180 at 2023-09-02 - hdigest # failure in job https://hydra.nixos.org/build/233257809 at 2023-09-02 - hdis86 # failure in job https://hydra.nixos.org/build/233229636 at 2023-09-02 @@ -2554,11 +2673,11 @@ broken-packages: - heckle # failure in job https://hydra.nixos.org/build/233228954 at 2023-09-02 - heddit # failure in job https://hydra.nixos.org/build/233229058 at 2023-09-02 - hedgehog-checkers # failure in job https://hydra.nixos.org/build/233229405 at 2023-09-02 - - hedgehog-extras # failure in job https://hydra.nixos.org/build/302803553, https://github.com/input-output-hk/hedgehog-extras/issues/93 at 2025-07-27 - hedgehog-gen # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237243271 at 2023-10-21 - hedgehog-generic # failure in job https://hydra.nixos.org/build/233204695 at 2023-09-02 - hedgehog-golden # failure in job https://hydra.nixos.org/build/233219619 at 2023-09-02 - hedgehog-lens # failure in job https://hydra.nixos.org/build/233251825 at 2023-09-02 + - hedgehog-optics # failure in job https://hydra.nixos.org/build/307519163 at 2025-09-19 - hedgehog-servant # failure in job https://hydra.nixos.org/build/233258223 at 2023-09-02 - hedis-config # failure in job https://hydra.nixos.org/build/233198326 at 2023-09-02 - hedis-monadic # failure in job https://hydra.nixos.org/build/252738915 at 2024-03-16 @@ -2585,6 +2704,7 @@ broken-packages: - heredocs # failure in job https://hydra.nixos.org/build/233238862 at 2023-09-02 - Hermes # failure in job https://hydra.nixos.org/build/233223694 at 2023-09-02 - herms # failure in job https://hydra.nixos.org/build/233217216 at 2023-09-02 + - heroku # failure in job https://hydra.nixos.org/build/307519194 at 2025-09-19 - heroku-persistent # failure in job https://hydra.nixos.org/build/233253569 at 2023-09-02 - hetero-dict # failure in job https://hydra.nixos.org/build/233250917 at 2023-09-02 - heterogeneous-list-literals # failure in job https://hydra.nixos.org/build/233212297 at 2023-09-02 @@ -2623,6 +2743,7 @@ broken-packages: - hGelf # failure in job https://hydra.nixos.org/build/233203909 at 2023-09-02 - hgeometric # failure in job https://hydra.nixos.org/build/233197856 at 2023-09-02 - hgis # failure in job https://hydra.nixos.org/build/233200418 at 2023-09-02 + - hgmp # failure in job https://hydra.nixos.org/build/307519217 at 2025-09-19 - hgom # failure in job https://hydra.nixos.org/build/233255569 at 2023-09-02 - hgopher # failure in job https://hydra.nixos.org/build/233222066 at 2023-09-02 - HGraphStorage # failure in job https://hydra.nixos.org/build/233217988 at 2023-09-02 @@ -2640,6 +2761,7 @@ broken-packages: - hid # failure in job https://hydra.nixos.org/build/233209289 at 2023-09-02 - hid-examples # failure in job https://hydra.nixos.org/build/233221413 at 2023-09-02 - hidden-char # failure in job https://hydra.nixos.org/build/233206791 at 2023-09-02 + - hiedb-plugin # failure in job https://hydra.nixos.org/build/307519230 at 2025-09-19 - hieraclus # failure in job https://hydra.nixos.org/build/233241310 at 2023-09-02 - hierarchical-clustering # failure in job https://hydra.nixos.org/build/233226120 at 2023-09-02 - hierarchical-exceptions # failure in job https://hydra.nixos.org/build/233195047 at 2023-09-02 @@ -2657,6 +2779,7 @@ broken-packages: - hikchr # failure in job https://hydra.nixos.org/build/295094234 at 2025-04-22 - hills # failure in job https://hydra.nixos.org/build/233215201 at 2023-09-02 - himg # failure in job https://hydra.nixos.org/build/233213810 at 2023-09-02 + - hindent # failure in job https://hydra.nixos.org/build/307519252 at 2025-09-19 - hindley-milner # failure in job https://hydra.nixos.org/build/233195252 at 2023-09-02 - hindley-milner-type-check # failure in job https://hydra.nixos.org/build/233216545 at 2023-09-02 - hinotify-bytestring # failure in job https://hydra.nixos.org/build/252716847 at 2024-03-16 @@ -2666,6 +2789,7 @@ broken-packages: - hint-server # failure in job https://hydra.nixos.org/build/233240346 at 2023-09-02 - hinter # failure in job https://hydra.nixos.org/build/233245954 at 2023-09-02 - hinterface # failure in job https://hydra.nixos.org/build/233250383 at 2023-09-02 + - hip # failure in job https://hydra.nixos.org/build/307610903 at 2025-09-19 - hipchat-hs # failure in job https://hydra.nixos.org/build/233198550 at 2023-09-02 - Hipmunk # failure in job https://hydra.nixos.org/build/233259272 at 2023-09-02 - hips # failure in job https://hydra.nixos.org/build/252728413 at 2024-03-16 @@ -2675,16 +2799,19 @@ broken-packages: - Hish # failure in job https://hydra.nixos.org/build/233226443 at 2023-09-02 - hissmetrics # failure in job https://hydra.nixos.org/build/233206890 at 2023-09-02 - hist-pl-types # failure in job https://hydra.nixos.org/build/233245977 at 2023-09-02 + - histogram-simple # failure in job https://hydra.nixos.org/build/307519242 at 2025-09-19 - historian # failure in job https://hydra.nixos.org/build/233210703 at 2023-09-02 - hit-on # failure in job https://hydra.nixos.org/build/233233939 at 2023-09-02 - hix # failure in job https://hydra.nixos.org/build/267986775 at 2024-07-31 - HJavaScript # failure in job https://hydra.nixos.org/build/233191718 at 2023-09-02 - hjcase # failure in job https://hydra.nixos.org/build/233195095 at 2023-09-02 - hjs # failure in job https://hydra.nixos.org/build/233215541 at 2023-09-02 + - hjson # failure in job https://hydra.nixos.org/build/307519243 at 2025-09-19 - hjson-query # failure in job https://hydra.nixos.org/build/233202240 at 2023-09-02 - hjsonpointer # failure in job https://hydra.nixos.org/build/233238177 at 2023-09-02 - hjugement-protocol # failure in job https://hydra.nixos.org/build/233227109 at 2023-09-02 - HJVM # failure in job https://hydra.nixos.org/build/233238646 at 2023-09-02 + - hkd # failure in job https://hydra.nixos.org/build/307519247 at 2025-09-19 - hkd-delta # failure in job https://hydra.nixos.org/build/233204318 at 2023-09-02 - hkd-lens # failure in job https://hydra.nixos.org/build/233242120 at 2023-09-02 - hkd-records # failure in job https://hydra.nixos.org/build/233234491 at 2023-09-02 @@ -2708,35 +2835,22 @@ broken-packages: - HLogger # failure in job https://hydra.nixos.org/build/233247351 at 2023-09-02 - hlongurl # failure in job https://hydra.nixos.org/build/233227204 at 2023-09-02 - hls-alternate-number-format-plugin # failure in job https://hydra.nixos.org/build/253704250 at 2024-03-31 - - hls-brittany-plugin # failure in job https://hydra.nixos.org/build/233201998 at 2023-09-02 - hls-cabal-fmt-plugin # failure in job https://hydra.nixos.org/build/253689716 at 2024-03-31 - hls-cabal-plugin # failure in job https://hydra.nixos.org/build/253694969 at 2024-03-31 - hls-change-type-signature-plugin # failure in job https://hydra.nixos.org/build/253678069 at 2024-03-31 - - hls-class-plugin # failure in job https://hydra.nixos.org/build/253699207 at 2024-03-31 - hls-code-range-plugin # failure in job https://hydra.nixos.org/build/253700243 at 2024-03-31 - hls-eval-plugin # failure in job https://hydra.nixos.org/build/253679229 at 2024-03-31 - hls-explicit-fixity-plugin # failure in job https://hydra.nixos.org/build/253687927 at 2024-03-31 - hls-explicit-imports-plugin # failure in job https://hydra.nixos.org/build/253681732 at 2024-03-31 - hls-explicit-record-fields-plugin # failure in job https://hydra.nixos.org/build/253684668 at 2024-03-31 - - hls-floskell-plugin # failure in job https://hydra.nixos.org/build/253700858 at 2024-03-31 - hls-fourmolu-plugin # failure in job https://hydra.nixos.org/build/253704260 at 2024-03-31 - - hls-gadt-plugin # failure in job https://hydra.nixos.org/build/295094265 at 2025-04-22 - - hls-haddock-comments-plugin # failure in job https://hydra.nixos.org/build/233233944 at 2023-09-02 - - hls-hlint-plugin # failure in job https://hydra.nixos.org/build/253680401 at 2024-03-31 - hls-module-name-plugin # failure in job https://hydra.nixos.org/build/253699279 at 2024-03-31 - hls-ormolu-plugin # failure in job https://hydra.nixos.org/build/253701021 at 2024-03-31 - hls-overloaded-record-dot-plugin # failure in job https://hydra.nixos.org/build/253677979 at 2024-03-31 - hls-pragmas-plugin # failure in job https://hydra.nixos.org/build/253682147 at 2024-03-31 - hls-qualify-imported-names-plugin # failure in job https://hydra.nixos.org/build/253691095 at 2024-03-31 - - hls-refactor-plugin # failure in job https://hydra.nixos.org/build/295094289 at 2025-04-22 - hls-refine-imports-plugin # failure in job https://hydra.nixos.org/build/233211155 at 2023-09-02 - - hls-rename-plugin # failure in job https://hydra.nixos.org/build/295094301 at 2025-04-22 - - hls-retrie-plugin # failure in job https://hydra.nixos.org/build/295094271 at 2025-04-22 - hls-selection-range-plugin # failure in job https://hydra.nixos.org/build/233205582 at 2023-09-02 - - hls-splice-plugin # failure in job https://hydra.nixos.org/build/295094286 at 2025-04-22 - - hls-stan-plugin # failure in job https://hydra.nixos.org/build/253693419 at 2024-03-31 - - hls-stylish-haskell-plugin # failure in job https://hydra.nixos.org/build/253696920 at 2024-03-31 - - hls-tactics-plugin # failure in job https://hydra.nixos.org/build/233238907 at 2023-09-02 - hlwm # failure in job https://hydra.nixos.org/build/233235119 at 2023-09-02 - hly # failure in job https://hydra.nixos.org/build/233206910 at 2023-09-02 - HMarkov # failure in job https://hydra.nixos.org/build/252712651 at 2024-03-16 @@ -2760,12 +2874,14 @@ broken-packages: - Hmpf # failure in job https://hydra.nixos.org/build/233212948 at 2023-09-02 - hmumps # failure in job https://hydra.nixos.org/build/233209336 at 2023-09-02 - hnetcdf # failure in job https://hydra.nixos.org/build/252727915 at 2024-03-16 + - hnix-store-db # failure in job https://hydra.nixos.org/build/307610909 at 2025-09-19 - hnn # failure in job https://hydra.nixos.org/build/233253882 at 2023-09-02 - hnock # failure in job https://hydra.nixos.org/build/233247419 at 2023-09-02 - hnop # failure in job https://hydra.nixos.org/build/233214340 at 2023-09-02 - ho-rewriting # failure in job https://hydra.nixos.org/build/233253726 at 2023-09-02 - hoauth # failure in job https://hydra.nixos.org/build/233191191 at 2023-09-02 - hoauth2-demo # failure in job https://hydra.nixos.org/build/295094328 at 2025-04-22 + - hoauth2-providers # failure in job https://hydra.nixos.org/build/307610912 at 2025-09-19 - hoauth2-providers-tutorial # failure in job https://hydra.nixos.org/build/295094327 at 2025-04-22 - hoauth2-tutorial # failure in job https://hydra.nixos.org/build/233198819 at 2023-09-02 - hobbes # failure in job https://hydra.nixos.org/build/233211279 at 2023-09-02 @@ -2817,6 +2933,7 @@ broken-packages: - hothasktags # failure in job https://hydra.nixos.org/build/233207150 at 2023-09-02 - hourglass-fuzzy-parsing # failure in job https://hydra.nixos.org/build/233200977 at 2023-09-02 - houseman # failure in job https://hydra.nixos.org/build/233247185 at 2023-09-02 + - hout # failure in job https://hydra.nixos.org/build/307519322 at 2025-09-19 - hp2any-core # failure in job https://hydra.nixos.org/build/233205070 at 2023-09-02 - hpack-convert # failure in job https://hydra.nixos.org/build/233257334 at 2023-09-02 - hpack-dhall # failure in job https://hydra.nixos.org/build/233663050 at 2023-09-02 @@ -2851,6 +2968,7 @@ broken-packages: - hs-brotli # failure in job https://hydra.nixos.org/build/233215213 at 2023-09-02 - hs-carbon # failure in job https://hydra.nixos.org/build/252722544 at 2024-03-16 - hs-carbon-examples # failure in job https://hydra.nixos.org/build/234440337 at 2023-09-13 + - hs-conllu # failure in job https://hydra.nixos.org/build/307519342 at 2025-09-19 - hs-di # failure in job https://hydra.nixos.org/build/233254606 at 2023-09-02 - hs-dotnet # failure in job https://hydra.nixos.org/build/233232755 at 2023-09-02 - hs-duktape # failure in job https://hydra.nixos.org/build/233223882 at 2023-09-02 @@ -2861,6 +2979,7 @@ broken-packages: - hs-json-rpc # failure in job https://hydra.nixos.org/build/233217334 at 2023-09-02 - hs-logo # failure in job https://hydra.nixos.org/build/233211298 at 2023-09-02 - hs-nombre-generator # failure in job https://hydra.nixos.org/build/233246102 at 2023-09-02 + - hs-onnxruntime-capi # failure in job https://hydra.nixos.org/build/307519371 at 2025-09-19 - hs-openmoji-data # failure in job https://hydra.nixos.org/build/295094356 at 2025-04-22 - hs-opentelemetry-awsxray # failure in job https://hydra.nixos.org/build/295094396 at 2025-04-22 - hs-opentelemetry-instrumentation-auto # failure in job https://hydra.nixos.org/build/253678404 at 2024-03-31 @@ -2911,7 +3030,6 @@ broken-packages: - hsdip # failure in job https://hydra.nixos.org/build/233229128 at 2023-09-02 - hsdns-cache # failure in job https://hydra.nixos.org/build/233225611 at 2023-09-02 - hsebaysdk # failure in job https://hydra.nixos.org/build/233251126 at 2023-09-02 - - hsec-sync # failure in job https://hydra.nixos.org/build/265274250 at 2024-07-14 - hsec-tools # failure in job https://hydra.nixos.org/build/265287998 at 2024-07-14 - hsenv # failure in job https://hydra.nixos.org/build/233196846 at 2023-09-02 - hsfcsh # failure in job https://hydra.nixos.org/build/233245258 at 2023-09-02 @@ -2961,11 +3079,11 @@ broken-packages: - hspec2 # failure in job https://hydra.nixos.org/build/233251459 at 2023-09-02 - HsPerl5 # failure in job https://hydra.nixos.org/build/233256038 at 2023-09-02 - hspkcs11 # failure in job https://hydra.nixos.org/build/233225806 at 2023-09-02 + - hspray # failure in job https://hydra.nixos.org/build/307519510 at 2025-09-19 - hspread # failure in job https://hydra.nixos.org/build/233217578 at 2023-09-02 - hspresent # failure in job https://hydra.nixos.org/build/233191185 at 2023-09-02 - hspretty # failure in job https://hydra.nixos.org/build/233253394 at 2023-09-02 - hsql # failure in job https://hydra.nixos.org/build/233217626 at 2023-09-02 - - hsrelp # failure in job https://hydra.nixos.org/build/233255841 at 2023-09-02 - hsseccomp # failure in job https://hydra.nixos.org/build/233194411 at 2023-09-02 - hsshellscript # failure in job https://hydra.nixos.org/build/233197858 at 2023-09-02 - hsSqlite3 # failure in job https://hydra.nixos.org/build/233238549 at 2023-09-02 @@ -3012,7 +3130,6 @@ broken-packages: - http-dispatch # failure in job https://hydra.nixos.org/build/233238880 at 2023-09-02 - http-encodings # failure in job https://hydra.nixos.org/build/233232289 at 2023-09-02 - http-exchange-instantiations # failure in job https://hydra.nixos.org/build/295094535 at 2025-04-22 - - http-grammar # failure in job https://hydra.nixos.org/build/233254392 at 2023-09-02 - http-kinder # failure in job https://hydra.nixos.org/build/233205030 at 2023-09-02 - http-kit # failure in job https://hydra.nixos.org/build/233244992 at 2023-09-02 - http-listen # failure in job https://hydra.nixos.org/build/233244011 at 2023-09-02 @@ -3065,6 +3182,7 @@ broken-packages: - hw-dsv # failure in job https://hydra.nixos.org/build/233252280 at 2023-09-02 - hw-dump # failure in job https://hydra.nixos.org/build/233208818 at 2023-09-02 - hw-fingertree-strict # failure in job https://hydra.nixos.org/build/252718249 at 2024-03-16 + - hw-hedgehog # failure in job https://hydra.nixos.org/build/307519553 at 2025-09-19 - hw-json-simd # failure in job https://hydra.nixos.org/build/233240490 at 2023-09-02 - hw-kafka-conduit # failure in job https://hydra.nixos.org/build/252714760 at 2024-03-16 - hw-lazy # failure in job https://hydra.nixos.org/build/252722974 at 2024-03-16 @@ -3075,6 +3193,7 @@ broken-packages: - hw-prim-bits # failure in job https://hydra.nixos.org/build/233246627 at 2023-09-02 - hw-rankselect-base # failure in job https://hydra.nixos.org/build/295122851 at 2025-04-22 - hw-simd-cli # failure in job https://hydra.nixos.org/build/233223251 at 2023-09-02 + - hw-string-parse # failure in job https://hydra.nixos.org/build/307519565 at 2025-09-19 - hw-tar # failure in job https://hydra.nixos.org/build/233219650 at 2023-09-02 - hw-xml # failure in job https://hydra.nixos.org/build/233197758 at 2023-09-02 - hwall-auth-iitk # failure in job https://hydra.nixos.org/build/233217629 at 2023-09-02 @@ -3088,15 +3207,16 @@ broken-packages: - hxt-pickle-utils # failure in job https://hydra.nixos.org/build/233212654 at 2023-09-02 - hxthelper # failure in job https://hydra.nixos.org/build/282936106 at 2024-12-24 (> 10 years since last release) - hyakko # failure in job https://hydra.nixos.org/build/233199297 at 2023-09-02 - - hydra # failure in job https://hydra.nixos.org/build/233212477 at 2023-09-02 - hydra-hs # failure in job https://hydra.nixos.org/build/233238247 at 2023-09-02 - hydrogen # failure in job https://hydra.nixos.org/build/233219053 at 2023-09-02 - hydrogen-multimap # failure in job https://hydra.nixos.org/build/233241591 at 2023-09-02 - hylide # failure in job https://hydra.nixos.org/build/233251582 at 2023-09-02 + - HyloDP # failure in job https://hydra.nixos.org/build/307516072 at 2025-09-19 - hylolib # failure in job https://hydra.nixos.org/build/233197340 at 2023-09-02 - hyper-haskell-server # failure in job https://hydra.nixos.org/build/233244991 at 2023-09-02 - hyperdrive # failure in job https://hydra.nixos.org/build/233223556 at 2023-09-02 - hyperfunctions # failure in job https://hydra.nixos.org/build/233195544 at 2023-09-02 + - hypergeomatrix # failure in job https://hydra.nixos.org/build/307610969 at 2025-09-19 - hyperion # failure in job https://hydra.nixos.org/build/233218339 at 2023-09-02 - hyperloglogplus # failure in job https://hydra.nixos.org/build/233259772 at 2023-09-02 - hyperscript # failure in job https://hydra.nixos.org/build/233222333 at 2023-09-02 @@ -3123,6 +3243,7 @@ broken-packages: - idempotent # failure in job https://hydra.nixos.org/build/233244413 at 2023-09-02 - identifiers # failure in job https://hydra.nixos.org/build/233251845 at 2023-09-02 - idiii # failure in job https://hydra.nixos.org/build/233228586 at 2023-09-02 + - idiomatic # failure in job https://hydra.nixos.org/build/307519601 at 2025-09-19 - idna2008 # failure in job https://hydra.nixos.org/build/233206444 at 2023-09-02 - IDynamic # failure in job https://hydra.nixos.org/build/233196222 at 2023-09-02 - ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02 @@ -3140,6 +3261,7 @@ broken-packages: - ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02 - ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02 - ihaskell-widgets # failure in job https://hydra.nixos.org/build/265955663 at 2024-07-14 + - ihp-openai # failure in job https://hydra.nixos.org/build/307610988 at 2025-09-19 - illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02 - image-type # failure in job https://hydra.nixos.org/build/233251466 at 2023-09-02 - imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02 @@ -3154,6 +3276,7 @@ broken-packages: - implicit-hie-cradle # failure in job https://hydra.nixos.org/build/252710698 at 2024-03-16 - implicit-logging # failure in job https://hydra.nixos.org/build/233194358 at 2023-09-02 - implicit-params # failure in job https://hydra.nixos.org/build/233201527 at 2023-09-02 + - import-style-plugin # failure in job https://hydra.nixos.org/build/307519634 at 2025-09-19 - imports # failure in job https://hydra.nixos.org/build/233227469 at 2023-09-02 - impossible # failure in job https://hydra.nixos.org/build/233216237 at 2023-09-02 - imprint # failure in job https://hydra.nixos.org/build/233246314 at 2023-09-02 @@ -3181,11 +3304,11 @@ broken-packages: - inilist # failure in job https://hydra.nixos.org/build/233203791 at 2023-09-02 - initialize # failure in job https://hydra.nixos.org/build/233228739 at 2023-09-02 - inj-base # failure in job https://hydra.nixos.org/build/233198720 at 2023-09-02 + - inject # failure in job https://hydra.nixos.org/build/307519677 at 2025-09-19 - inject-function # failure in job https://hydra.nixos.org/build/233252462 at 2023-09-02 - injections # failure in job https://hydra.nixos.org/build/233207796 at 2023-09-02 - inline-c-cuda # failure in job https://hydra.nixos.org/build/237234701 at 2023-10-21 - inline-c-objc # failure in job https://hydra.nixos.org/build/233223704 at 2023-09-02 - - inline-r # failure in job https://hydra.nixos.org/build/233210520 at 2023-09-02 - inserts # failure in job https://hydra.nixos.org/build/233198758 at 2023-09-02 - instana-haskell-trace-sdk # failure in job https://hydra.nixos.org/build/233211339 at 2023-09-02 - instance-control # failure in job https://hydra.nixos.org/build/252726549 at 2024-03-16 @@ -3193,6 +3316,7 @@ broken-packages: - instant-generics # failure in job https://hydra.nixos.org/build/233209385 at 2023-09-02 - instapaper-sender # failure in job https://hydra.nixos.org/build/233225390 at 2023-09-02 - instinct # failure in job https://hydra.nixos.org/build/233203632 at 2023-09-02 + - int-cast # failure in job https://hydra.nixos.org/build/307519683 at 2025-09-19 - int-interval-map # failure in job https://hydra.nixos.org/build/233244556 at 2023-09-02 - int-multimap # failure in job https://hydra.nixos.org/build/233210427 at 2023-09-02 - intcode # failure in job https://hydra.nixos.org/build/233198813 at 2023-09-02 @@ -3222,6 +3346,7 @@ broken-packages: - intro # failure in job https://hydra.nixos.org/build/233192297 at 2023-09-02 - introduction # failure in job https://hydra.nixos.org/build/233223585 at 2023-09-02 - inventory # failure in job https://hydra.nixos.org/build/295094716 at 2025-04-22 + - invert # failure in job https://hydra.nixos.org/build/307519700 at 2025-09-19 - invertible-hlist # failure in job https://hydra.nixos.org/build/295094739 at 2025-04-22 - invertible-syntax # failure in job https://hydra.nixos.org/build/233230924 at 2023-09-02 - involutive-semigroups # failure in job https://hydra.nixos.org/build/233239156 at 2023-09-02 @@ -3244,7 +3369,6 @@ broken-packages: - irc-fun-types # failure in job https://hydra.nixos.org/build/233255910 at 2023-09-02 - ircbot # failure in job https://hydra.nixos.org/build/295094782 at 2025-04-22 - ireal # failure in job https://hydra.nixos.org/build/233239811 at 2023-09-02 - - iri # failure in job https://hydra.nixos.org/build/295455675 at 2025-05-02 - iridium # failure in job https://hydra.nixos.org/build/233211261 at 2023-09-02 - iris # failure in job https://hydra.nixos.org/build/233212713 at 2023-09-02 - iron-mq # failure in job https://hydra.nixos.org/build/233200693 at 2023-09-02 @@ -3350,6 +3474,7 @@ broken-packages: - JuicyPixels-blp # failure in job https://hydra.nixos.org/build/233220427 at 2023-09-02 - JuicyPixels-blurhash # failure in job https://hydra.nixos.org/build/233228377 at 2023-09-02 - JuicyPixels-canvas # failure in job https://hydra.nixos.org/build/233198693 at 2023-09-02 + - JuicyPixels-scale-dct # failure in job https://hydra.nixos.org/build/307609917 at 2025-09-19 - JuicyPixels-util # failure in job https://hydra.nixos.org/build/233200460 at 2023-09-02 - JunkDB # failure in job https://hydra.nixos.org/build/233203494 at 2023-09-02 - jupyter # failure in job https://hydra.nixos.org/build/233232429 at 2023-09-02 @@ -3370,6 +3495,7 @@ broken-packages: - karabiner-config # failure in job https://hydra.nixos.org/build/233217813 at 2023-09-02 - karps # failure in job https://hydra.nixos.org/build/233243155 at 2023-09-02 - katip-datadog # failure in job https://hydra.nixos.org/build/233214346 at 2023-09-02 + - katip-effectful # failure in job https://hydra.nixos.org/build/307519870 at 2025-09-19 - katip-elasticsearch # failure in job https://hydra.nixos.org/build/233208410 at 2023-09-02 - katip-kafka # failure in job https://hydra.nixos.org/build/233241819 at 2023-09-02 - katip-logzio # failure in job https://hydra.nixos.org/build/233237068 at 2023-09-02 @@ -3379,7 +3505,6 @@ broken-packages: - katydid # failure in job https://hydra.nixos.org/build/233227524 at 2023-09-02 - kawa # failure in job https://hydra.nixos.org/build/252728326 at 2024-03-16 - kawaii # failure in job https://hydra.nixos.org/build/233205134 at 2023-09-02 - - Kawaii-Parser # failure in job https://hydra.nixos.org/build/233222574 at 2023-09-02 - kawhi # failure in job https://hydra.nixos.org/build/233193086 at 2023-09-02 - kd-tree # failure in job https://hydra.nixos.org/build/233207928 at 2023-09-02 - kdesrc-build-extra # failure in job https://hydra.nixos.org/build/233193718 at 2023-09-02 @@ -3416,6 +3541,7 @@ broken-packages: - koofr-client # failure in job https://hydra.nixos.org/build/233255749 at 2023-09-02 - korea-holidays # failure in job https://hydra.nixos.org/build/233222677 at 2023-09-02 - kraken # failure in job https://hydra.nixos.org/build/233202384 at 2023-09-02 + - krank # failure in job https://hydra.nixos.org/build/307611020 at 2025-09-19 - krapsh # failure in job https://hydra.nixos.org/build/233219887 at 2023-09-02 - Kriens # failure in job https://hydra.nixos.org/build/233251673 at 2023-09-02 - krpc # failure in job https://hydra.nixos.org/build/233231587 at 2023-09-02 @@ -3442,6 +3568,7 @@ broken-packages: - lambdaBase # failure in job https://hydra.nixos.org/build/233194002 at 2023-09-02 - lambdabot-telegram-plugins # failure in job https://hydra.nixos.org/build/234444260 at 2023-09-13 - lambdabot-utils # failure in job https://hydra.nixos.org/build/233224842 at 2023-09-02 + - lambdabot-xmpp # failure in job https://hydra.nixos.org/build/307611040 at 2025-09-19 - lambdacms-core # failure in job https://hydra.nixos.org/build/233217257 at 2023-09-02 - lambdacube-core # failure in job https://hydra.nixos.org/build/233233440 at 2023-09-02 - lambdacube-engine # failure in job https://hydra.nixos.org/build/233223079 at 2023-09-02 @@ -3471,6 +3598,7 @@ broken-packages: - language-hcl # failure in job https://hydra.nixos.org/build/233212998 at 2023-09-02 - language-java-classfile # failure in job https://hydra.nixos.org/build/233257021 at 2023-09-02 - language-js # failure in job https://hydra.nixos.org/build/233190676 at 2023-09-02 + - language-lua # failure in job https://hydra.nixos.org/build/307611034 at 2025-09-19 - language-lua-qq # failure in job https://hydra.nixos.org/build/233194697 at 2023-09-02 - language-lua2 # failure in job https://hydra.nixos.org/build/233197435 at 2023-09-02 - language-mixal # failure in job https://hydra.nixos.org/build/233226763 at 2023-09-02 @@ -3484,6 +3612,7 @@ broken-packages: - language-sh # failure in job https://hydra.nixos.org/build/233249709 at 2023-09-02 - language-sqlite # failure in job https://hydra.nixos.org/build/233248845 at 2023-09-02 - language-sygus # failure in job https://hydra.nixos.org/build/233192608 at 2023-09-02 + - language-thrift # failure in job https://hydra.nixos.org/build/307519920 at 2025-09-19 - language-typescript # failure in job https://hydra.nixos.org/build/233247703 at 2023-09-02 - language-webidl # failure in job https://hydra.nixos.org/build/233194656 at 2023-09-02 - laop # failure in job https://hydra.nixos.org/build/233204106 at 2023-09-02 @@ -3508,10 +3637,12 @@ broken-packages: - lazy # failure in job https://hydra.nixos.org/build/295094978 at 2025-04-22 - lazy-async # failure in job https://hydra.nixos.org/build/252730698 at 2024-03-16 - lazy-bracket # failure in job https://hydra.nixos.org/build/252727186 at 2024-03-16 + - lazy-cache # failure in job https://hydra.nixos.org/build/307519967 at 2025-09-19 - lazy-hash # failure in job https://hydra.nixos.org/build/233211405 at 2023-09-02 - lazy-priority-queue # failure in job https://hydra.nixos.org/build/233211457 at 2023-09-02 - lazyarray # failure in job https://hydra.nixos.org/build/233192440 at 2023-09-02 - lazyboy # failure in job https://hydra.nixos.org/build/233201158 at 2023-09-02 + - lazyppl # failure in job https://hydra.nixos.org/build/307519966 at 2025-09-19 - lazyset # failure in job https://hydra.nixos.org/build/233248383 at 2023-09-02 - lbfgs # failure in job https://hydra.nixos.org/build/282178103 at 2024-12-23 - LC3 # failure in job https://hydra.nixos.org/build/233192513 at 2023-09-02 @@ -3552,6 +3683,7 @@ broken-packages: - levmar # failure in job https://hydra.nixos.org/build/233254731 at 2023-09-02 - lfst # failure in job https://hydra.nixos.org/build/233240622 at 2023-09-02 - lhc # failure in job https://hydra.nixos.org/build/233220731 at 2023-09-02 + - lhs2tex # failure in job https://hydra.nixos.org/build/307520007 at 2025-09-19 - lhs2TeX-hl # failure in job https://hydra.nixos.org/build/233221405 at 2023-09-02 - lhslatex # failure in job https://hydra.nixos.org/build/233246375 at 2023-09-02 - LibClang # failure in job https://hydra.nixos.org/build/233194732 at 2023-09-02 @@ -3560,6 +3692,7 @@ broken-packages: - libgit # failure in job https://hydra.nixos.org/build/252729283 at 2024-03-16 - libhbb # failure in job https://hydra.nixos.org/build/233232186 at 2023-09-02 - libinfluxdb # failure in job https://hydra.nixos.org/build/233199457 at 2023-09-02 + - libiserv # failure in job https://hydra.nixos.org/build/307520003 at 2025-09-19 - libjenkins # failure in job https://hydra.nixos.org/build/233198788 at 2023-09-02 - libjwt-typed # failure in job https://hydra.nixos.org/build/233230163 at 2023-09-02 - libltdl # failure in job https://hydra.nixos.org/build/233225728 at 2023-09-02 @@ -3570,10 +3703,10 @@ broken-packages: - libphonenumber # failure in job https://hydra.nixos.org/build/233251839 at 2023-09-02 - libpq # failure in job https://hydra.nixos.org/build/233192542 at 2023-09-02 - librandomorg # failure in job https://hydra.nixos.org/build/233232749 at 2023-09-02 + - libremidi # failure in job https://hydra.nixos.org/build/307520031 at 2025-09-19 - libriscv # failure in job https://hydra.nixos.org/build/295122867 at 2025-04-22 - libsecp256k1 # failure in job https://hydra.nixos.org/build/234441559 at 2023-09-13 - libsodium # failure in job https://hydra.nixos.org/build/243816565 at 2024-01-01 - - libssh2 # failure in job https://hydra.nixos.org/build/295095049 at 2025-04-22 - libstackexchange # failure in job https://hydra.nixos.org/build/295095048 at 2025-04-22 - libsystemd-daemon # failure in job https://hydra.nixos.org/build/233207090 at 2023-09-02 - libtagc # failure in job https://hydra.nixos.org/build/233223631 at 2023-09-02 @@ -3594,7 +3727,9 @@ broken-packages: - ligature # failure in job https://hydra.nixos.org/build/233212688 at 2023-09-02 - light # failure in job https://hydra.nixos.org/build/233193643 at 2023-09-02 - lilypond # failure in job https://hydra.nixos.org/build/233221478 at 2023-09-02 + - lima # failure in job https://hydra.nixos.org/build/307520034 at 2025-09-19 - Limit # failure in job https://hydra.nixos.org/build/233229268 at 2023-09-02 + - limp # failure in job https://hydra.nixos.org/build/307520047 at 2025-09-19 - limp-cbc # failure in job https://hydra.nixos.org/build/233201076 at 2023-09-02 - linda # failure in job https://hydra.nixos.org/build/233249512 at 2023-09-02 - linden # failure in job https://hydra.nixos.org/build/233198590 at 2023-09-02 @@ -3630,9 +3765,13 @@ broken-packages: - lio-simple # failure in job https://hydra.nixos.org/build/233200711 at 2023-09-02 - lipsum-gen # failure in job https://hydra.nixos.org/build/233233734 at 2023-09-02 - liquid # failure in job https://hydra.nixos.org/build/233255883 at 2023-09-02 - - liquid-fixpoint # failure in job https://hydra.nixos.org/build/233213637 at 2023-09-02 + - liquid-ghc-prim # failure in job https://hydra.nixos.org/build/307520084 at 2025-09-19 + - liquid-parallel # failure in job https://hydra.nixos.org/build/307520068 at 2025-09-19 + - liquid-prelude # failure in job https://hydra.nixos.org/build/307520076 at 2025-09-19 + - liquid-vector # failure in job https://hydra.nixos.org/build/307520072 at 2025-09-19 - liquidhaskell-cabal # failure in job https://hydra.nixos.org/build/233249946 at 2023-09-02 - Liquorice # failure in job https://hydra.nixos.org/build/233193923 at 2023-09-02 + - list-fusion-probe # failure in job https://hydra.nixos.org/build/307520092 at 2025-09-19 - list-mux # failure in job https://hydra.nixos.org/build/233206407 at 2023-09-02 - list-prompt # failure in job https://hydra.nixos.org/build/233235855 at 2023-09-02 - list-singleton # failure in job https://hydra.nixos.org/build/252723010 at 2024-03-16 @@ -3640,7 +3779,6 @@ broken-packages: - list-t-libcurl # failure in job https://hydra.nixos.org/build/233237389 at 2023-09-02 - list-t-text # failure in job https://hydra.nixos.org/build/233235451 at 2023-09-02 - list-zip-def # failure in job https://hydra.nixos.org/build/233202564 at 2023-09-02 - - list-zipper # failure in job https://hydra.nixos.org/build/233250766 at 2023-09-02 - listlike-instances # failure in job https://hydra.nixos.org/build/233238303 at 2023-09-02 - literals # failure in job https://hydra.nixos.org/build/233233709 at 2023-09-02 - LiterateMarkdown # failure in job https://hydra.nixos.org/build/233233229 at 2023-09-02 @@ -3651,7 +3789,7 @@ broken-packages: - llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02 - llvm-codegen # failure in job https://hydra.nixos.org/build/295095119 at 2025-04-22 - llvm-extension # failure in job https://hydra.nixos.org/build/266355631 at 2024-07-14 - - llvm-extra # failure in job https://hydra.nixos.org/build/303481607 at 2025-07-27 + - llvm-ffi-tools # failure in job https://hydra.nixos.org/build/307520119 at 2025-09-19 - llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02 - llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02 - llvm-hs-pure # failure in job https://hydra.nixos.org/build/252721738 at 2024-03-16 @@ -3685,8 +3823,10 @@ broken-packages: - lojbanParser # failure in job https://hydra.nixos.org/build/233236082 at 2023-09-02 - lojbanXiragan # failure in job https://hydra.nixos.org/build/233258779 at 2023-09-02 - lol-calculus # failure in job https://hydra.nixos.org/build/233233910 at 2023-09-02 + - long-double # failure in job https://hydra.nixos.org/build/307520133 at 2025-09-19 - longboi # failure in job https://hydra.nixos.org/build/233233913 at 2023-09-02 - longshot # bounds issues https://hydra.nixos.org/build/295428416 + - looksee # failure in job https://hydra.nixos.org/build/307520163 at 2025-09-19 - lookup-tables # failure in job https://hydra.nixos.org/build/233196965 at 2023-09-02 - loop-dsl # failure in job https://hydra.nixos.org/build/233198743 at 2023-09-02 - loop-while # failure in job https://hydra.nixos.org/build/233198041 at 2023-09-02 @@ -3703,9 +3843,11 @@ broken-packages: - lp-diagrams # failure in job https://hydra.nixos.org/build/295095167 at 2025-04-22 - lp-diagrams-svg # failure in job https://hydra.nixos.org/build/233220097 at 2023-09-02 - LRU # failure in job https://hydra.nixos.org/build/233206273 at 2023-09-02 + - lrucaching # failure in job https://hydra.nixos.org/build/307520156 at 2025-09-19 - lscabal # failure in job https://hydra.nixos.org/build/233253536 at 2023-09-02 - lsfrom # failure in job https://hydra.nixos.org/build/233211705 at 2023-09-02 - lsh # failure in job https://hydra.nixos.org/build/233256686 at 2023-09-02 + - lsql-csv # failure in job https://hydra.nixos.org/build/307520164 at 2025-09-19 - lti13 # failure in job https://hydra.nixos.org/build/252715722 at 2024-03-16 - ltiv1p1 # failure in job https://hydra.nixos.org/build/233200883 at 2023-09-02 - ltk # failure in job https://hydra.nixos.org/build/233244152 at 2023-09-02 @@ -3763,6 +3905,7 @@ broken-packages: - Mapping # failure in job https://hydra.nixos.org/build/233248158 at 2023-09-02 - mappy # failure in job https://hydra.nixos.org/build/233250202 at 2023-09-02 - MapWith # failure in job https://hydra.nixos.org/build/233237146 at 2023-09-02 + - maquinitas-tidal # failure in job https://hydra.nixos.org/build/307520205 at 2025-09-19 - markdown-kate # failure in job https://hydra.nixos.org/build/233227051 at 2023-09-02 - marked-pretty # failure in job https://hydra.nixos.org/build/233193892 at 2023-09-02 - markov-chain-usage-model # failure in job https://hydra.nixos.org/build/241522329 at 2023-12-03 @@ -3805,7 +3948,6 @@ broken-packages: - mcmaster-gloss-examples # failure in job https://hydra.nixos.org/build/234457610 at 2023-09-13 - mcmc-synthesis # failure in job https://hydra.nixos.org/build/233208414 at 2023-09-02 - mcp # failure in job https://hydra.nixos.org/build/302804588 at 2025-07-27 - - mcp-server # failure in job https://hydra.nixos.org/build/302804602 at 2025-07-27 - mcpi # failure in job https://hydra.nixos.org/build/233231465 at 2023-09-02 - mdapi # failure in job https://hydra.nixos.org/build/233257724 at 2023-09-02 - mdcat # failure in job https://hydra.nixos.org/build/233249429 at 2023-09-02 @@ -3823,7 +3965,6 @@ broken-packages: - medium-sdk-haskell # failure in job https://hydra.nixos.org/build/233195507 at 2023-09-02 - meep # failure in job https://hydra.nixos.org/build/233193144 at 2023-09-02 - megalisp # failure in job https://hydra.nixos.org/build/233234992 at 2023-09-02 - - megaparsec-tests # failure in job https://hydra.nixos.org/build/295095283 at 2025-04-22 - megastore # failure in job https://hydra.nixos.org/build/233222876 at 2023-09-02 - mellon-core # failure in job https://hydra.nixos.org/build/233221666 at 2023-09-02 - melody # failure in job https://hydra.nixos.org/build/233223241 at 2023-09-02 @@ -3863,7 +4004,6 @@ broken-packages: - micro-recursion-schemes # failure in job https://hydra.nixos.org/build/233214118 at 2023-09-02 - microbase # failure in job https://hydra.nixos.org/build/233204368 at 2023-09-02 - microdns # failure in job https://hydra.nixos.org/build/295095321 at 2025-04-22 - - microformats2-parser # failure in job https://hydra.nixos.org/build/233238485 at 2023-09-02 - microgroove # failure in job https://hydra.nixos.org/build/233196933 at 2023-09-02 - microlens-each # failure in job https://hydra.nixos.org/build/233253621 at 2023-09-02 - microlens-process # failure in job https://hydra.nixos.org/build/233190805 at 2023-09-02 @@ -3871,15 +4011,16 @@ broken-packages: - microsoft-translator # failure in job https://hydra.nixos.org/build/233235928 at 2023-09-02 - mida # failure in job https://hydra.nixos.org/build/233223244 at 2023-09-02 - midi-simple # failure in job https://hydra.nixos.org/build/233219079 at 2023-09-02 + - midi-util # failure in job https://hydra.nixos.org/build/307520300 at 2025-09-19 - midi-utils # failure in job https://hydra.nixos.org/build/233222257 at 2023-09-02 - midisurface # failure in job https://hydra.nixos.org/build/233224559 at 2023-09-02 - mig-swagger-ui # failure in job https://hydra.nixos.org/build/295095369 at 2025-04-22 - - mighttpd2 # failure in job https://hydra.nixos.org/build/233213125 at 2023-09-02 - mikmod # failure in job https://hydra.nixos.org/build/233247364 at 2023-09-02 - mikrokosmos # failure in job https://hydra.nixos.org/build/233232143 at 2023-09-02 - miku # failure in job https://hydra.nixos.org/build/233212186 at 2023-09-02 - milena # failure in job https://hydra.nixos.org/build/233257533 at 2023-09-02 - mime-directory # failure in job https://hydra.nixos.org/build/233209691 at 2023-09-02 + - min-max-pqueue # failure in job https://hydra.nixos.org/build/307520339 at 2025-09-19 - mines # failure in job https://hydra.nixos.org/build/252722834 at 2024-03-16 - mini-egison # failure in job https://hydra.nixos.org/build/295095354 at 2025-04-22 - MiniAgda # failure in job https://hydra.nixos.org/build/233259586 at 2023-09-02 @@ -3935,6 +4076,7 @@ broken-packages: - monad-levels # failure in job https://hydra.nixos.org/build/233230433 at 2023-09-02 - monad-lgbt # failure in job https://hydra.nixos.org/build/233207652 at 2023-09-02 - monad-log # failure in job https://hydra.nixos.org/build/233235588 at 2023-09-02 + - monad-logger-aeson # failure in job https://hydra.nixos.org/build/307611094 at 2025-09-19 - monad-logger-prefix # failure in job https://hydra.nixos.org/build/233194845 at 2023-09-02 - monad-lrs # failure in job https://hydra.nixos.org/build/233204729 at 2023-09-02 - monad-mersenne-random # failure in job https://hydra.nixos.org/build/233219918 at 2023-09-02 @@ -3986,15 +4128,15 @@ broken-packages: - mongodb-queue # failure in job https://hydra.nixos.org/build/233216248 at 2023-09-02 - monitor # failure in job https://hydra.nixos.org/build/233229021 at 2023-09-02 - mono-foldable # failure in job https://hydra.nixos.org/build/233238824 at 2023-09-02 + - mono-traversable-keys # failure in job https://hydra.nixos.org/build/307520429 at 2025-09-19 - monocypher # failure in job https://hydra.nixos.org/build/233195745 at 2023-09-02 - monoid # failure in job https://hydra.nixos.org/build/233252888 at 2023-09-02 - monoid-absorbing # failure in job https://hydra.nixos.org/build/233236465 at 2023-09-02 - monoid-owns # failure in job https://hydra.nixos.org/build/233259043 at 2023-09-02 - - monoidmap # failure in job https://hydra.nixos.org/build/295095498 at 2025-04-22 + - monoid-statistics # failure in job https://hydra.nixos.org/build/307520442 at 2025-09-19 - monoidplus # failure in job https://hydra.nixos.org/build/233226759 at 2023-09-02 - monoids # failure in job https://hydra.nixos.org/build/233231684 at 2023-09-02 - monopati # failure in job https://hydra.nixos.org/build/233234119 at 2023-09-02 - - months # failure in job https://hydra.nixos.org/build/267981052 at 2024-07-31 - monus # failure in job https://hydra.nixos.org/build/233252424 at 2023-09-02 - monus-weighted-search # timeout - monzo # failure in job https://hydra.nixos.org/build/233254681 at 2023-09-02 @@ -4002,6 +4144,7 @@ broken-packages: - morfeusz # failure in job https://hydra.nixos.org/build/233232351 at 2023-09-02 - morloc # failure in job https://hydra.nixos.org/build/295095489 at 2025-04-22 - morpheus-graphql-cli # failure in job https://hydra.nixos.org/build/233249063 at 2023-09-02 + - morpheus-graphql-code-gen # failure in job https://hydra.nixos.org/build/307611107 at 2025-09-19 - morphisms-functors # failure in job https://hydra.nixos.org/build/233255311 at 2023-09-02 - morphisms-objects # failure in job https://hydra.nixos.org/build/233216076 at 2023-09-02 - morte # failure in job https://hydra.nixos.org/build/233212193 at 2023-09-02 @@ -4043,6 +4186,7 @@ broken-packages: - mudbath # failure in job https://hydra.nixos.org/build/233198648 at 2023-09-02 - mulang # failure in job https://hydra.nixos.org/build/233211001 at 2023-09-02 - multext-east-msd # failure in job https://hydra.nixos.org/build/233191007 at 2023-09-02 + - multi-containers # failure in job https://hydra.nixos.org/build/307520493 at 2025-09-19 - multi-instance # failure in job https://hydra.nixos.org/build/233203186 at 2023-09-02 - multiaddr # failure in job https://hydra.nixos.org/build/233223452 at 2023-09-02 - multiarg # failure in job https://hydra.nixos.org/build/233238633 at 2023-09-02 @@ -4098,15 +4242,16 @@ broken-packages: - nanoAgda # failure in job https://hydra.nixos.org/build/233259294 at 2023-09-02 - nanocurses # failure in job https://hydra.nixos.org/build/233215906 at 2023-09-02 - nanomsg # failure in job https://hydra.nixos.org/build/233240904 at 2023-09-02 - - nanomsg-haskell # failure in job https://hydra.nixos.org/build/233207779 at 2023-09-02 - nanoparsec # failure in job https://hydra.nixos.org/build/233248843 at 2023-09-02 - nanopass # failure in job https://hydra.nixos.org/build/233230210 at 2023-09-02 - NanoProlog # failure in job https://hydra.nixos.org/build/233244743 at 2023-09-02 + - nanovg # failure in job https://hydra.nixos.org/build/307520550 at 2025-09-19 - nanovg-simple # failure in job https://hydra.nixos.org/build/233257414 at 2023-09-02 - Naperian # failure in job https://hydra.nixos.org/build/233200372 at 2023-09-02 - naperian # failure in job https://hydra.nixos.org/build/233233726 at 2023-09-02 - naqsha # failure in job https://hydra.nixos.org/build/233256844 at 2023-09-02 - narc # failure in job https://hydra.nixos.org/build/233215853 at 2023-09-02 + - nat-optics # failure in job https://hydra.nixos.org/build/307520571 at 2025-09-19 - nat-sized-numbers # failure in job https://hydra.nixos.org/build/233244238 at 2023-09-02 - nationstates # failure in job https://hydra.nixos.org/build/233243640 at 2023-09-02 - nats-client # failure in job https://hydra.nixos.org/build/233241313 at 2023-09-02 @@ -4129,12 +4274,12 @@ broken-packages: - nekos-best # failure in job https://hydra.nixos.org/build/233214327 at 2023-09-02 - Neks # failure in job https://hydra.nixos.org/build/233238103 at 2023-09-02 - neptune-backend # failure in job https://hydra.nixos.org/build/233214329 at 2023-09-02 - - nerd-font-icons # failure in job https://hydra.nixos.org/build/295456454 at 2025-05-02 - nero # failure in job https://hydra.nixos.org/build/233216907 at 2023-09-02 - nest # failure in job https://hydra.nixos.org/build/233224450 at 2023-09-02 - nested-sequence # failure in job https://hydra.nixos.org/build/233221359 at 2023-09-02 - NestedFunctor # failure in job https://hydra.nixos.org/build/233253656 at 2023-09-02 - nestedmap # failure in job https://hydra.nixos.org/build/233219375 at 2023-09-02 + - net-mqtt # failure in job https://hydra.nixos.org/build/307611123 at 2025-09-19 - net-spider # failure in job https://hydra.nixos.org/build/295095612 at 2025-04-22 - netclock # failure in job https://hydra.nixos.org/build/233207456 at 2023-09-02 - netease-fm # failure in job https://hydra.nixos.org/build/233210043 at 2023-09-02 @@ -4239,6 +4384,7 @@ broken-packages: - numeric-optimization-backprop # failure in job https://hydra.nixos.org/build/252733863 at 2024-03-16 - numeric-qq # failure in job https://hydra.nixos.org/build/233207127 at 2023-09-02 - numeric-ranges # failure in job https://hydra.nixos.org/build/233191878 at 2023-09-02 + - numhask-array # failure in job https://hydra.nixos.org/build/307520702 at 2025-09-19 - numhask-free # failure in job https://hydra.nixos.org/build/233214800 at 2023-09-02 - numhask-histogram # failure in job https://hydra.nixos.org/build/295095746 at 2025-04-22 - numhask-prelude # failure in job https://hydra.nixos.org/build/233248768 at 2023-09-02 @@ -4246,10 +4392,12 @@ broken-packages: - numtype-tf # failure in job https://hydra.nixos.org/build/233243483 at 2023-09-02 - nurbs # failure in job https://hydra.nixos.org/build/295095756 at 2025-04-22 - Nutri # failure in job https://hydra.nixos.org/build/233244244 at 2023-09-02 + - nuxeo # failure in job https://hydra.nixos.org/build/307611148 at 2025-09-19 - NXT # failure in job https://hydra.nixos.org/build/265955670 at 2024-07-14 - NXTDSL # failure in job https://hydra.nixos.org/build/233193483 at 2023-09-02 - nyan-interpolation-core # failure in job https://hydra.nixos.org/build/295095752 at 2025-04-22 - nylas # failure in job https://hydra.nixos.org/build/233193540 at 2023-09-02 + - o-clock # failure in job https://hydra.nixos.org/build/307520711 at 2025-09-19 - oalg-base # failure in job https://hydra.nixos.org/build/295095765 at 2025-04-22 - oanda-rest-api # failure in job https://hydra.nixos.org/build/233250190 at 2023-09-02 - oasis-xrd # failure in job https://hydra.nixos.org/build/233199264 at 2023-09-02 @@ -4272,7 +4420,6 @@ broken-packages: - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02 - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02 - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02 - - ollama-haskell # failure in job https://hydra.nixos.org/build/276371507 at 2024-11-06 - om-actor # failure in job https://hydra.nixos.org/build/233231027 at 2023-09-02 - om-http # failure in job https://hydra.nixos.org/build/233245328 at 2023-09-02 - om-http-logging # failure in job https://hydra.nixos.org/build/233218069 at 2023-09-02 @@ -4284,7 +4431,9 @@ broken-packages: - omnifmt # failure in job https://hydra.nixos.org/build/233219763 at 2023-09-02 - on-a-horse # failure in job https://hydra.nixos.org/build/233199193 at 2023-09-02 - on-demand-ssh-tunnel # failure in job https://hydra.nixos.org/build/233197181 at 2023-09-02 + - onama # failure in job https://hydra.nixos.org/build/307520792 at 2025-09-19 - ONC-RPC # failure in job https://hydra.nixos.org/build/233225207 at 2023-09-02 + - one-line-aeson-text # failure in job https://hydra.nixos.org/build/307520746 at 2025-09-19 - oneormore # failure in job https://hydra.nixos.org/build/233242475 at 2023-09-02 - online # failure in job https://hydra.nixos.org/build/233195360 at 2023-09-02 - onpartitions # failure in job https://hydra.nixos.org/build/233226163 at 2023-09-02 @@ -4352,6 +4501,7 @@ broken-packages: - OrchestrateDB # failure in job https://hydra.nixos.org/build/233200562 at 2023-09-02 - order-statistics # failure in job https://hydra.nixos.org/build/233255710 at 2023-09-02 - ordered # failure in job https://hydra.nixos.org/build/233226269 at 2023-09-02 + - ordinal # failure in job https://hydra.nixos.org/build/307520852 at 2025-09-19 - Ordinary # failure in job https://hydra.nixos.org/build/233240078 at 2023-09-02 - ordrea # failure in job https://hydra.nixos.org/build/233192984 at 2023-09-02 - oref # failure in job https://hydra.nixos.org/build/233239331 at 2023-09-02 @@ -4375,7 +4525,6 @@ broken-packages: - OSM # failure in job https://hydra.nixos.org/build/233231098 at 2023-09-02 - osm-conduit # failure in job https://hydra.nixos.org/build/233259898 at 2023-09-02 - oso2pdf # failure in job https://hydra.nixos.org/build/233235234 at 2023-09-02 - - osv # failure in job https://hydra.nixos.org/build/295095872 at 2025-04-22 - osx-ar # failure in job https://hydra.nixos.org/build/233194090 at 2023-09-02 - ot # failure in job https://hydra.nixos.org/build/233244553 at 2023-09-02 - OTP # failure in job https://hydra.nixos.org/build/233215664 at 2023-09-02 @@ -4409,13 +4558,13 @@ broken-packages: - pandoc-citeproc # failure in job https://hydra.nixos.org/build/233198462 at 2023-09-02 - pandoc-columns # failure in job https://hydra.nixos.org/build/233234538 at 2023-09-02 - pandoc-csv2table # failure in job https://hydra.nixos.org/build/233229925 at 2023-09-02 + - pandoc-dhall-decoder # failure in job https://hydra.nixos.org/build/307611186 at 2025-09-19 - pandoc-emphasize-code # failure in job https://hydra.nixos.org/build/252733347 at 2024-03-16 - pandoc-filter-graphviz # failure in job https://hydra.nixos.org/build/233233372 at 2023-09-02 - pandoc-filter-indent # failure in job https://hydra.nixos.org/build/233235439 at 2023-09-02 - pandoc-include # failure in job https://hydra.nixos.org/build/233199152 at 2023-09-02 - pandoc-include-code # failure in job https://hydra.nixos.org/build/252710408 at 2024-03-16 - pandoc-include-plus # failure in job https://hydra.nixos.org/build/233198059 at 2023-09-02 - - pandoc-lens # failure in job https://hydra.nixos.org/build/233251239 at 2023-09-02 - pandoc-linear-table # failure in job https://hydra.nixos.org/build/233254813 at 2023-09-02 - pandoc-logic-proof # failure in job https://hydra.nixos.org/build/233223409 at 2023-09-02 - pandoc-markdown-ghci-filter # failure in job https://hydra.nixos.org/build/233213731 at 2023-09-02 @@ -4483,6 +4632,7 @@ broken-packages: - parsley-core # failure in job https://hydra.nixos.org/build/233240217 at 2023-09-02 - parsnip # failure in job https://hydra.nixos.org/build/233229093 at 2023-09-02 - partial-lens # failure in job https://hydra.nixos.org/build/233234761 at 2023-09-02 + - partial-order # failure in job https://hydra.nixos.org/build/307520912 at 2025-09-19 - partial-records # failure in job https://hydra.nixos.org/build/233205143 at 2023-09-02 - partial-semigroup # failure in job https://hydra.nixos.org/build/295096015 at 2025-04-22 - partial-semigroup-hedgehog # failure in job https://hydra.nixos.org/build/252731350 at 2024-03-16 @@ -4505,6 +4655,7 @@ broken-packages: - paths # failure in job https://hydra.nixos.org/build/252731256 at 2024-03-16 - PathTree # failure in job https://hydra.nixos.org/build/233216203 at 2023-09-02 - patronscraper # failure in job https://hydra.nixos.org/build/233258571 at 2023-09-02 + - pattern-matcher # failure in job https://hydra.nixos.org/build/307520949 at 2025-09-19 - pattern-trie # failure in job https://hydra.nixos.org/build/233237252 at 2023-09-02 - paynow-zw # failure in job https://hydra.nixos.org/build/233221916 at 2023-09-02 - paypal-adaptive-hoops # failure in job https://hydra.nixos.org/build/233244557 at 2023-09-02 @@ -4551,6 +4702,7 @@ broken-packages: - persistent-database-url # failure in job https://hydra.nixos.org/build/233233601 at 2023-09-02 - persistent-equivalence # failure in job https://hydra.nixos.org/build/233208713 at 2023-09-02 - persistent-generic # failure in job https://hydra.nixos.org/build/233220060 at 2023-09-02 + - persistent-ip # failure in job https://hydra.nixos.org/build/307611208 at 2025-09-19 - persistent-mongoDB # failure in job https://hydra.nixos.org/build/233207971 at 2023-09-02 - persistent-mtl # failure in job https://hydra.nixos.org/build/255677987 at 2024-04-16 - persistent-mysql-haskell # failure in job https://hydra.nixos.org/build/295096055 at 2025-04-22 @@ -4560,7 +4712,6 @@ broken-packages: - persistent-ratelimit # failure in job https://hydra.nixos.org/build/233224537 at 2023-09-02 - persistent-refs # failure in job https://hydra.nixos.org/build/252722090 at 2024-03-16 - persistent-relational-record # compilation failure https://hydra.nixos.org/build/295428425 - - persistent-sql-lifted # failure in job https://hydra.nixos.org/build/295096040 at 2025-04-22 - persistent-stm # failure in job https://hydra.nixos.org/build/233234706 at 2023-09-02 - persistent-template-classy # failure in job https://hydra.nixos.org/build/233230341 at 2023-09-02 - persistent-vector # failure in job https://hydra.nixos.org/build/252721689 at 2024-03-16 @@ -4628,13 +4779,16 @@ broken-packages: - pipes-break # failure in job https://hydra.nixos.org/build/233250730 at 2023-09-02 - pipes-brotli # failure in job https://hydra.nixos.org/build/233254662 at 2023-09-02 - pipes-bzip # failure in job https://hydra.nixos.org/build/233222309 at 2023-09-02 + - pipes-cacophony # failure in job https://hydra.nixos.org/build/307521021 at 2025-09-19 - pipes-category # failure in job https://hydra.nixos.org/build/233200163 at 2023-09-02 - pipes-cereal # failure in job https://hydra.nixos.org/build/233195413 at 2023-09-02 - pipes-core # failure in job https://hydra.nixos.org/build/233213024 at 2023-09-02 - pipes-errors # failure in job https://hydra.nixos.org/build/233214912 at 2023-09-02 + - pipes-interleave # failure in job https://hydra.nixos.org/build/307521060 at 2025-09-19 - pipes-io # failure in job https://hydra.nixos.org/build/233243253 at 2023-09-02 - pipes-kafka # failure in job https://hydra.nixos.org/build/252727228 at 2024-03-16 - pipes-lines # failure in job https://hydra.nixos.org/build/233243979 at 2023-09-02 + - pipes-lzma # failure in job https://hydra.nixos.org/build/307521032 at 2025-09-19 - pipes-network-ws # failure in job https://hydra.nixos.org/build/233245816 at 2023-09-02 - pipes-protolude # failure in job https://hydra.nixos.org/build/233216770 at 2023-09-02 - pipes-pulse-simple # failure in job https://hydra.nixos.org/build/295096094 at 2025-04-22 @@ -4717,6 +4871,7 @@ broken-packages: - polysemy-http # failure in job https://hydra.nixos.org/build/295122896 at 2025-04-22 - polysemy-keyed-state # failure in job https://hydra.nixos.org/build/233224142 at 2023-09-02 - polysemy-kvstore # failure in job https://hydra.nixos.org/build/233229745 at 2023-09-02 + - polysemy-log-co # failure in job https://hydra.nixos.org/build/307521087 at 2025-09-19 - polysemy-managed # failure in job https://hydra.nixos.org/build/233221190 at 2023-09-02 - polysemy-optics # failure in job https://hydra.nixos.org/build/233219159 at 2023-09-02 - polysemy-readline # failure in job https://hydra.nixos.org/build/233219007 at 2023-09-02 @@ -4732,7 +4887,6 @@ broken-packages: - pomohoro # failure in job https://hydra.nixos.org/build/233244601 at 2023-09-02 - ponder # failure in job https://hydra.nixos.org/build/233223646 at 2023-09-02 - pong-server # failure in job https://hydra.nixos.org/build/233194974 at 2023-09-02 - - pontarius-xmpp-extras # failure in job https://hydra.nixos.org/build/301059892 at 2025-07-01 - pontarius-xpmn # failure in job https://hydra.nixos.org/build/233217546 at 2023-09-02 - pool # failure in job https://hydra.nixos.org/build/233205364 at 2023-09-02 - pool-conduit # failure in job https://hydra.nixos.org/build/233246643 at 2023-09-02 @@ -4766,6 +4920,7 @@ broken-packages: - postgresql-replicant # failure in job https://hydra.nixos.org/build/233247943 at 2023-09-02 - postgresql-resilient # failure in job https://hydra.nixos.org/build/233212362 at 2023-09-02 - postgresql-simple-bind # failure in job https://hydra.nixos.org/build/233220640 at 2023-09-02 + - postgresql-simple-interval # failure in job https://hydra.nixos.org/build/307611243 at 2025-09-19 - postgresql-simple-named # failure in job https://hydra.nixos.org/build/233202481 at 2023-09-02 - postgresql-simple-opts # failure in job https://hydra.nixos.org/build/252718901 at 2024-03-16 - postgresql-simple-sop # failure in job https://hydra.nixos.org/build/233249757 at 2023-09-02 @@ -4780,6 +4935,8 @@ broken-packages: - postmaster # failure in job https://hydra.nixos.org/build/233258599 at 2023-09-02 - potato-tool # failure in job https://hydra.nixos.org/build/233242728 at 2023-09-02 - potoki-core # failure in job https://hydra.nixos.org/build/233218616 at 2023-09-02 + - potrace-diagrams # failure in job https://hydra.nixos.org/build/307611245 at 2025-09-19 + - powerdns # failure in job https://hydra.nixos.org/build/307611240 at 2025-09-19 - powermate # failure in job https://hydra.nixos.org/build/233224977 at 2023-09-02 - powerpc # failure in job https://hydra.nixos.org/build/233217983 at 2023-09-02 - powerqueue-levelmem # failure in job https://hydra.nixos.org/build/233232882 at 2023-09-02 @@ -4790,6 +4947,7 @@ broken-packages: - pprecord # failure in job https://hydra.nixos.org/build/233198838 at 2023-09-02 - PPrinter # failure in job https://hydra.nixos.org/build/233253160 at 2023-09-02 - pqc # failure in job https://hydra.nixos.org/build/233217425 at 2023-09-02 + - pr-tools # failure in job https://hydra.nixos.org/build/307611246 at 2025-09-19 - praglude # failure in job https://hydra.nixos.org/build/233227990 at 2023-09-02 - preamble # failure in job https://hydra.nixos.org/build/233214735 at 2023-09-02 - precis # failure in job https://hydra.nixos.org/build/233218390 at 2023-09-02 @@ -4826,6 +4984,7 @@ broken-packages: - prime # failure in job https://hydra.nixos.org/build/233197550 at 2023-09-02 - primes-type # failure in job https://hydra.nixos.org/build/233258302 at 2023-09-02 - primitive-checked # failure in job https://hydra.nixos.org/build/233211674 at 2023-09-02 + - primitive-containers # failure in job https://hydra.nixos.org/build/307521213 at 2025-09-19 - primitive-convenience # failure in job https://hydra.nixos.org/build/233223846 at 2023-09-02 - primitive-foreign # failure in job https://hydra.nixos.org/build/233247413 at 2023-09-02 - primitive-indexed # failure in job https://hydra.nixos.org/build/233245884 at 2023-09-02 @@ -4857,6 +5016,7 @@ broken-packages: - procex # failure in job https://hydra.nixos.org/build/295096282 at 2025-04-22 - procrastinating-variable # failure in job https://hydra.nixos.org/build/233229350 at 2023-09-02 - procstat # failure in job https://hydra.nixos.org/build/233256320 at 2023-09-02 + - prodapi # failure in job https://hydra.nixos.org/build/307611251 at 2025-09-19 - prodapi-proxy # failure in job https://hydra.nixos.org/build/295096290 at 2025-04-22 - prodapi-userauth # failure in job https://hydra.nixos.org/build/295096314 at 2025-04-22 - prof-flamegraph # failure in job https://hydra.nixos.org/build/233254675 at 2023-09-02 @@ -4908,6 +5068,7 @@ broken-packages: - psx # failure in job https://hydra.nixos.org/build/233199666 at 2023-09-02 - ptera-core # failure in job https://hydra.nixos.org/build/295096340 at 2025-04-22 - PTQ # failure in job https://hydra.nixos.org/build/233202571 at 2023-09-02 + - ptr-peeker # failure in job https://hydra.nixos.org/build/307521316 at 2025-09-19 - pub # failure in job https://hydra.nixos.org/build/233255415 at 2023-09-02 - publicsuffix # failure in job https://hydra.nixos.org/build/233241572 at 2023-09-02 - publicsuffixlistcreate # failure in job https://hydra.nixos.org/build/233251430 at 2023-09-02 @@ -4937,6 +5098,7 @@ broken-packages: - putlenses # failure in job https://hydra.nixos.org/build/233197372 at 2023-09-02 - puzzle-draw # failure in job https://hydra.nixos.org/build/233204953 at 2023-09-02 - pvector # failure in job https://hydra.nixos.org/build/233217965 at 2023-09-02 + - pvss # failure in job https://hydra.nixos.org/build/307521319 at 2025-09-19 - pyffi # failure in job https://hydra.nixos.org/build/233260156 at 2023-09-02 - pyfi # failure in job https://hydra.nixos.org/build/233214389 at 2023-09-02 - python-pickle # failure in job https://hydra.nixos.org/build/233230321 at 2023-09-02 @@ -4957,10 +5119,10 @@ broken-packages: - qsem # failure in job https://hydra.nixos.org/build/295096373 at 2025-04-22 - qt # failure in job https://hydra.nixos.org/build/233248869 at 2023-09-02 - QuadEdge # failure in job https://hydra.nixos.org/build/233249144 at 2023-09-02 - - quadratic-irrational # failure in job https://hydra.nixos.org/build/295096381 at 2025-04-22 - QuadTree # failure in job https://hydra.nixos.org/build/233234922 at 2023-09-02 - qualified-imports-plugin # failure in job https://hydra.nixos.org/build/233234707 at 2023-09-02 - quandl-api # failure in job https://hydra.nixos.org/build/233219173 at 2023-09-02 + - quantification # failure in job https://hydra.nixos.org/build/307521331 at 2025-09-19 - quantum-arrow # failure in job https://hydra.nixos.org/build/233219576 at 2023-09-02 - quantum-random # failure in job https://hydra.nixos.org/build/295096421 at 2025-04-22 - quarantimer # failure in job https://hydra.nixos.org/build/233598108 at 2023-09-02 @@ -4979,6 +5141,7 @@ broken-packages: - quickcheck-property-monad # failure in job https://hydra.nixos.org/build/233228775 at 2023-09-02 - quickcheck-rematch # failure in job https://hydra.nixos.org/build/233205449 at 2023-09-02 - quickcheck-report # failure in job https://hydra.nixos.org/build/233214523 at 2023-09-02 + - quickcheck-state-machine # failure in job https://hydra.nixos.org/build/307611262 at 2025-09-19 - quickcheck-state-machine-distributed # failure in job https://hydra.nixos.org/build/295096422 at 2025-04-22 - quickcheck-webdriver # failure in job https://hydra.nixos.org/build/233228000 at 2023-09-02 - QuickCheckVariant # failure in job https://hydra.nixos.org/build/233239276 at 2023-09-02 @@ -4994,6 +5157,7 @@ broken-packages: - quiver # failure in job https://hydra.nixos.org/build/233230395 at 2023-09-02 - quokka # failure in job https://hydra.nixos.org/build/233196347 at 2023-09-02 - quoridor-hs # failure in job https://hydra.nixos.org/build/233217459 at 2023-09-02 + - quotet # failure in job https://hydra.nixos.org/build/307521359 at 2025-09-19 - r-glpk-phonetic-languages-ukrainian-durations # failure in job https://hydra.nixos.org/build/253703155 at 2024-03-31 - R-pandoc # failure in job https://hydra.nixos.org/build/233192114 at 2023-09-02 - RabbitMQ # failure in job https://hydra.nixos.org/build/233222087 at 2023-09-02 @@ -5015,6 +5179,7 @@ broken-packages: - random-derive # failure in job https://hydra.nixos.org/build/233222005 at 2023-09-02 - random-eff # failure in job https://hydra.nixos.org/build/233255496 at 2023-09-02 - random-fu-multivariate # failure in job https://hydra.nixos.org/build/252715951 at 2024-03-16 + - random-mhs # failure in job https://hydra.nixos.org/build/307521383 at 2025-09-19 - random-source # failure in job https://hydra.nixos.org/build/233254664 at 2023-09-02 - random-stream # failure in job https://hydra.nixos.org/build/233240384 at 2023-09-02 - random-string # failure in job https://hydra.nixos.org/build/233223504 at 2023-09-02 @@ -5022,15 +5187,18 @@ broken-packages: - Range # failure in job https://hydra.nixos.org/build/233235824 at 2023-09-02 - rangemin # failure in job https://hydra.nixos.org/build/233244031 at 2023-09-02 - rank-product # failure in job https://hydra.nixos.org/build/233239589 at 2023-09-02 + - rapid # failure in job https://hydra.nixos.org/build/307521428 at 2025-09-19 - rapid-term # failure in job https://hydra.nixos.org/build/233251731 at 2023-09-02 - Rasenschach # failure in job https://hydra.nixos.org/build/234445901 at 2023-09-13 - rating-chgk-info # failure in job https://hydra.nixos.org/build/233598034 at 2023-09-02 - rational-list # failure in job https://hydra.nixos.org/build/233197144 at 2023-09-02 - rattle # failure in job https://hydra.nixos.org/build/233234335 at 2023-09-02 - rattletrap # failure in job https://hydra.nixos.org/build/233206840 at 2023-09-02 + - Rattus # failure in job https://hydra.nixos.org/build/307516167 at 2025-09-19 - rawlock # failure in job https://hydra.nixos.org/build/299186718 at 2025-06-23 - rawr # fails to build after unbreaking ghc-datasize at 2025-01-19 - raylib-imgui # failure in job https://hydra.nixos.org/build/233222471 at 2023-09-02 + - raytrace # failure in job https://hydra.nixos.org/build/307611266 at 2025-09-19 - raz # failure in job https://hydra.nixos.org/build/233218482 at 2023-09-02 - rbst # failure in job https://hydra.nixos.org/build/233238184 at 2023-09-02 - rclient # failure in job https://hydra.nixos.org/build/233239290 at 2023-09-02 @@ -5060,12 +5228,15 @@ broken-packages: - reasonable-lens # failure in job https://hydra.nixos.org/build/233233111 at 2023-09-02 - rec-smallarray # failure in job https://hydra.nixos.org/build/233258592 at 2023-09-02 - record # failure in job https://hydra.nixos.org/build/233242406 at 2023-09-02 + - record-dot-preprocessor # failure in job https://hydra.nixos.org/build/307521455 at 2025-09-19 - record-encode # failure in job https://hydra.nixos.org/build/233216156 at 2023-09-02 + - record-impl # failure in job https://hydra.nixos.org/build/307521439 at 2025-09-19 - record-wrangler # failure in job https://hydra.nixos.org/build/233212838 at 2023-09-02 - records # failure in job https://hydra.nixos.org/build/233254822 at 2023-09-02 - recursive-line-count # failure in job https://hydra.nixos.org/build/252736942 at 2024-03-16 - recursors # failure in job https://hydra.nixos.org/build/233234451 at 2023-09-02 - redis-hs # failure in job https://hydra.nixos.org/build/233191943 at 2023-09-02 + - redis-schema # failure in job https://hydra.nixos.org/build/307611277 at 2025-09-19 - redis-simple # failure in job https://hydra.nixos.org/build/233200379 at 2023-09-02 - Redmine # failure in job https://hydra.nixos.org/build/233250398 at 2023-09-02 - reduce-equations # failure in job https://hydra.nixos.org/build/270034373 at 2024-08-19 @@ -5077,6 +5248,7 @@ broken-packages: - ref-mtl # failure in job https://hydra.nixos.org/build/233260152 at 2023-09-02 - refcount # failure in job https://hydra.nixos.org/build/233236697 at 2023-09-02 - Referees # failure in job https://hydra.nixos.org/build/233213892 at 2023-09-02 + - reference-counting # failure in job https://hydra.nixos.org/build/307521488 at 2025-09-19 - references # failure in job https://hydra.nixos.org/build/233197836 at 2023-09-02 - refined-http-api-data # failure in job https://hydra.nixos.org/build/233231753 at 2023-09-02 - refined-with # failure in job https://hydra.nixos.org/build/233258564 at 2023-09-02 @@ -5094,11 +5266,12 @@ broken-packages: - reflex-dom-svg # failure in job https://hydra.nixos.org/build/233193544 at 2023-09-02 - reflex-dynamic-containers # failure in job https://hydra.nixos.org/build/295096540 at 2025-04-22 - reflex-external-ref # failure in job https://hydra.nixos.org/build/233215834 at 2023-09-02 + - reflex-gi-gtk # failure in job https://hydra.nixos.org/build/307611276 at 2025-09-19 - reflex-jsx # failure in job https://hydra.nixos.org/build/233207137 at 2023-09-02 - reflex-orphans # failure in job https://hydra.nixos.org/build/233249128 at 2023-09-02 + - reflex-sdl2 # failure in job https://hydra.nixos.org/build/307521569 at 2025-09-19 - reflex-transformers # failure in job https://hydra.nixos.org/build/233243647 at 2023-09-02 - reflex-vty # failure in job https://hydra.nixos.org/build/295096544 at 2025-04-22 - - reform # failure in job https://hydra.nixos.org/build/252717808 at 2024-03-16 - reform-hamlet # failure in job https://hydra.nixos.org/build/233230013 at 2023-09-02 - reform-hsp # failure in job https://hydra.nixos.org/build/233228737 at 2023-09-02 - reform-lucid # failure in job https://hydra.nixos.org/build/233257636 at 2023-09-02 @@ -5107,6 +5280,7 @@ broken-packages: - refty # failure in job https://hydra.nixos.org/build/233215083 at 2023-09-02 - reg-alloc # failure in job https://hydra.nixos.org/build/233195081 at 2023-09-02 - regex-dfa # failure in job https://hydra.nixos.org/build/233242994 at 2023-09-02 + - regex-do # failure in job https://hydra.nixos.org/build/307521538 at 2025-09-19 - regex-generator # failure in job https://hydra.nixos.org/build/233239502 at 2023-09-02 - regex-parsec # failure in job https://hydra.nixos.org/build/233223781 at 2023-09-02 - regex-pcre2 # failure in job https://hydra.nixos.org/build/295096563 at 2025-04-22 @@ -5142,6 +5316,7 @@ broken-packages: - relocant # failure in job https://hydra.nixos.org/build/295096588 at 2025-04-22 - remark # failure in job https://hydra.nixos.org/build/233240981 at 2023-09-02 - remarks # failure in job https://hydra.nixos.org/build/233256889 at 2023-09-02 + - rematch-text # failure in job https://hydra.nixos.org/build/307521518 at 2025-09-19 - remote # failure in job https://hydra.nixos.org/build/233220714 at 2023-09-02 - remote-debugger # failure in job https://hydra.nixos.org/build/233199491 at 2023-09-02 - remote-monad # failure in job https://hydra.nixos.org/build/233247733 at 2023-09-02 @@ -5167,8 +5342,6 @@ broken-packages: - request # failure in job https://hydra.nixos.org/build/233256702 at 2023-09-02 - request-monad # failure in job https://hydra.nixos.org/build/233204896 at 2023-09-02 - require # failure in job https://hydra.nixos.org/build/233203170 at 2023-09-02 - - requirements # failure in job https://hydra.nixos.org/build/252711740 at 2024-03-16 - - rere # failure in job https://hydra.nixos.org/build/295096658 at 2025-04-22 - rescue # failure in job https://hydra.nixos.org/build/233230073 at 2023-09-02 - reservoir # failure in job https://hydra.nixos.org/build/233194430 at 2023-09-02 - resolve # failure in job https://hydra.nixos.org/build/233224070 at 2023-09-02 @@ -5186,6 +5359,7 @@ broken-packages: - resumable-exceptions # failure in job https://hydra.nixos.org/build/233206560 at 2023-09-02 - rethinkdb # failure in job https://hydra.nixos.org/build/233211172 at 2023-09-02 - rethinkdb-client-driver # failure in job https://hydra.nixos.org/build/233216583 at 2023-09-02 + - retrie # failure in job https://hydra.nixos.org/build/307521572 at 2025-09-19 - retroclash-lib # failure in job https://hydra.nixos.org/build/295096644 at 2025-04-22 - retry-effectful # failure in job https://hydra.nixos.org/build/295096646 at 2025-04-22 - retryer # failure in job https://hydra.nixos.org/build/233193427 at 2023-09-02 @@ -5208,7 +5382,6 @@ broken-packages: - rigel-viz # failure in job https://hydra.nixos.org/build/233251060 at 2023-09-02 - ring-buffers # failure in job https://hydra.nixos.org/build/233259860 at 2023-09-02 - rings # failure in job https://hydra.nixos.org/build/252730924 at 2024-03-16 - - risc386 # failure in job https://hydra.nixos.org/build/295096662 at 2025-04-22 - riscv-isa # failure in job https://hydra.nixos.org/build/233192811 at 2023-09-02 - risk-weaver # failure in job https://hydra.nixos.org/build/295096664 at 2025-04-22 - rison # failure in job https://hydra.nixos.org/build/233231694 at 2023-09-02 @@ -5221,6 +5394,7 @@ broken-packages: - rle # failure in job https://hydra.nixos.org/build/233238229 at 2023-09-02 - rlglue # failure in job https://hydra.nixos.org/build/233222786 at 2023-09-02 - RLP # failure in job https://hydra.nixos.org/build/233222770 at 2023-09-02 + - rme-what4 # failure in job https://hydra.nixos.org/build/307611281 at 2025-09-19 - robin # failure in job https://hydra.nixos.org/build/233205010 at 2023-09-02 - robots-txt # failure in job https://hydra.nixos.org/build/233243090 at 2023-09-02 - roc-cluster # failure in job https://hydra.nixos.org/build/233202517 at 2023-09-02 @@ -5250,11 +5424,11 @@ broken-packages: - rrule # failure in job https://hydra.nixos.org/build/233259470 at 2023-09-02 - rsi-break # failure in job https://hydra.nixos.org/build/245788743 at 2024-01-07 - rspp # failure in job https://hydra.nixos.org/build/233236691 at 2023-09-02 + - rss-conduit # failure in job https://hydra.nixos.org/build/307611286 at 2025-09-19 - rss2irc # failure in job https://hydra.nixos.org/build/233196081 at 2023-09-02 - rstream # failure in job https://hydra.nixos.org/build/233249587 at 2023-09-02 - RtMidi # failure in job https://hydra.nixos.org/build/233241377 at 2023-09-02 - rtnetlink # failure in job https://hydra.nixos.org/build/233198783 at 2023-09-02 - - rtorrent-rpc # failure in job https://hydra.nixos.org/build/233202187 at 2023-09-02 - rtorrent-state # failure in job https://hydra.nixos.org/build/233216983 at 2023-09-02 - rts-loader # failure in job https://hydra.nixos.org/build/233226464 at 2023-09-02 - rubberband # failure in job https://hydra.nixos.org/build/233191496 at 2023-09-02 @@ -5262,6 +5436,7 @@ broken-packages: - ruby-qq # failure in job https://hydra.nixos.org/build/233259084 at 2023-09-02 - ruff # failure in job https://hydra.nixos.org/build/233200285 at 2023-09-02 - ruin # failure in job https://hydra.nixos.org/build/233247866 at 2023-09-02 + - run-haskell-module # failure in job https://hydra.nixos.org/build/307521638 at 2025-09-19 - runhs # failure in job https://hydra.nixos.org/build/233193983 at 2023-09-02 - runmany # failure in job https://hydra.nixos.org/build/233241476 at 2023-09-02 - runtime-instances # failure in job https://hydra.nixos.org/build/233217985 at 2023-09-02 @@ -5274,6 +5449,7 @@ broken-packages: - safe-access # failure in job https://hydra.nixos.org/build/252736917 at 2024-03-16 - safe-buffer-monad # failure in job https://hydra.nixos.org/build/233192108 at 2023-09-02 - safe-coerce # failure in job https://hydra.nixos.org/build/233244289 at 2023-09-02 + - safe-decimal # failure in job https://hydra.nixos.org/build/307521644 at 2025-09-19 - safe-exceptions-checked # failure in job https://hydra.nixos.org/build/252717135 at 2024-03-16 - safe-freeze # failure in job https://hydra.nixos.org/build/233230451 at 2023-09-02 - safe-globals # failure in job https://hydra.nixos.org/build/233201910 at 2023-09-02 @@ -5298,6 +5474,7 @@ broken-packages: - sandwich-contexts # failure in job https://hydra.nixos.org/build/282178661 at 2024-12-23 - sarasvati # failure in job https://hydra.nixos.org/build/233208235 at 2023-09-02 - sat # failure in job https://hydra.nixos.org/build/233225713 at 2023-09-02 + - sat-simple # failure in job https://hydra.nixos.org/build/307521671 at 2025-09-19 - satchmo-backends # failure in job https://hydra.nixos.org/build/233228506 at 2023-09-02 - satchmo-minisat # failure in job https://hydra.nixos.org/build/233229585 at 2023-09-02 - Saturnin # failure in job https://hydra.nixos.org/build/233227938 at 2023-09-02 @@ -5333,6 +5510,7 @@ broken-packages: - scrapbook-core # failure in job https://hydra.nixos.org/build/233222406 at 2023-09-02 - scrape-changes # failure in job https://hydra.nixos.org/build/233225890 at 2023-09-02 - ScratchFs # failure in job https://hydra.nixos.org/build/233257558 at 2023-09-02 + - screenshot-to-clipboard # failure in job https://hydra.nixos.org/build/307611311 at 2025-09-19 - script-monad # failure in job https://hydra.nixos.org/build/233221600 at 2023-09-02 - scrobble # failure in job https://hydra.nixos.org/build/233252277 at 2023-09-02 - scroll-list # failure in job https://hydra.nixos.org/build/233217737 at 2023-09-02 @@ -5363,6 +5541,7 @@ broken-packages: - SecureHash-SHA3 # failure in job https://hydra.nixos.org/build/233216866 at 2023-09-02 - secureUDP # failure in job https://hydra.nixos.org/build/233215410 at 2023-09-02 - SegmentTree # failure in job https://hydra.nixos.org/build/233216161 at 2023-09-02 + - selda # failure in job https://hydra.nixos.org/build/307521709 at 2025-09-19 - selda-postgresql # failure in job https://hydra.nixos.org/build/245539286 at 2024-01-02 - selectors # failure in job https://hydra.nixos.org/build/233227433 at 2023-09-02 - selenium # failure in job https://hydra.nixos.org/build/233214276 at 2023-09-02 @@ -5386,7 +5565,7 @@ broken-packages: - SeqAlign # failure in job https://hydra.nixos.org/build/233214595 at 2023-09-02 - sequent-core # failure in job https://hydra.nixos.org/build/233202838 at 2023-09-02 - sequential-index # failure in job https://hydra.nixos.org/build/233228686 at 2023-09-02 - - serdoc-core # failure in job https://hydra.nixos.org/build/252726252 at 2024-03-16 + - sequitur # failure in job https://hydra.nixos.org/build/307521764 at 2025-09-19 - serf # failure in job https://hydra.nixos.org/build/233251981 at 2023-09-02 - serial # failure in job https://hydra.nixos.org/build/252729356 at 2024-03-16 - serialize-instances # failure in job https://hydra.nixos.org/build/233239330 at 2023-09-02 @@ -5404,13 +5583,13 @@ broken-packages: - servant-docs-simple # failure in job https://hydra.nixos.org/build/233237374 at 2023-09-02 - servant-ekg # failure in job https://hydra.nixos.org/build/295096851 at 2025-04-22 - servant-errors # failure in job https://hydra.nixos.org/build/233239712 at 2023-09-02 - - servant-event-stream # failure in job https://hydra.nixos.org/build/302806100 at 2025-07-27 - servant-gdp # failure in job https://hydra.nixos.org/build/233191664 at 2023-09-02 - servant-generate # failure in job https://hydra.nixos.org/build/233199452 at 2023-09-02 - servant-generic # failure in job https://hydra.nixos.org/build/233211338 at 2023-09-02 - servant-github # failure in job https://hydra.nixos.org/build/233231566 at 2023-09-02 - servant-github-webhook # failure in job https://hydra.nixos.org/build/233234237 at 2023-09-02 - servant-htmx # failure in job https://hydra.nixos.org/build/233214786 at 2023-09-02 + - servant-http-streams # failure in job https://hydra.nixos.org/build/307611341 at 2025-09-19 - servant-http2-client # failure in job https://hydra.nixos.org/build/260189694 at 2024-05-19 - servant-iCalendar # failure in job https://hydra.nixos.org/build/233200493 at 2023-09-02 - servant-jquery # failure in job https://hydra.nixos.org/build/233238796 at 2023-09-02 @@ -5426,10 +5605,14 @@ broken-packages: - servant-proto-lens # failure in job https://hydra.nixos.org/build/252736298 at 2024-03-16 - servant-purescript # failure in job https://hydra.nixos.org/build/233598080 at 2023-09-02 - servant-py # failure in job https://hydra.nixos.org/build/233598104 at 2023-09-02 + - servant-quickcheck # failure in job https://hydra.nixos.org/build/307611328 at 2025-09-19 - servant-reflex # failure in job https://hydra.nixos.org/build/233212870 at 2023-09-02 - servant-router # failure in job https://hydra.nixos.org/build/233246333 at 2023-09-02 + - servant-routes # failure in job https://hydra.nixos.org/build/307521826 at 2025-09-19 - servant-ruby # failure in job https://hydra.nixos.org/build/233598144 at 2023-09-02 - servant-scotty # failure in job https://hydra.nixos.org/build/233248472 at 2023-09-02 + - servant-seo # failure in job https://hydra.nixos.org/build/307611335 at 2025-09-19 + - servant-serf # failure in job https://hydra.nixos.org/build/307521802 at 2025-09-19 - servant-smsc-ru # failure in job https://hydra.nixos.org/build/233239620 at 2023-09-02 - servant-stache # failure in job https://hydra.nixos.org/build/233204547 at 2023-09-02 - servant-static-th # failure in job https://hydra.nixos.org/build/233191735 at 2023-09-02 @@ -5446,7 +5629,6 @@ broken-packages: - servant-zeppelin # failure in job https://hydra.nixos.org/build/233230172 at 2023-09-02 - server-generic # failure in job https://hydra.nixos.org/build/233194042 at 2023-09-02 - serverless-haskell # failure in job https://hydra.nixos.org/build/233201987 at 2023-09-02 - - serversession-backend-acid-state # failure in job https://hydra.nixos.org/build/233202796 at 2023-09-02 - serversession-backend-persistent # failure in job https://hydra.nixos.org/build/233239242 at 2023-09-02 - services # failure in job https://hydra.nixos.org/build/233249029 at 2023-09-02 - serviette # failure in job https://hydra.nixos.org/build/233226968 at 2023-09-02 @@ -5454,6 +5636,7 @@ broken-packages: - SessionLogger # failure in job https://hydra.nixos.org/build/233235790 at 2023-09-02 - sessions # failure in job https://hydra.nixos.org/build/233214614 at 2023-09-02 - sessiontypes # failure in job https://hydra.nixos.org/build/233224975 at 2023-09-02 + - set-monad # failure in job https://hydra.nixos.org/build/307521878 at 2025-09-19 - set-of # failure in job https://hydra.nixos.org/build/233202960 at 2023-09-02 - set-with # failure in job https://hydra.nixos.org/build/233209870 at 2023-09-02 - setdown # failure in job https://hydra.nixos.org/build/241521053 at 2023-12-03 @@ -5470,6 +5653,7 @@ broken-packages: - sfmt # failure in job https://hydra.nixos.org/build/233260124 at 2023-09-02 - SG # failure in job https://hydra.nixos.org/build/233228780 at 2023-09-02 - sgd # failure in job https://hydra.nixos.org/build/233240302 at 2023-09-02 + - sgf # failure in job https://hydra.nixos.org/build/307521831 at 2025-09-19 - SGplus # failure in job https://hydra.nixos.org/build/233227890 at 2023-09-02 - sh2md # failure in job https://hydra.nixos.org/build/233254149 at 2023-09-02 - sha-streams # failure in job https://hydra.nixos.org/build/233257983 at 2023-09-02 @@ -5519,6 +5703,7 @@ broken-packages: - signable-haskell-protoc # failure in job https://hydra.nixos.org/build/252734188 at 2024-03-16 - signal-messaging-dbus # failure in job https://hydra.nixos.org/build/252723131 at 2024-03-16 - signature # failure in job https://hydra.nixos.org/build/301391178 at 2025-07-01 + - signed-multiset # failure in job https://hydra.nixos.org/build/307521906 at 2025-09-19 - significant-figures # failure in job https://hydra.nixos.org/build/295097004 at 2025-04-22 - silero-vad # failure in job https://hydra.nixos.org/build/295096978 at 2025-04-22 - simd # failure in job https://hydra.nixos.org/build/233206642 at 2023-09-02 @@ -5564,6 +5749,7 @@ broken-packages: - simplexmq # failure in job https://hydra.nixos.org/build/233223717 at 2023-09-02 - simplistic-generics # failure in job https://hydra.nixos.org/build/233217412 at 2023-09-02 - sindre # horribly outdated (X11 interface changed a lot) + - single-tuple # failure in job https://hydra.nixos.org/build/307521928 at 2025-09-19 - singlethongs # failure in job https://hydra.nixos.org/build/233202756 at 2023-09-02 - singleton-dict # failure in job https://hydra.nixos.org/build/233245405 at 2023-09-02 - singleton-typelits # failure in job https://hydra.nixos.org/build/233250877 at 2023-09-02 @@ -5579,15 +5765,13 @@ broken-packages: - sized-grid # failure in job https://hydra.nixos.org/build/233239056 at 2023-09-02 - sized-types # failure in job https://hydra.nixos.org/build/233244977 at 2023-09-02 - sized-vector # failure in job https://hydra.nixos.org/build/233227779 at 2023-09-02 + - sizes # failure in job https://hydra.nixos.org/build/307521947 at 2025-09-19 - sjsp # failure in job https://hydra.nixos.org/build/233225141 at 2023-09-02 - SJW # failure in job https://hydra.nixos.org/build/233209689 at 2023-09-02 - skeletal-set # failure in job https://hydra.nixos.org/build/233254711 at 2023-09-02 - - skeletest # failure in job https://hydra.nixos.org/build/270083279 at 2024-08-31 - skell # failure in job https://hydra.nixos.org/build/233245484 at 2023-09-02 - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02 - sketch-frp-copilot # copilot >=4.3 && <4.4, - - skew-list # failure in job https://hydra.nixos.org/build/295097034 at 2025-04-22 - - skews # time out in job https://hydra.nixos.org/build/302806286 at 2025-07-27 - skopedate # failure in job https://hydra.nixos.org/build/233220634 at 2023-09-02 - skulk # failure in job https://hydra.nixos.org/build/233258672 at 2023-09-02 - skylighting-extensions # failure in job https://hydra.nixos.org/build/233221387 at 2023-09-02 @@ -5626,14 +5810,13 @@ broken-packages: - smsaero # failure in job https://hydra.nixos.org/build/233215880 at 2023-09-02 - smt-lib # failure in job https://hydra.nixos.org/build/233208443 at 2023-09-02 - SmtLib # failure in job https://hydra.nixos.org/build/233213271 at 2023-09-02 - - smtlib-backends-process # failure in job https://hydra.nixos.org/build/233209223 at 2023-09-02 - - smtlib-backends-tests # failure in job https://hydra.nixos.org/build/295097081 at 2025-04-22 - smtlib2 # failure in job https://hydra.nixos.org/build/233251831 at 2023-09-02 - smtp-mail-ng # failure in job https://hydra.nixos.org/build/233220094 at 2023-09-02 - SMTPClient # failure in job https://hydra.nixos.org/build/233247599 at 2023-09-02 - smtps-gmail # failure in job https://hydra.nixos.org/build/233191933 at 2023-09-02 - smuggler # failure in job https://hydra.nixos.org/build/233199288 at 2023-09-02 - smuggler2 # failure in job https://hydra.nixos.org/build/233233932 at 2023-09-02 + - snack # failure in job https://hydra.nixos.org/build/307521984 at 2025-09-19 - snail # failure in job https://hydra.nixos.org/build/252731890 at 2024-03-16 - snake # failure in job https://hydra.nixos.org/build/233242029 at 2023-09-02 - snake-game # failure in job https://hydra.nixos.org/build/234441416 at 2023-09-13 @@ -5646,12 +5829,14 @@ broken-packages: - snap-predicates # failure in job https://hydra.nixos.org/build/233244904 at 2023-09-02 - snap-routes # failure in job https://hydra.nixos.org/build/252718562 at 2024-03-16 - snap-stream # failure in job https://hydra.nixos.org/build/233237969 at 2023-09-02 + - snap-templates # failure in job https://hydra.nixos.org/build/307522010 at 2025-09-19 - snap-testing # failure in job https://hydra.nixos.org/build/252736070 at 2024-03-16 - snap-web-routes # failure in job https://hydra.nixos.org/build/295097108 at 2025-04-22 - snaplet-acid-state # failure in job https://hydra.nixos.org/build/252733993 at 2024-03-16 - snaplet-amqp # failure in job https://hydra.nixos.org/build/252722868 at 2024-03-16 - snaplet-coffee # failure in job https://hydra.nixos.org/build/252712879 at 2024-03-16 - snaplet-css-min # failure in job https://hydra.nixos.org/build/252718032 at 2024-03-16 + - snaplet-customauth # failure in job https://hydra.nixos.org/build/307611386 at 2025-09-19 - snaplet-environments # failure in job https://hydra.nixos.org/build/252718495 at 2024-03-16 - snaplet-hslogger # failure in job https://hydra.nixos.org/build/252719175 at 2024-03-16 - snaplet-influxdb # failure in job https://hydra.nixos.org/build/252717331 at 2024-03-16 @@ -5667,11 +5852,11 @@ broken-packages: - snaplet-sqlite-simple # failure in job https://hydra.nixos.org/build/252738602 at 2024-03-16 - snaplet-typed-sessions # failure in job https://hydra.nixos.org/build/252724459 at 2024-03-16 - snappy-conduit # failure in job https://hydra.nixos.org/build/233196865 at 2023-09-02 + - snappy-hs # failure in job https://hydra.nixos.org/build/307522028 at 2025-09-19 - snelstart-import # failure in job https://hydra.nixos.org/build/295097114 at 2025-04-22 - SNet # failure in job https://hydra.nixos.org/build/233225638 at 2023-09-02 - snipcheck # failure in job https://hydra.nixos.org/build/233214417 at 2023-09-02 - snorkels # failure in job https://hydra.nixos.org/build/233229705 at 2023-09-02 - - snowchecked # failure in job https://hydra.nixos.org/build/233258191 at 2023-09-02 - snowtify # failure in job https://hydra.nixos.org/build/233215099 at 2023-09-02 - soap # failure in job https://hydra.nixos.org/build/295097136 at 2025-04-22 - socket-activation # failure in job https://hydra.nixos.org/build/233258011 at 2023-09-02 @@ -5694,6 +5879,7 @@ broken-packages: - sorting # failure in job https://hydra.nixos.org/build/233214204 at 2023-09-02 - sorty # failure in job https://hydra.nixos.org/build/233211118 at 2023-09-02 - souffle-haskell # failure in job https://hydra.nixos.org/build/233229472 at 2023-09-02 + - sound-change # failure in job https://hydra.nixos.org/build/307522022 at 2025-09-19 - source-constraints # failure in job https://hydra.nixos.org/build/233254750 at 2023-09-02 - sousit # failure in job https://hydra.nixos.org/build/233204067 at 2023-09-02 - soyuz # failure in job https://hydra.nixos.org/build/233196903 at 2023-09-02 @@ -5708,9 +5894,11 @@ broken-packages: - sparse-merkle-trees # failure in job https://hydra.nixos.org/build/233251228 at 2023-09-02 - sparse-tensor # failure in job https://hydra.nixos.org/build/233224869 at 2023-09-02 - sparsecheck # failure in job https://hydra.nixos.org/build/233253454 at 2023-09-02 + - spatial-rotations # failure in job https://hydra.nixos.org/build/307522058 at 2025-09-19 - SpatialMath # failure in job https://hydra.nixos.org/build/237243985 at 2023-10-21 - special-functors # failure in job https://hydra.nixos.org/build/233215268 at 2023-09-02 - special-keys # failure in job https://hydra.nixos.org/build/233191988 at 2023-09-02 + - species # failure in job https://hydra.nixos.org/build/307522048 at 2025-09-19 - spectacle # failure in job https://hydra.nixos.org/build/233207488 at 2023-09-02 - speculation # failure in job https://hydra.nixos.org/build/233211559 at 2023-09-02 - sphinx-cli # failure in job https://hydra.nixos.org/build/295097187 at 2025-04-22 @@ -5740,10 +5928,10 @@ broken-packages: - sqlcipher # failure in job https://hydra.nixos.org/build/233259217 at 2023-09-02 - sqlcli # failure in job https://hydra.nixos.org/build/252719841 at 2024-03-16 - sqlite # failure in job https://hydra.nixos.org/build/233215839 at 2023-09-02 - - sqlite-easy # failure in job https://hydra.nixos.org/build/252728831 at 2024-03-16 - sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02 - sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02 - sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21 + - sr-extra # failure in job https://hydra.nixos.org/build/307611393 at 2025-09-19 - srcinst # failure in job https://hydra.nixos.org/build/233221356 at 2023-09-02 - srt # failure in job https://hydra.nixos.org/build/295097165 at 2025-04-22 - srt-attoparsec # failure in job https://hydra.nixos.org/build/233248456 at 2023-09-02 @@ -5776,6 +5964,7 @@ broken-packages: - stackage-types # failure in job https://hydra.nixos.org/build/233239995 at 2023-09-02 - stackcollapse-ghc # failure in job https://hydra.nixos.org/build/233250775 at 2023-09-02 - staged-gg # failure in job https://hydra.nixos.org/build/233252183 at 2023-09-02 + - stagen # failure in job https://hydra.nixos.org/build/307611396 at 2025-09-19 - standalone-derive-topdown # failure in job https://hydra.nixos.org/build/233252467 at 2023-09-02 - standalone-haddock # failure in job https://hydra.nixos.org/build/233254339 at 2023-09-02 - starling # failure in job https://hydra.nixos.org/build/233255468 at 2023-09-02 @@ -5817,10 +6006,10 @@ broken-packages: - stm-lifted # failure in job https://hydra.nixos.org/build/252726872 at 2024-03-16 - stm-promise # failure in job https://hydra.nixos.org/build/233204293 at 2023-09-02 - stm-stats # failure in job https://hydra.nixos.org/build/233214914 at 2023-09-02 + - stm-tlist # failure in job https://hydra.nixos.org/build/307522184 at 2025-09-19 - stochastic # failure in job https://hydra.nixos.org/build/233242019 at 2023-09-02 - Stomp # failure in job https://hydra.nixos.org/build/233252583 at 2023-09-02 - stooq-api # failure in job https://hydra.nixos.org/build/233200858 at 2023-09-02 - - stopwatch # failure in job https://hydra.nixos.org/build/252716540 at 2024-03-16 - storable # failure in job https://hydra.nixos.org/build/233228880 at 2023-09-02 - storable-offset # failure in job https://hydra.nixos.org/build/233242993 at 2023-09-02 - storable-static-array # failure in job https://hydra.nixos.org/build/233222724 at 2023-09-02 @@ -5851,26 +6040,27 @@ broken-packages: - streamly-binary # failure in job https://hydra.nixos.org/build/233240602 at 2023-09-02 - streamly-cassava # failure in job https://hydra.nixos.org/build/233237843 at 2023-09-02 - streamly-examples # failure in job https://hydra.nixos.org/build/252721153 at 2024-03-16 + - streamly-fsevents # failure in job https://hydra.nixos.org/build/307611411 at 2025-09-19 - streamly-lmdb # failure in job https://hydra.nixos.org/build/252731414 at 2024-03-16 - streamly-lz4 # failure in job https://hydra.nixos.org/build/233219321 at 2023-09-02 - streamly-posix # failure in job https://hydra.nixos.org/build/233194023 at 2023-09-02 + - streamly-process # failure in job https://hydra.nixos.org/build/307522202 at 2025-09-19 - streamly-statistics # failure in job https://hydra.nixos.org/build/252719066 at 2024-03-16 + - streamly-text # failure in job https://hydra.nixos.org/build/307611413 at 2025-09-19 - streamly-zip # failure in job https://hydra.nixos.org/build/295097269 at 2025-04-22 - streamproc # failure in job https://hydra.nixos.org/build/233196179 at 2023-09-02 - streamt # failure in job https://hydra.nixos.org/build/252724093 at 2024-03-16 - strelka-core # failure in job https://hydra.nixos.org/build/233218594 at 2023-09-02 + - strict-containers # failure in job https://hydra.nixos.org/build/307522197 at 2025-09-19 - strict-ghc-plugin # failure in job https://hydra.nixos.org/build/233246830 at 2023-09-02 - - strict-impl-params # failure in job https://hydra.nixos.org/build/252732248 at 2024-03-16 - strict-io # failure in job https://hydra.nixos.org/build/295097302 at 2025-04-22 - strict-mvar # failure in job https://hydra.nixos.org/build/273459853 at 2024-10-01 - strict-stm # failure in job https://hydra.nixos.org/build/273449297 at 2024-10-01 - strict-tuple-lens # failure in job https://hydra.nixos.org/build/233194548 at 2023-09-02 - strict-writer # failure in job https://hydra.nixos.org/build/252725649 at 2024-03-16 - StrictBench # failure in job https://hydra.nixos.org/build/233259575 at 2023-09-02 - - StrictCheck # failure in job https://hydra.nixos.org/build/233214649 at 2023-09-02 - strictly # failure in job https://hydra.nixos.org/build/233197142 at 2023-09-02 - string-conv-tests # failure in job https://hydra.nixos.org/build/233242710 at 2023-09-02 - - string-fromto # failure in job https://hydra.nixos.org/build/233223157 at 2023-09-02 - string-interpreter # failure in job https://hydra.nixos.org/build/252739490 at 2024-03-16 - string-isos # failure in job https://hydra.nixos.org/build/233252917 at 2023-09-02 - string-quote # failure in job https://hydra.nixos.org/build/233259595 at 2023-09-02 @@ -5880,10 +6070,10 @@ broken-packages: - stripe-core # failure in job https://hydra.nixos.org/build/233215702 at 2023-09-02 - stripe-hs # failure in job https://hydra.nixos.org/build/233203500 at 2023-09-02 - stripe-scotty # failure in job https://hydra.nixos.org/build/252711778 at 2024-03-16 - - stripe-wreq # failure in job https://hydra.nixos.org/build/295097337 at 2025-04-22 - strong-path # failure in job https://hydra.nixos.org/build/233225171 at 2023-09-02 - struct-inspector # failure in job https://hydra.nixos.org/build/252739623 at 2024-03-16 - structural-traversal # failure in job https://hydra.nixos.org/build/233235730 at 2023-09-02 + - structured # failure in job https://hydra.nixos.org/build/307522227 at 2025-09-19 - structured-cli # failure in job https://hydra.nixos.org/build/252734924 at 2024-03-16 - structures # failure in job https://hydra.nixos.org/build/233206488 at 2023-09-02 - stt # failure in job https://hydra.nixos.org/build/233233101 at 2023-09-02 @@ -5928,6 +6118,7 @@ broken-packages: - SVD2HS # failure in job https://hydra.nixos.org/build/233248575 at 2023-09-02 - svfactor # failure in job https://hydra.nixos.org/build/233256743 at 2023-09-02 - svg-builder-fork # failure in job https://hydra.nixos.org/build/233224461 at 2023-09-02 + - svgsym # failure in job https://hydra.nixos.org/build/307522251 at 2025-09-19 - svgutils # failure in job https://hydra.nixos.org/build/233193438 at 2023-09-02 - svm-light-utils # failure in job https://hydra.nixos.org/build/233219138 at 2023-09-02 - svm-simple # failure in job https://hydra.nixos.org/build/233235871 at 2023-09-02 @@ -5958,6 +6149,7 @@ broken-packages: - symantic-xml # failure in job https://hydra.nixos.org/build/233230860 at 2023-09-02 - symbolic-link # failure in job https://hydra.nixos.org/build/233255331 at 2023-09-02 - symengine # failure in job https://hydra.nixos.org/build/233203977 at 2023-09-02 + - symtegration # failure in job https://hydra.nixos.org/build/307522286 at 2025-09-19 - sync # failure in job https://hydra.nixos.org/build/233254114 at 2023-09-02 - sync-mht # failure in job https://hydra.nixos.org/build/233236022 at 2023-09-02 - syntactic # failure in job https://hydra.nixos.org/build/233210123 at 2023-09-02 @@ -5991,7 +6183,6 @@ broken-packages: - tag-bits # failure in job https://hydra.nixos.org/build/233245196 at 2023-09-02 - tagged-exception-core # failure in job https://hydra.nixos.org/build/233227946 at 2023-09-02 - tagged-timers # failure in job https://hydra.nixos.org/build/233238738 at 2023-09-02 - - taggy-lens # failure in job https://hydra.nixos.org/build/233253920 at 2023-09-02 - taglib-api # failure in job https://hydra.nixos.org/build/233259216 at 2023-09-02 - tagshare # failure in job https://hydra.nixos.org/build/252729876 at 2024-03-16 - tagsoup-ht # failure in job https://hydra.nixos.org/build/233233672 at 2023-09-02 @@ -6017,6 +6208,7 @@ broken-packages: - taskell # depends on old version of brick - TaskMonad # failure in job https://hydra.nixos.org/build/233219257 at 2023-09-02 - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02 + - tasty-checklist # failure in job https://hydra.nixos.org/build/307522349 at 2025-09-19 - tasty-fail-fast # failure in job https://hydra.nixos.org/build/233200040 at 2023-09-02 - tasty-grading-system # failure in job https://hydra.nixos.org/build/236673021 at 2023-10-04 - tasty-hedgehog-coverage # failure in job https://hydra.nixos.org/build/233231332 at 2023-09-02 @@ -6047,6 +6239,7 @@ broken-packages: - telegram-types # failure in job https://hydra.nixos.org/build/233598183 at 2023-09-02 - telegraph # failure in job https://hydra.nixos.org/build/233213772 at 2023-09-02 - teleport # failure in job https://hydra.nixos.org/build/233194305 at 2023-09-02 + - telescope # failure in job https://hydra.nixos.org/build/307611441 at 2025-09-19 - teleshell # failure in job https://hydra.nixos.org/build/233225954 at 2023-09-02 - tell # failure in job https://hydra.nixos.org/build/252712899 at 2024-03-16 - tellbot # failure in job https://hydra.nixos.org/build/233200225 at 2023-09-02 @@ -6075,6 +6268,7 @@ broken-packages: - term-rewriting # failure in job https://hydra.nixos.org/build/295097520 at 2025-04-22 - termbox-bindings # failure in job https://hydra.nixos.org/build/233257579 at 2023-09-02 - termination-combinators # failure in job https://hydra.nixos.org/build/233202329 at 2023-09-02 + - termonad # failure in job https://hydra.nixos.org/build/307611443 at 2025-09-19 - termplot # failure in job https://hydra.nixos.org/build/233245692 at 2023-09-02 - terntup # failure in job https://hydra.nixos.org/build/233203746 at 2023-09-02 - tersmu # failure in job https://hydra.nixos.org/build/233253842 at 2023-09-02 @@ -6092,7 +6286,6 @@ broken-packages: - test-shouldbe # failure in job https://hydra.nixos.org/build/233209475 at 2023-09-02 - testCom # failure in job https://hydra.nixos.org/build/233210118 at 2023-09-02 - TestExplode # failure in job https://hydra.nixos.org/build/233207327 at 2023-09-02 - - testing-tensor # failure in job https://hydra.nixos.org/build/295097635 at 2025-04-22 - testloop # failure in job https://hydra.nixos.org/build/233206527 at 2023-09-02 - testpack # failure in job https://hydra.nixos.org/build/233194859 at 2023-09-02 - testpattern # failure in job https://hydra.nixos.org/build/233225860 at 2023-09-02 @@ -6106,7 +6299,6 @@ broken-packages: - text-and-plots # failure in job https://hydra.nixos.org/build/233205250 at 2023-09-02 - text-ascii # failure in job https://hydra.nixos.org/build/233247653 at 2023-09-02 - text-builder-lawful-conversions # failure in job https://hydra.nixos.org/build/299141710 at 2025-06-23 - - text-builder-time # failure in job https://hydra.nixos.org/build/295458315 at 2025-05-02 - text-compression # failure in job https://hydra.nixos.org/build/233202733 at 2023-09-02 - text-containers # failure in job https://hydra.nixos.org/build/233253948 at 2023-09-02 - text-format # failure in job https://hydra.nixos.org/build/295097568 at 2025-04-22 @@ -6122,6 +6314,7 @@ broken-packages: - text-register-machine # failure in job https://hydra.nixos.org/build/233239758 at 2023-09-02 - text-render # failure in job https://hydra.nixos.org/build/252713121 at 2024-03-16 - text-replace # failure in job https://hydra.nixos.org/build/252727577 at 2024-03-16 + - text-rope-zipper # failure in job https://hydra.nixos.org/build/307522479 at 2025-09-19 - text-stream-decode # failure in job https://hydra.nixos.org/build/233237533 at 2023-09-02 - text-trie # failure in job https://hydra.nixos.org/build/233231841 at 2023-09-02 - text-utf7 # failure in job https://hydra.nixos.org/build/233254420 at 2023-09-02 @@ -6181,6 +6374,7 @@ broken-packages: - tie-knot # failure in job https://hydra.nixos.org/build/233201321 at 2023-09-02 - tiempo # failure in job https://hydra.nixos.org/build/233250728 at 2023-09-02 - tiger # failure in job https://hydra.nixos.org/build/233249333 at 2023-09-02 + - tigerbeetle-hs # failure in job https://hydra.nixos.org/build/307611449 at 2025-09-19 - TigerHash # failure in job https://hydra.nixos.org/build/233208162 at 2023-09-02 - tightrope # failure in job https://hydra.nixos.org/build/233215237 at 2023-09-02 - tikzsd # failure in job https://hydra.nixos.org/build/233224431 at 2023-09-02 @@ -6225,6 +6419,7 @@ broken-packages: - TLT # failure in job https://hydra.nixos.org/build/233193495 at 2023-09-02 - tmp-postgres # failure in job https://hydra.nixos.org/build/252731301 at 2024-03-16 - tmp-proc-example # failure in job https://hydra.nixos.org/build/233223028 at 2023-09-02 + - tmp-proc-zipkin # failure in job https://hydra.nixos.org/build/307611459 at 2025-09-19 - to-haskell # failure in job https://hydra.nixos.org/build/233195321 at 2023-09-02 - to-string-class # failure in job https://hydra.nixos.org/build/233244336 at 2023-09-02 - tofromxml # failure in job https://hydra.nixos.org/build/233257072 at 2023-09-02 @@ -6237,6 +6432,7 @@ broken-packages: - tokyocabinet-haskell # failure in job https://hydra.nixos.org/build/233193492 at 2023-09-02 - tokyotyrant-haskell # failure in job https://hydra.nixos.org/build/233256228 at 2023-09-02 - toml # failure in job https://hydra.nixos.org/build/233223844 at 2023-09-02 + - toml-test-drivers # failure in job https://hydra.nixos.org/build/307522616 at 2025-09-19 - tonalude # failure in job https://hydra.nixos.org/build/233204874 at 2023-09-02 - tonaparser # failure in job https://hydra.nixos.org/build/233224261 at 2023-09-02 - toodles # failure in job https://hydra.nixos.org/build/233245612 at 2023-09-02 @@ -6290,9 +6486,9 @@ broken-packages: - treap # failure in job https://hydra.nixos.org/build/233248089 at 2023-09-02 - tree-monad # failure in job https://hydra.nixos.org/build/233212246 at 2023-09-02 - tree-render-text # failure in job https://hydra.nixos.org/build/233240817 at 2023-09-02 + - tree-traversals # failure in job https://hydra.nixos.org/build/307522668 at 2025-09-19 - treemap # failure in job https://hydra.nixos.org/build/233207063 at 2023-09-02 - treemap-html # failure in job https://hydra.nixos.org/build/233248494 at 2023-09-02 - - TreeStructures # failure in job https://hydra.nixos.org/build/233213685 at 2023-09-02 - tremulous-query # failure in job https://hydra.nixos.org/build/233200947 at 2023-09-02 - TrendGraph # failure in job https://hydra.nixos.org/build/233258651 at 2023-09-02 - trhsx # failure in job https://hydra.nixos.org/build/233231297 at 2023-09-02 @@ -6303,6 +6499,7 @@ broken-packages: - trivia # failure in job https://hydra.nixos.org/build/233234176 at 2023-09-02 - tropical # failure in job https://hydra.nixos.org/build/233212835 at 2023-09-02 - tropical-geometry # failure in job https://hydra.nixos.org/build/234465815 at 2023-09-13 + - true-name # failure in job https://hydra.nixos.org/build/307522676 at 2025-09-19 - trust-chain # failure in job https://hydra.nixos.org/build/233252622 at 2023-09-02 - tsession # failure in job https://hydra.nixos.org/build/233259005 at 2023-09-02 - tslib # failure in job https://hydra.nixos.org/build/233225813 at 2023-09-02 @@ -6328,6 +6525,7 @@ broken-packages: - tweak # failure in job https://hydra.nixos.org/build/233211020 at 2023-09-02 - twee # failure in job https://hydra.nixos.org/build/302807024 at 2025-07-27 - twentefp-websockets # failure in job https://hydra.nixos.org/build/233207022 at 2023-09-02 + - twentyseven # failure in job https://hydra.nixos.org/build/307522761 at 2025-09-19 - twhs # failure in job https://hydra.nixos.org/build/233201182 at 2023-09-02 - twilio # failure in job https://hydra.nixos.org/build/233199959 at 2023-09-02 - twiml # failure in job https://hydra.nixos.org/build/233219327 at 2023-09-02 @@ -6373,8 +6571,8 @@ broken-packages: - typed-admin # failure in job https://hydra.nixos.org/build/296063081 at 2025-05-02 - typed-digits # failure in job https://hydra.nixos.org/build/233198266 at 2023-09-02 - typed-encoding # failure in job https://hydra.nixos.org/build/233208093 at 2023-09-02 - - typed-fsm # failure in job https://hydra.nixos.org/build/269663128 at 2024-08-19 - typed-process-effectful # failure in job https://hydra.nixos.org/build/236684332 at 2023-10-04 + - typed-protocols # failure in job https://hydra.nixos.org/build/307522744 at 2025-09-19 - typed-session # failure in job https://hydra.nixos.org/build/270089993 at 2024-08-31 - typed-session-state-algorithm # failure in job https://hydra.nixos.org/build/273462641 at 2024-10-01 - typed-spreadsheet # failure in job https://hydra.nixos.org/build/233248967 at 2023-09-02 @@ -6387,9 +6585,11 @@ broken-packages: - typelevel-tensor # failure in job https://hydra.nixos.org/build/233190827 at 2023-09-02 - typeparams # failure in job https://hydra.nixos.org/build/233192078 at 2023-09-02 - types-compat # failure in job https://hydra.nixos.org/build/233249850 at 2023-09-02 + - typist # failure in job https://hydra.nixos.org/build/307522793 at 2025-09-19 - typograffiti # failure in job https://hydra.nixos.org/build/233195076 at 2023-09-02 - typson-core # failure in job https://hydra.nixos.org/build/233257835 at 2023-09-02 - tyro # failure in job https://hydra.nixos.org/build/233200171 at 2023-09-02 + - tztime # failure in job https://hydra.nixos.org/build/307522763 at 2025-09-19 - uacpid # failure in job https://hydra.nixos.org/build/252734266 at 2024-03-16 - uAgda # failure in job https://hydra.nixos.org/build/233252487 at 2023-09-02 - uberlast # failure in job https://hydra.nixos.org/build/233233074 at 2023-09-02 @@ -6402,14 +6602,14 @@ broken-packages: - ueberzug # failure in job https://hydra.nixos.org/build/233205559 at 2023-09-02 - uhexdump # failure in job https://hydra.nixos.org/build/233209647 at 2023-09-02 - uhttpc # failure in job https://hydra.nixos.org/build/233232481 at 2023-09-02 - - ui # failure in job https://hydra.nixos.org/build/295097879 at 2025-04-22 - ui-command # failure in job https://hydra.nixos.org/build/233223762 at 2023-09-02 - ukrainian-phonetics-basic-array # failure in job https://hydra.nixos.org/build/275136298 at 2024-10-21 - ukrainian-phonetics-basic-array-bytestring # failure in job https://hydra.nixos.org/build/233228787 at 2023-09-02 + - uku # failure in job https://hydra.nixos.org/build/307522781 at 2025-09-19 + - ulid-tight # failure in job https://hydra.nixos.org/build/307522774 at 2025-09-19 - unac-bindings # failure in job https://hydra.nixos.org/build/236686523 at 2023-10-04 - unamb-custom # failure in job https://hydra.nixos.org/build/233197458 at 2023-09-02 - unbeliever # failure in job https://hydra.nixos.org/build/233221256 at 2023-09-02 - - unbound-generics-unify # failure in job https://hydra.nixos.org/build/283205015 at 2024-12-31 - unbounded-delays-units # failure in job https://hydra.nixos.org/build/233200989 at 2023-09-02 - unboxed # failure in job https://hydra.nixos.org/build/233219555 at 2023-09-02 - unboxed-containers # failure in job https://hydra.nixos.org/build/233200384 at 2023-09-02 @@ -6418,8 +6618,11 @@ broken-packages: - unescaping-print # failure in job https://hydra.nixos.org/build/252736030 at 2024-03-16 - unfix-binders # failure in job https://hydra.nixos.org/build/233259262 at 2023-09-02 - unfoldable # failure in job https://hydra.nixos.org/build/252721990 at 2024-03-16 + - unfork # failure in job https://hydra.nixos.org/build/307522805 at 2025-09-19 - unfree # failure in job https://hydra.nixos.org/build/295097900 at 2025-04-22 - uni-util # failure in job https://hydra.nixos.org/build/233219676 at 2023-09-02 + - unicode-data-names # failure in job https://hydra.nixos.org/build/307611472 at 2025-09-19 + - unicode-data-security # failure in job https://hydra.nixos.org/build/307611471 at 2025-09-19 - unicode-general-category # failure in job https://hydra.nixos.org/build/233250572 at 2023-09-02 - unicode-prelude # failure in job https://hydra.nixos.org/build/233241723 at 2023-09-02 - unicode-symbols # failure in job https://hydra.nixos.org/build/233241639 at 2023-09-02 @@ -6440,11 +6643,13 @@ broken-packages: - universal-binary # failure in job https://hydra.nixos.org/build/233240583 at 2023-09-02 - universe-instances-base # failure in job https://hydra.nixos.org/build/233197845 at 2023-09-02 - universe-instances-trans # failure in job https://hydra.nixos.org/build/233235623 at 2023-09-02 + - universum # failure in job https://hydra.nixos.org/build/307522842 at 2025-09-19 - unix-handle # failure in job https://hydra.nixos.org/build/233233273 at 2023-09-02 - unix-memory # failure in job https://hydra.nixos.org/build/252735802 at 2024-03-16 - unix-process-conduit # failure in job https://hydra.nixos.org/build/233191509 at 2023-09-02 - unix-recursive # failure in job https://hydra.nixos.org/build/233194742 at 2023-09-02 - unix-simple # failure in job https://hydra.nixos.org/build/295097959 at 2025-04-22 + - unleash-client-haskell-core # failure in job https://hydra.nixos.org/build/307522857 at 2025-09-19 - unlift # failure in job https://hydra.nixos.org/build/233217875 at 2023-09-02 - unlift-stm # failure in job https://hydra.nixos.org/build/233202388 at 2023-09-02 - unlifted-list # failure in job https://hydra.nixos.org/build/233205239 at 2023-09-02 @@ -6500,8 +6705,10 @@ broken-packages: - util-primitive # failure in job https://hydra.nixos.org/build/233258861 at 2023-09-02 - uu-cco # failure in job https://hydra.nixos.org/build/233259027 at 2023-09-02 - uuagc-bootstrap # failure in job https://hydra.nixos.org/build/233254123 at 2023-09-02 + - uuagc-cabal # failure in job https://hydra.nixos.org/build/307522924 at 2025-09-19 - uuagc-diagrams # failure in job https://hydra.nixos.org/build/233247645 at 2023-09-02 - uuid-aeson # failure in job https://hydra.nixos.org/build/233219695 at 2023-09-02 + - uusi # failure in job https://hydra.nixos.org/build/307522902 at 2025-09-19 - uvector # failure in job https://hydra.nixos.org/build/233224782 at 2023-09-02 - uxadt # failure in job https://hydra.nixos.org/build/233254972 at 2023-09-02 - vabal-lib # failure in job https://hydra.nixos.org/build/233198776 at 2023-09-02 @@ -6523,6 +6730,7 @@ broken-packages: - variables # failure in job https://hydra.nixos.org/build/233237682 at 2023-09-02 - variadic # failure in job https://hydra.nixos.org/build/233209743 at 2023-09-02 - variation # failure in job https://hydra.nixos.org/build/233240549 at 2023-09-02 + - vary # failure in job https://hydra.nixos.org/build/307522948 at 2025-09-19 - vault-tool # failure in job https://hydra.nixos.org/build/233217613 at 2023-09-02 - vcache # failure in job https://hydra.nixos.org/build/233250925 at 2023-09-02 - vcatt # failure in job https://hydra.nixos.org/build/233236976 at 2023-09-02 @@ -6555,6 +6763,7 @@ broken-packages: - verilog # failure in job https://hydra.nixos.org/build/233211999 at 2023-09-02 - verismith # failure in job https://hydra.nixos.org/build/299186734 at 2025-06-23 - versioning # failure in job https://hydra.nixos.org/build/233205892 at 2023-09-02 + - vext # failure in job https://hydra.nixos.org/build/307522988 at 2025-09-19 - vformat # failure in job https://hydra.nixos.org/build/233222840 at 2023-09-02 - vgrep # failure in job https://hydra.nixos.org/build/233210982 at 2023-09-02 - vhd # failure in job https://hydra.nixos.org/build/233230229 at 2023-09-02 @@ -6589,10 +6798,11 @@ broken-packages: - vty-examples # failure in job https://hydra.nixos.org/build/233235872 at 2023-09-02 - vty-menu # failure in job https://hydra.nixos.org/build/233232391 at 2023-09-02 - vty-ui # failure in job https://hydra.nixos.org/build/233200900 at 2023-09-02 + - vulkan-utils # failure in job https://hydra.nixos.org/build/307522991 at 2025-09-19 - wacom-daemon # failure in job https://hydra.nixos.org/build/233213077 at 2023-09-02 - waddle # failure in job https://hydra.nixos.org/build/233239973 at 2023-09-02 - - wai-app-file-cgi # failure in job https://hydra.nixos.org/build/252733772 at 2024-03-16 - wai-control # failure in job https://hydra.nixos.org/build/295098171 at 2025-04-22 + - wai-env # failure in job https://hydra.nixos.org/build/307523102 at 2025-09-19 - wai-git-http # failure in job https://hydra.nixos.org/build/233191513 at 2023-09-02 - wai-graceful # failure in job https://hydra.nixos.org/build/233243180 at 2023-09-02 - wai-handler-devel # failure in job https://hydra.nixos.org/build/233226033 at 2023-09-02 @@ -6645,16 +6855,15 @@ broken-packages: - wavefront # failure in job https://hydra.nixos.org/build/233248071 at 2023-09-02 - wavefront-obj # failure in job https://hydra.nixos.org/build/233200951 at 2023-09-02 - weak-bag # failure in job https://hydra.nixos.org/build/233198097 at 2023-09-02 + - WeakSets # failure in job https://hydra.nixos.org/build/307516240 at 2025-09-19 - Weather # failure in job https://hydra.nixos.org/build/233197934 at 2023-09-02 - weather-api # failure in job https://hydra.nixos.org/build/233202108 at 2023-09-02 - web-css # failure in job https://hydra.nixos.org/build/233195455 at 2023-09-02 - web-encodings # failure in job https://hydra.nixos.org/build/233199718 at 2023-09-02 - - web-inv-route # failure in job https://hydra.nixos.org/build/252728701 at 2024-03-16 - web-output # failure in job https://hydra.nixos.org/build/233191936 at 2023-09-02 - web-page # failure in job https://hydra.nixos.org/build/233243334 at 2023-09-02 - web-plugins # failure in job https://hydra.nixos.org/build/233207596 at 2023-09-02 - web-push # failure in job https://hydra.nixos.org/build/233206721 at 2023-09-02 - - web-routes-happstack # failure in job https://hydra.nixos.org/build/295098198 at 2025-04-22 - web-routes-quasi # failure in job https://hydra.nixos.org/build/233222454 at 2023-09-02 - web-routes-transformers # failure in job https://hydra.nixos.org/build/233256428 at 2023-09-02 - web-routes-wai # failure in job https://hydra.nixos.org/build/295098187 at 2025-04-22 @@ -6669,12 +6878,13 @@ broken-packages: - webcrank # failure in job https://hydra.nixos.org/build/233212229 at 2023-09-02 - webcrank-dispatch # failure in job https://hydra.nixos.org/build/233209191 at 2023-09-02 - webdriver-angular # failure in job https://hydra.nixos.org/build/233212981 at 2023-09-02 - - webdriver-precore # failure in job https://hydra.nixos.org/build/296523789 at 2025-05-14 - webdriver-snoy # failure in job https://hydra.nixos.org/build/233251068 at 2023-09-02 - WeberLogic # failure in job https://hydra.nixos.org/build/233209283 at 2023-09-02 - webfinger-client # failure in job https://hydra.nixos.org/build/233252528 at 2023-09-02 + - webkit # failure in job https://hydra.nixos.org/build/307523072 at 2025-09-19 - webkit-javascriptcore # failure in job https://hydra.nixos.org/build/233208424 at 2023-09-02 - webkitgtk3 # failure in job https://hydra.nixos.org/build/233215712 at 2023-09-02 + - webkitgtk3-javascriptcore # failure in job https://hydra.nixos.org/build/307523066 at 2025-09-19 - webmention # failure in job https://hydra.nixos.org/build/233208899 at 2023-09-02 - Webrexp # failure in job https://hydra.nixos.org/build/233212376 at 2023-09-02 - webshow # failure in job https://hydra.nixos.org/build/233243842 at 2023-09-02 @@ -6696,13 +6906,14 @@ broken-packages: - wide-word-instances # failure in job https://hydra.nixos.org/build/233253084 at 2023-09-02 - wikicfp-scraper # failure in job https://hydra.nixos.org/build/233198432 at 2023-09-02 - WikimediaParser # failure in job https://hydra.nixos.org/build/233242393 at 2023-09-02 + - wild-bind-indicator # failure in job https://hydra.nixos.org/build/307611565 at 2025-09-19 - willow # failure in job https://hydra.nixos.org/build/233215807 at 2023-09-02 - windns # failure in job https://hydra.nixos.org/build/233242724 at 2023-09-02 - - winerror # failure in job https://hydra.nixos.org/build/233196100 at 2023-09-02 - wire-streams # failure in job https://hydra.nixos.org/build/299186735 at 2025-06-23 - wireguard-hs # failure in job https://hydra.nixos.org/build/233218722 at 2023-09-02 - wires # failure in job https://hydra.nixos.org/build/233192321 at 2023-09-02 - wiring # failure in job https://hydra.nixos.org/build/233191683 at 2023-09-02 + - with-location # failure in job https://hydra.nixos.org/build/307523118 at 2025-09-19 - witherable-class # failure in job https://hydra.nixos.org/build/295098236 at 2025-04-22 - witty # failure in job https://hydra.nixos.org/build/233194976 at 2023-09-02 - wkt # failure in job https://hydra.nixos.org/build/233220848 at 2023-09-02 @@ -6717,7 +6928,6 @@ broken-packages: - word16 # failure in job https://hydra.nixos.org/build/252737588 at 2024-03-16 - word24 # failure in job https://hydra.nixos.org/build/233259494 at 2023-09-02 - word2vec-model # failure in job https://hydra.nixos.org/build/233209500 at 2023-09-02 - - word8set # failure in job https://hydra.nixos.org/build/233246039 at 2023-09-02 - wordify # failure in job https://hydra.nixos.org/build/233229102 at 2023-09-02 - Wordlint # failure in job https://hydra.nixos.org/build/233233123 at 2023-09-02 - wordlist # failure in job https://hydra.nixos.org/build/233199456 at 2023-09-02 @@ -6757,6 +6967,7 @@ broken-packages: - wybor # failure in job https://hydra.nixos.org/build/252729784 at 2024-03-16 - X # failure in job https://hydra.nixos.org/build/233217783 at 2023-09-02 - x-dsp # failure in job https://hydra.nixos.org/build/233218091 at 2023-09-02 + - x-sum-type-boilerplate # failure in job https://hydra.nixos.org/build/307523148 at 2025-09-19 - X11-extras # failure in job https://hydra.nixos.org/build/233226031 at 2023-09-02 - X11-rm # failure in job https://hydra.nixos.org/build/233242806 at 2023-09-02 - X11-xdamage # failure in job https://hydra.nixos.org/build/233194342 at 2023-09-02 @@ -6779,7 +6990,6 @@ broken-packages: - xkbcommon # failure in job https://hydra.nixos.org/build/233237797 at 2023-09-02 - xkcd # failure in job https://hydra.nixos.org/build/233211690 at 2023-09-02 - xleb # failure in job https://hydra.nixos.org/build/233232785 at 2023-09-02 - - xls # failure in job https://hydra.nixos.org/build/233201430 at 2023-09-02 - xlsior # failure in job https://hydra.nixos.org/build/233199562 at 2023-09-02 - xlsx-tabular # failure in job https://hydra.nixos.org/build/233199137 at 2023-09-02 - xlsx-templater # failure in job https://hydra.nixos.org/build/233245940 at 2023-09-02 @@ -6787,6 +6997,7 @@ broken-packages: - xml-conduit-parse # failure in job https://hydra.nixos.org/build/233200360 at 2023-09-02 - xml-conduit-selectors # failure in job https://hydra.nixos.org/build/233223331 at 2023-09-02 - xml-conduit-stylist # failure in job https://hydra.nixos.org/build/233226507 at 2023-09-02 + - xml-conduit-writer # failure in job https://hydra.nixos.org/build/307611574 at 2025-09-19 - xml-extractors # failure in job https://hydra.nixos.org/build/252718569 at 2024-03-16 - xml-html-conduit-lens # failure in job https://hydra.nixos.org/build/233238471 at 2023-09-02 - xml-indexed-cursor # failure in job https://hydra.nixos.org/build/295098303 at 2025-04-22 @@ -6796,8 +7007,10 @@ broken-packages: - xml-prettify # failure in job https://hydra.nixos.org/build/233225974 at 2023-09-02 - xml-prettify-text # failure in job https://hydra.nixos.org/build/233202586 at 2023-09-02 - xml-query # failure in job https://hydra.nixos.org/build/233194795 at 2023-09-02 + - xml-syntax # failure in job https://hydra.nixos.org/build/307611595 at 2025-09-19 - xml-to-json # failure in job https://hydra.nixos.org/build/233197489 at 2023-09-02 - xml-tydom-core # failure in job https://hydra.nixos.org/build/233206253 at 2023-09-02 + - xml-types-content # failure in job https://hydra.nixos.org/build/307611585 at 2025-09-19 - xml-verify # failure in job https://hydra.nixos.org/build/233237302 at 2023-09-02 - xml2json # failure in job https://hydra.nixos.org/build/233254605 at 2023-09-02 - XmlHtmlWriter # failure in job https://hydra.nixos.org/build/233213597 at 2023-09-02 @@ -6819,7 +7032,7 @@ broken-packages: - xslt # failure in job https://hydra.nixos.org/build/233225636 at 2023-09-02 - xtea # failure in job https://hydra.nixos.org/build/282175333 at 2024-12-23 - xxhash # failure in job https://hydra.nixos.org/build/233240335 at 2023-09-02 - - xxhash-ffi # failure in job https://hydra.nixos.org/build/295098345 at 2025-04-22 + - xz # failure in job https://hydra.nixos.org/build/307523211 at 2025-09-19 - y0l0bot # failure in job https://hydra.nixos.org/build/233212722 at 2023-09-02 - yabi-muno # failure in job https://hydra.nixos.org/build/233246871 at 2023-09-02 - yackage # failure in job https://hydra.nixos.org/build/233213393 at 2023-09-02 @@ -6843,6 +7056,8 @@ broken-packages: - yamlkeysdiff # failure in job https://hydra.nixos.org/build/233234710 at 2023-09-02 - yamlparse-applicative # failure in job https://hydra.nixos.org/build/252718434 at 2024-03-16 - YamlReference # failure in job https://hydra.nixos.org/build/233222700 at 2023-09-02 + - yamlscript # failure in job https://hydra.nixos.org/build/307523231 at 2025-09-19 + - yampa-canvas # failure in job https://hydra.nixos.org/build/307611616 at 2025-09-19 - yampa-glfw # failure in job https://hydra.nixos.org/build/233215695 at 2023-09-02 - yampa-gloss # failure in job https://hydra.nixos.org/build/295098349 at 2025-04-22 - yampa-glut # failure in job https://hydra.nixos.org/build/234458324 at 2023-09-13 @@ -6869,6 +7084,7 @@ broken-packages: - yesod-auth-bcryptdb # failure in job https://hydra.nixos.org/build/233209630 at 2023-09-02 - yesod-auth-deskcom # failure in job https://hydra.nixos.org/build/233230640 at 2023-09-02 - yesod-auth-fb # failure in job https://hydra.nixos.org/build/233224172 at 2023-09-02 + - yesod-auth-hashdb # failure in job https://hydra.nixos.org/build/307611599 at 2025-09-19 - yesod-auth-hmac-keccak # failure in job https://hydra.nixos.org/build/233224778 at 2023-09-02 - yesod-auth-kerberos # failure in job https://hydra.nixos.org/build/233245920 at 2023-09-02 - yesod-auth-ldap-mediocre # failure in job https://hydra.nixos.org/build/233195322 at 2023-09-02 @@ -6883,6 +7099,7 @@ broken-packages: - yesod-content-pdf # failure in job https://hydra.nixos.org/build/233210723 at 2023-09-02 - yesod-crud # failure in job https://hydra.nixos.org/build/233218383 at 2023-09-02 - yesod-crud-persist # failure in job https://hydra.nixos.org/build/233245131 at 2023-09-02 + - yesod-csp # failure in job https://hydra.nixos.org/build/307611592 at 2025-09-19 - yesod-datatables # failure in job https://hydra.nixos.org/build/233197763 at 2023-09-02 - yesod-dsl # failure in job https://hydra.nixos.org/build/233210879 at 2023-09-02 - yesod-fast-devel # failure in job https://hydra.nixos.org/build/233209381 at 2023-09-02 @@ -6896,6 +7113,7 @@ broken-packages: - yesod-katip # failure in job https://hydra.nixos.org/build/233236143 at 2023-09-02 - yesod-links # failure in job https://hydra.nixos.org/build/233257763 at 2023-09-02 - yesod-lucid # failure in job https://hydra.nixos.org/build/233231687 at 2023-09-02 + - yesod-media-simple # failure in job https://hydra.nixos.org/build/307611606 at 2025-09-19 - yesod-middleware-csp # failure in job https://hydra.nixos.org/build/295098382 at 2025-04-22 - yesod-paginate # failure in job https://hydra.nixos.org/build/233218563 at 2023-09-02 - yesod-pagination # failure in job https://hydra.nixos.org/build/233204022 at 2023-09-02 @@ -6930,6 +7148,7 @@ broken-packages: - yosys-rtl # failure in job https://hydra.nixos.org/build/269657756 at 2024-08-19 - yu-core # failure in job https://hydra.nixos.org/build/233202551 at 2023-09-02 - yu-tool # failure in job https://hydra.nixos.org/build/233216535 at 2023-09-02 + - yu-utils # failure in job https://hydra.nixos.org/build/307611648 at 2025-09-19 - yuiGrid # failure in job https://hydra.nixos.org/build/233223402 at 2023-09-02 - yxdb-utils # failure in job https://hydra.nixos.org/build/233210232 at 2023-09-02 - Z-Data # failure in job https://hydra.nixos.org/build/233256080 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 0f06aa5771721..e7250a42e6dbb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -25,20 +25,21 @@ # not work. # keep-sorted start skip_lines=1 case=no numeric=yes default-package-overrides: - - chs-cabal < 0.1.1.2 # Incompatible with Cabal < 3.12 - # 2024-12-23: last version to be compatible with Stackage LTS 22/23 (due to data-default) - - diagrams-input < 0.1.4 - - extensions < 0.1.0.2 # Incompatible with Cabal < 3.12, the newest extensions version is only needed on ghc 9.10 + - chs-cabal == 0.1.1.2 # matches Cabal 3.12 (GHC 9.10) + - extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10) # 2025-07-26: HLS doesn't support hiedb >= 0.7 yet - hiedb < 0.7 - # 2024-08-17: Stackage doesn't contain hnix-store-core >= 0.8 yet, so we need to restrict hnix-store-remote + # 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8 + # https://github.com/haskell-nix/hnix/pull/1112 + - hnix-store-core < 0.7 - hnix-store-remote < 0.7 - # 2025-01-17: need to match stackage version of hosc - - hsc3 < 0.21 - # 2024-12-31: last version that's compatible with GHC < 9.9 - - htree < 0.2.0.0 - # 2025-06-11: last version that supports pandoc == 3.6.* which is prescribed by LTS 23 - - pandoc-crossref < 0.3.20 + # 2025-08-03: need to match stackage version of hosc + - hsc3 >= 0.21 && < 0.22 + # liquidhaskell-boot 0.9.10.1.2 requires this specific version of liquid-fixpoint + - liquid-fixpoint == 0.9.6.3.2 + # liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10) + - liquidhaskell == 0.9.10.* + - liquidhaskell-boot == 0.9.10.* # keep-sorted end # keep-sorted start skip_lines=1 case=no numeric=yes @@ -47,16 +48,19 @@ extra-packages: - ansi-wl-pprint >= 0.6 && < 0.7 # 2025-07-07: used by gren <= 0.5.4 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - Cabal == 3.10.* - - Cabal == 3.12.* # version required for cabal-install and other packages + - Cabal == 3.12.* + - Cabal == 3.14.* + - Cabal == 3.16.* # version required for cabal-install and other packages + - cabal-add == 0.1 # 2025-09-09: Only needed for hls 2.11 can be removed once we are past it. - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal-syntax == 3.8.* # version required for ormolu and fourmolu on ghc 9.0 - Cabal-syntax == 3.10.* - - Cabal-syntax == 3.12.* # version required for cabal-install and other packages - - commonmark-pandoc < 0.2.3 # 2025-04-06: Needed for pandoc 3.6 - - extensions == 0.1.0.2 # 2024-10-20: for GHC 9.10/Cabal 3.12 + - Cabal-syntax == 3.12.* + - Cabal-syntax == 3.14.* + - Cabal-syntax == 3.16.* # version required for cabal-install and other packages + - extensions == 0.1.0.1 # 2025-09-21: needed for Cabal 3.10 (fourmolo/ormolu with ghc 9.8) - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - - fourmolu == 0.16.0.0 # 2025-01-27: for ghc 9.10 compat - - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 + - fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat - fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10 - ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2 - ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2 @@ -69,14 +73,16 @@ extra-packages: - ghc-lib == 9.10.* # 2024-12-30: preserve for GHC 9.10/ghc-tags 1.9 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 - ghc-lib-parser == 9.6.* # 2024-05-19: preserve for GHC 9.2, 9.4 - - ghc-lib-parser == 9.10.* # 2024-12-26: preserve for GHC 9.10 + - ghc-lib-parser == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8 - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0 - ghc-lib-parser-ex == 9.6.* # 2024-05-19: preserve for GHC 9.2, 9.4 - - ghc-lib-parser-ex == 9.10.* # 2024-12-26: preserve for 9.10 HLS + - ghc-lib-parser-ex == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* - ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.* - ghc-tags == 1.8.* # 2023-02-18: preserve for ghc-lib == 9.8.* + - ghc-typelits-natnormalise < 0.8 # 2025-09-15: Stackage is stuck at 0.7.10 - happy == 1.20.* # for ghc-lib-parser == 9.6.* + - hashable < 1.5 # 2025-07-30: hashable >= 1.5 requires GHC >= 9.6 - hasql < 1.7 # 2025-01-19: Needed for building postgrest - hasql-dynamic-statements < 0.3.1.6 # 2025-01-19: Needed for building postgrest - hasql-implicits < 0.2 # 2025-01-19: Needed for building postgrest @@ -84,16 +90,16 @@ extra-packages: - hasql-pool < 1.1 # 2025-01-19: Needed for building postgrest - hasql-transaction < 1.1.1 # 2025-01-19: Needed for building postgrest - hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6 - - hnix-store-core < 0.7 # 2023-12-11: required by hnix-store-remote 0.6 + - hlint == 3.8.* # 2025-09-21: needed for hls with ghc-lib-parser 9.8 + - hpack == 0.38.1 # 2025-09-18: to match exact version upstream stack-3.7.1 uses - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0 - language-javascript == 0.7.0.0 # required by purescript - - lsp < 2.5 # 2024-07-08: need for koka - - lsp == 2.1.* # 2024-02-28: need for dhall-lsp-server - - lsp-types == 2.1.* # 2024-02-28: need for dhall-lsp-server and koka - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* - ormolu == 0.5.2.0 # 2023-08-08: preserve for ghc 9.0 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - - ormolu == 0.7.7.0 # 2025-01-27: for ghc 9.10 compat + - ormolu == 0.7.4.0 # 2023-09-21: for ghc-lib-parser 9.8 compat + - os-string == 1.* # 2025-07-30: dummy package we need for pre os-string GHCs + - path == 0.9.5 # 2025-09-21: Pin for hls on ghc 9.4 - postgresql-binary < 0.14 # 2025-01-19: Needed for building postgrest - primitive-unlifted == 0.1.3.1 # 2024-03-16: preserve for ghc 9.2 - retrie < 1.2.0.0 # 2022-12-30: preserve for ghc < 9.2 @@ -102,10 +108,13 @@ extra-packages: - simple-get-opt < 0.5 # 2025-05-01: for crux-0.7.2 - stylish-haskell == 0.14.4.0 # 2022-09-19: preserve for ghc 9.0 - stylish-haskell == 0.14.5.0 # 2025-04-14: needed for hls with ghc-lib 9.6 + - stylish-haskell == 0.14.6.0 # 2025-09-21: needed for hls with ghc-lib 9.8 - stylish-haskell == 0.15.0.1 # 2025-04-14: needed for hls with ghc-lib 9.10 - tar == 0.6.0.0 # 2025-02-08: last version to not require os-string (which can't be built with GHC < 9.2) + - tar == 0.6.3.0 # 2025-08-17: last version to not require file-io and directory-ospath-streaming (for GHC < 9.6) + - text-builder < 1 # 2025-08-27: Needed for building postgrest + - text-builder-dev < 0.4 # 2025-08-27: Needed for building postgrest - text-metrics < 0.3.3 # 2025-02-08: >= 0.3.3 uses GHC2021 - - versions < 6 # 2024-04-22: required by spago-0.21 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* # keep-sorted end @@ -143,7 +152,6 @@ package-maintainers: - jsaddle-dom - jsaddle-hello - jsaddle-warp - - jsaddle-webkit2gtk - jsaddle-wkwebview - json-sop - large-generics @@ -177,6 +185,12 @@ package-maintainers: - BNFC-meta - alex-meta - happy-meta + - liquid-fixpoint + - liquidhaskell + - liquidhaskell-boot + - smtlib-backends + - smtlib-backends-process + - smtlib-backends-tests - vector-hashtables arturcygan: - hevm @@ -362,6 +376,8 @@ package-maintainers: - pdftotext - warp-systemd - amazonka + - libssh2 + - sitemap ncfavier: - Agda - irc-client @@ -501,6 +517,7 @@ package-maintainers: - regex-rure - jacinda - citeproc + - mighttpd2 # owothia - irc-client - chatter @@ -911,11 +928,17 @@ dont-distribute-packages: - yices-easy - yices-painless + # These packages don’t build because they use deprecated libsoup 2.4 versions. + - jsaddle-webkit2gtk + - gi-javascriptcore4 + - gi-soup2 + - gi-webkit2 + - webkit2gtk3-javascriptcore + # These packages don’t build because they use deprecated webkit versions. - diagrams-hsqml - dialog - ghcjs-dom-webkit - - gi-webkit - hsqml - hsqml-datamodel - hsqml-datamodel-vinyl @@ -925,7 +948,6 @@ dont-distribute-packages: - hsqml-demo-samples - hsqml-morris - hstorchat - - jsaddle-webkitgtk - jsc - lambdacat - manatee-all @@ -934,8 +956,6 @@ dont-distribute-packages: - markup-preview - spike - web-browser-in-haskell - - webkit - - webkitgtk3-javascriptcore - websnap # mesos was removed from nixpkgs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 16b83fc122c7e..8732dc0f3ce88 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 23.27 +# Stackage LTS 24.10 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -8,7 +8,7 @@ default-package-overrides: - AC-Angle ==1.0 - acc ==0.2.0.3 - ace ==0.6 - - acid-state ==0.16.1.3 + - acid-state ==0.16.1.4 - action-permutations ==0.0.0.1 - active ==0.2.1 - ad ==4.5.6 @@ -20,13 +20,13 @@ default-package-overrides: - aern2-real ==0.2.16.1 - aeson ==2.2.3.0 - aeson-attoparsec ==0.0.0 + - aeson-better-errors ==0.9.1.3 - aeson-casing ==0.2.0.0 - aeson-combinators ==0.1.2.1 - aeson-diff ==1.1.0.13 - - aeson-extra ==0.5.1.3 + - aeson-gadt-th ==0.2.5.4 - aeson-generic-compat ==0.0.2.0 - - aeson-jsonpath ==0.2.0.0 - - aeson-optics ==1.2.1 + - aeson-jsonpath ==0.3.0.2 - aeson-pretty ==0.8.10 - aeson-qq ==0.8.4 - aeson-schemas ==1.4.3.0 @@ -36,15 +36,19 @@ default-package-overrides: - aeson-warning-parser ==0.1.1 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.1 + - AesonBson ==0.4.1 + - aftovolio ==0.8.0.0 - agda2lagda ==0.2023.6.9 - agreeing ==0.2.2.0 - alarmclock ==0.7.0.7 - - alex ==3.5.3.0 + - alex ==3.5.4.0 - alex-meta ==0.3.0.13 - alex-tools ==0.6.1 + - alfred-margaret ==2.1.0.2 - algebra ==4.3.1 - algebraic-graphs ==0.7 - align-audio ==0.0.0.1 + - Allure ==0.11.0.0 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 - alsa-mixer ==0.3.0.1 @@ -54,13 +58,15 @@ default-package-overrides: - alternators ==1.0.0.0 - ALUT ==2.4.0.3 - amqp ==0.24.0 + - amqp-utils ==0.6.7.2 - annotated-exception ==0.3.0.4 - annotated-wl-pprint ==0.7.0 - - ansi-terminal ==1.1.2 + - ansi-terminal ==1.1.3 - ansi-terminal-game ==1.9.3.0 - - ansi-terminal-types ==1.1 + - ansi-terminal-types ==1.1.3 - ansi-wl-pprint ==1.0.2 - - ANum ==0.2.0.2 + - ansigraph ==0.3.0.5 + - ANum ==0.2.0.4 - aos-signature ==0.1.1 - ap-normalize ==0.1.0.1 - apecs ==0.9.6 @@ -72,17 +78,15 @@ default-package-overrides: - appendful-persistent ==0.1.0.1 - appendmap ==0.1.5 - apply-merge ==0.1.1.0 - - apply-refact ==0.14.0.0 - apportionment ==0.0.0.4 - approximate ==0.3.5 - approximate-equality ==1.1.0.2 - - arbor-lru-cache ==0.1.1.1 - - arithmoi ==0.13.1.0 + - arithmoi ==0.13.2.0 + - array-chunks ==0.1.4.2 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - ascii-char ==1.0.1.0 - - ascii-group ==1.0.0.17 - ascii-progress ==0.3.3.0 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -116,13 +120,13 @@ default-package-overrides: - authenticate ==1.3.5.2 - authenticate-oauth ==1.7 - auto-update ==0.2.6 - - autodocodec ==0.4.2.2 - - autodocodec-nix ==0.0.1.5 - - autodocodec-openapi3 ==0.2.1.4 + - autodocodec ==0.5.0.0 + - autodocodec-nix ==0.1.0.0 + - autodocodec-openapi3 ==0.3.0.1 - autodocodec-schema ==0.2.0.1 - - autodocodec-servant-multipart ==0.0.0.1 + - autodocodec-servant-multipart ==0.0.0.2 - autodocodec-swagger2 ==0.1.0.0 - - autodocodec-yaml ==0.4.0.1 + - autodocodec-yaml ==0.4.0.2 - autoexporter ==2.0.0.15 - automaton ==1.5 - avro ==0.6.2.1 @@ -135,11 +139,11 @@ default-package-overrides: - aws-xray-client-wai ==0.1.0.2 - backprop ==0.2.7.2 - backtracking ==0.1.0 - - bank-holiday-germany ==1.3.1.0 + - bank-holiday-germany ==2.1.0.1 - bank-holidays-england ==0.2.0.11 - barbies ==2.1.1.0 - - base-compat ==0.13.1 - - base-compat-batteries ==0.13.1 + - base-compat ==0.14.1 + - base-compat-batteries ==0.14.1 - base-orphans ==0.9.3 - base-prelude ==1.6.1.1 - base-unicode-symbols ==0.2.4.2 @@ -158,17 +162,18 @@ default-package-overrides: - battleship-combinatorics ==0.0.1 - bazel-runfiles ==0.12 - bbdb ==0.8 - - bcp47 ==0.2.0.6 - - bcp47-orphans ==0.1.0.6 + - bcp47 ==0.3.0.0 + - bcp47-orphans ==0.1.3.0 - bcrypt ==0.0.11 - beam-core ==0.10.4.0 - - beam-migrate ==0.5.3.1 - - beam-postgres ==0.5.4.2 - - beam-sqlite ==0.5.4.0 + - beam-migrate ==0.5.3.2 + - beam-postgres ==0.5.4.4 + - beam-sqlite ==0.5.4.1 - bech32 ==1.1.9 - bech32-th ==1.1.9 + - bench ==1.0.13 - bench-show ==0.3.2 - - benchpress ==0.2.2.25 + - benchpress ==0.2.3.0 - bencode ==0.6.1.1 - bencoding ==0.4.5.6 - benri-hspec ==0.1.0.3 @@ -182,15 +187,15 @@ default-package-overrides: - bin ==0.1.4 - binance-exports ==0.1.2.0 - binary-conduit ==1.3.1 - - binary-generic-combinators ==0.4.4.0 + - binary-generic-combinators ==0.4.4.1 - binary-ieee754 ==0.1.0.0 - binary-instances ==1.0.6 - binary-list ==1.1.1.2 - binary-orphans ==1.0.5 - binary-parser ==0.5.7.7 + - binary-parsers ==0.2.4.0 - binary-search ==2.0.0 - binary-shared ==0.8.3 - - binary-tagged ==0.3.1 - binaryen ==0.0.6.0 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.3.9.2 @@ -211,7 +216,7 @@ default-package-overrides: - blas-ffi ==0.1 - blas-hs ==0.1.1.0 - blaze-bootstrap ==0.1.0.1 - - blaze-builder ==0.4.3 + - blaze-builder ==0.4.4.1 - blaze-colonnade ==1.2.3.0 - blaze-html ==0.9.2.0 - blaze-markup ==0.8.3.0 @@ -220,18 +225,17 @@ default-package-overrides: - bloodhound ==0.23.0.1 - bloomfilter ==2.0.1.2 - bluefin ==0.0.16.0 - - bluefin-internal ==0.0.15.0 + - bluefin-internal ==0.1.0.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 - - BNFC ==2.9.5 + - BNFC ==2.9.6.1 - BNFC-meta ==0.6.1 - board-games ==0.4 - bodhi ==0.1.0 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolsimplifier ==0.1.8 - - boomerang ==1.4.9.3 - boomwhacker ==0.0.2 - bordacount ==0.1.0.0 - boring ==0.2.2 @@ -240,26 +244,28 @@ default-package-overrides: - bounded-queue ==1.0.0 - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - - box ==0.9.3.2 - - box-socket ==0.5.2.0 + - bower-json ==1.1.0.0 + - bowtie ==0.7.0 + - box ==0.9.3.3 + - box-socket ==0.5.2.1 - boxes ==0.1.5 - - breakpoint ==0.1.4.0 - - brick ==2.4 - - brotli ==0.0.0.2 + - breakpoint ==0.1.5.0 + - brick ==2.9 + - brotli ==0.0.0.3 - brotli-streams ==0.0.0.0 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 - bson-lens ==0.1.1 - btrfs ==0.2.1.0 - buffer-pipe ==0.0 - - bugsnag ==1.1.0.2 + - bugsnag ==1.2.0.1 - bugsnag-hs ==0.2.0.12 - bugsnag-wai ==1.0.1.1 - bugsnag-yesod ==1.0.1.0 - bugzilla-redhat ==1.0.1.1 - burrito ==2.0.1.14 + - butcher ==1.3.3.2 - bv ==0.5 - - bv-little ==1.3.2 - bv-sized ==1.0.6 - byte-count-reader ==0.10.1.12 - byte-order ==0.1.3.1 @@ -271,9 +277,11 @@ default-package-overrides: - bytes ==0.17.4 - byteset ==0.1.1.2 - byteslice ==0.2.15.0 - - bytesmith ==0.3.11.1 + - bytesmith ==0.3.13.0 + - bytestring-aeson-orphans ==0.1.0.2 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.2 + - bytestring-encodings ==0.2.0.2 - bytestring-lexing ==0.5.0.15 - bytestring-strict-builder ==0.4.5.8 - bytestring-to-vector ==0.3.0.1 @@ -289,29 +297,29 @@ default-package-overrides: - c14n ==0.1.0.3 - c2hs ==0.28.8 - ca-province-codes ==1.0.0.0 - - cabal-add ==0.1 + - cabal-add ==0.2 - cabal-appimage ==0.4.1.0 - cabal-clean ==0.2.20230609 - cabal-debian ==5.2.6 - cabal-doctest ==1.0.11 - cabal-file ==0.1.1 - - cabal-fix ==0.1.0.0 - cabal-flatpak ==0.1.2 - - cabal-gild ==1.5.0.3 - - cabal-install-parsers ==0.6.1.1 - - cabal-plan ==0.7.6.0 - - cabal-rpm ==2.2.1 + - cabal-gild ==1.6.0.2 + - cabal-install-parsers ==0.6.2 + - cabal-plan ==0.7.6.1 + - cabal-rpm ==2.3.0 - cabal-sort ==0.1.2.1 - cabal2spec ==2.7.1 - cache ==0.1.3.0 - cached-json-file ==0.1.1 - - cacophony ==0.10.1 + - cacophony ==0.11.0 - cairo ==0.13.12.0 - cairo-image ==0.1.0.5 - calendar-recycling ==0.0.0.1 - - call-alloy ==0.5.0.1 + - call-alloy ==0.6.0.2 - call-plantuml ==0.0.1.3 - call-stack ==0.4.0 + - calligraphy ==0.1.8 - can-i-haz ==0.3.1.1 - capability ==0.5.0.1 - cardano-coin-selection ==1.0.1 @@ -322,11 +330,12 @@ default-package-overrides: - cased ==0.1.0.0 - cases ==0.1.4.4 - casing ==0.1.4.1 - - cassava ==0.5.4.0 + - cassava ==0.5.4.1 - cassava-conduit ==0.6.6 - cassava-megaparsec ==2.1.1 - cast ==0.1.0.2 - caster ==0.0.3.0 + - cauldron ==0.9.0.1 - cayley-client ==0.4.19.4 - cborg ==0.2.10.0 - cborg-json ==0.2.6.0 @@ -343,57 +352,57 @@ default-package-overrides: - character-cases ==0.1.0.6 - character-ps ==0.1 - charset ==0.3.12 + - charsetdetect-ae ==1.1.0.4 - Chart ==1.9.5 - Chart-cairo ==1.9.4.1 - Chart-diagrams ==1.9.5.1 - - chart-svg ==0.7.0.0 + - chart-svg ==0.8.2.1 - ChasingBottoms ==1.3.1.16 - check-email ==1.0.2 - checkers ==0.6.0 - checksum ==0.0.0.1 - chell ==0.5.0.2 - chell-hunit ==0.3.0.2 - - chell-quickcheck ==0.2.5.4 - chimera ==0.4.1.0 - choice ==0.2.4.1 - chronologique ==0.3.1.3 - - chronos ==1.1.6.2 + - chronos ==1.1.7.0 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 - cipher-camellia ==0.0.2 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - circular ==0.4.0.3 - - citeproc ==0.8.1.1 - - clash-ghc ==1.8.2 - - clash-lib ==1.8.2 + - citeproc ==0.9.0.1 - clash-prelude ==1.8.2 - clash-prelude-hedgehog ==1.8.2 - classy-prelude ==1.5.0.3 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 - - clay ==0.15.0 + - clay ==0.16.1 + - cli-arguments ==0.7.0.0 - clientsession ==0.9.3.0 - Clipboard ==2.3.2.2 - clock ==0.8.4 - - closed ==0.2.0.2 + - closed ==0.2.1.0 - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 - cmark ==0.6.1 - cmark-gfm ==0.2.6 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.22 - - co-log ==0.6.1.2 + - co-log ==0.7.0.0 + - co-log-concurrent ==0.5.1.1 - co-log-core ==0.3.2.5 - co-log-polysemy ==0.0.1.6 - - code-conjure ==0.5.16 + - code-conjure ==0.7.8 - code-page ==0.2.1 - codec-beam ==0.2.0 - coinor-clp ==0.0.0.2 - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.6.0 - colonnade ==1.2.0.2 - - Color ==0.3.3 + - Color ==0.4.0 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - colour ==2.3.6 @@ -415,7 +424,6 @@ default-package-overrides: - compact ==0.2.0.0 - compactmap ==0.1.4.6 - companion ==0.1.0 - - compdata ==0.13.1 - compensated ==0.8.3 - compiler-warnings ==0.1.0 - componentm ==0.0.0.2 @@ -440,23 +448,22 @@ default-package-overrides: - conduit-extra ==1.3.8 - conduit-parse ==0.2.1.1 - conduit-zstd ==0.0.2.0 - - conferer ==1.1.0.0 - - conferer-aeson ==1.1.0.2 - config-ini ==0.2.7.0 - config-value ==0.8.3 - configuration-tools ==0.7.1 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - - configurator-pg ==0.2.10 + - constrained-categories ==0.4.2.0 - constraint-tuples ==0.2 - constraints ==0.14.2 - constraints-extras ==0.4.0.2 - construct ==0.3.2 - - context ==0.2.1.0 + - consumers ==2.3.3.1 + - context ==0.2.1.1 - context-http-client ==0.2.0.2 - context-resource ==0.2.0.2 - context-wai-middleware ==0.2.0.2 - - contiguous ==0.6.4.2 + - contiguous ==0.6.5.0 - contravariant ==1.5.5 - contravariant-extras ==0.3.5.4 - control-bool ==0.2.1 @@ -465,33 +472,34 @@ default-package-overrides: - control-monad-omega ==0.3.3 - convertible ==1.1.1.1 - cookie ==0.5.1 - - copilot ==4.1 - - copilot-c99 ==4.1 - - copilot-core ==4.1 - - copilot-interpreter ==4.1 - - copilot-language ==4.1 - - copilot-libraries ==4.1 - - copilot-prettyprinter ==4.1 - - copilot-theorem ==4.1 + - copilot ==4.5.1 + - copilot-c99 ==4.5.1 + - copilot-core ==4.5.1 + - copilot-interpreter ==4.5.1 + - copilot-language ==4.5.1 + - copilot-libraries ==4.5.1 + - copilot-prettyprinter ==4.5.1 + - copilot-theorem ==4.5.1 - copr-api ==0.2.0 - core-data ==0.3.9.1 - core-program ==0.7.0.0 - core-telemetry ==0.2.9.4 - core-text ==0.3.8.1 - countable ==1.2 + - countdown-numbers-game ==0.0.0.1 - country ==0.2.5.0 - covariance ==0.2.0.1 - cpphs ==1.20.9.1 - cpu ==0.1.2 + - cpuinfo ==0.1.0.3 - cql ==4.0.4 - cql-io ==1.1.1 - crackNum ==3.15 - crc32c ==0.2.2 - - credential-store ==0.1.2 + - crdt-event-fold ==1.8.1.2 - criterion ==1.6.4.0 - criterion-measurement ==0.2.3.0 - cron ==0.7.2 - - crypt-sha512 ==0 - crypto-api ==0.13.3 - crypto-api-tests ==0.3 - crypto-cipher-tests ==0.0.11 @@ -508,33 +516,35 @@ default-package-overrides: - cryptohash-sha512 ==0.11.102.0 - crypton ==1.0.4 - crypton-conduit ==0.2.3 - - crypton-connection ==0.4.4 + - crypton-connection ==0.4.5 + - crypton-pem ==0.3.0 + - crypton-socks ==0.6.2 - crypton-x509 ==1.7.7 - - crypton-x509-store ==1.6.10 + - crypton-x509-store ==1.6.11 - crypton-x509-system ==1.6.7 - crypton-x509-validation ==1.6.14 - cryptonite ==0.30 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - csp ==1.4.0 + - css-syntax ==0.1.0.2 - css-text ==0.1.3.0 - csv ==0.1.2 - csv-conduit ==1.0.1.1 - ctrie ==0.2 - cubicbezier ==0.6.0.7 - cubicspline ==0.1.2 - - cuda ==0.11.0.1 - cue-sheet ==2.0.2 - curl ==1.3.8 - - curly-expander ==0.3.0.4 - currency ==0.2.0.0 - - currycarbon ==0.3.0.1 + - currycarbon ==0.4.0.1 - cursor ==0.3.2.0 - cursor-brick ==0.1.0.1 - cursor-fuzzy-time ==0.1.0.0 - cursor-gen ==0.4.0.0 - cutter ==0.0 - cyclotomic ==1.1.2 + - czipwith ==1.0.1.4 - data-accessor ==0.2.3.1 - data-accessor-mtl ==0.2.0.5 - data-accessor-transformers ==0.2.1.8 @@ -544,22 +554,15 @@ default-package-overrides: - data-checked ==0.3 - data-clist ==0.2 - data-compat ==0.1.0.5 - - data-default ==0.7.1.3 - - data-default-class ==0.1.2.2 - - data-default-instances-base ==0.1.0.3 - - data-default-instances-bytestring ==0.0.1 - - data-default-instances-case-insensitive ==0.0.1 - - data-default-instances-containers ==0.1.0.3 - - data-default-instances-dlist ==0.0.1.2 - - data-default-instances-old-locale ==0.0.1.2 - - data-default-instances-unordered-containers ==0.0.1 - - data-default-instances-vector ==0.0.1 + - data-default ==0.8.0.1 + - data-default-class ==0.2.0.0 - data-diverse ==4.7.1.0 - data-dword ==0.3.2.1 - - data-effects ==0.3.0.1 - - data-effects-core ==0.2.0.0 - - data-effects-th ==0.2.0.0 + - data-effects ==0.4.2.0 + - data-effects-core ==0.4.3.0 + - data-effects-th ==0.4.2.1 - data-endian ==0.1.1 + - data-findcycle ==0.1.2.0 - data-fix ==0.3.4 - data-functor-logistic ==0.0 - data-has ==0.4.0.0 @@ -572,17 +575,18 @@ default-package-overrides: - data-msgpack-types ==0.0.3 - data-or ==1.0.0.7 - data-ordlist ==0.4.7.0 + - data-prometheus ==0.1.0.0 - data-ref ==0.1 - data-reify ==0.6.4 - data-serializer ==0.3.5 - data-sketches ==0.3.1.0 - data-sketches-core ==0.1.0.0 - data-textual ==0.3.0.3 + - dataframe ==0.2.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.4 - dbcleaner ==0.1.3 - - DBFunctor ==0.1.2.1 - - dbus ==1.3.11 + - dbus ==1.4.1 - dbus-hslogger ==0.1.0.1 - debian ==4.0.5 - debian-build ==0.10.2.1 @@ -591,13 +595,16 @@ default-package-overrides: - decidable ==0.3.1.1 - Decimal ==0.5.2 - declarative ==0.5.4 - - deepseq-generics ==0.2.0.0 + - deepseq-generics ==0.2.0.1 - deferred-folds ==0.9.18.7 - defun-core ==0.1.0.1 - dejafu ==2.4.0.7 + - delta-types ==1.0.0.0 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 + - dependent-monoidal-map ==0.1.1.5 - dependent-sum ==0.7.2.0 + - dependent-sum-aeson-orphans ==0.3.1.2 - dependent-sum-template ==0.2.0.2 - depq ==0.4.2 - deque ==0.4.4.2 @@ -609,32 +616,35 @@ default-package-overrides: - deriving-trans ==0.9.1.0 - detour-via-sci ==1.0.0 - df1 ==0.4.3 - - dhall ==1.42.2 + - dhall ==1.42.3 - di ==1.3 - di-core ==1.0.4 - di-df1 ==1.2.1 - di-handle ==1.0.1 - di-monad ==1.3.5 - diagrams ==1.4.2 + - diagrams-braille ==0.1.2 - diagrams-builder ==0.8.0.6 - - diagrams-cairo ==1.4.2.1 - - diagrams-canvas ==1.4.1.2 - - diagrams-contrib ==1.4.5.1 + - diagrams-cairo ==1.5 + - diagrams-canvas ==1.4.2 + - diagrams-contrib ==1.4.6 - diagrams-core ==1.5.1.1 - - diagrams-lib ==1.4.6.2 - - diagrams-postscript ==1.5.1.1 - - diagrams-rasterific ==1.4.2.3 + - diagrams-gtk ==1.4 + - diagrams-lib ==1.5.0.1 + - diagrams-postscript ==1.5.3 + - diagrams-rasterific ==1.5 - diagrams-solve ==0.1.3.1 - - diagrams-svg ==1.4.4 + - diagrams-svg ==1.5 - dice ==0.1.1 - dictionary-sharing ==0.1.0.0 - - Diff ==0.5 + - Diff ==1.0.2 - diff-loc ==0.1.0.0 - digest ==0.0.2.1 - digits ==0.3.1 + - digraph ==0.3.2 - dimensional ==1.6.1 - direct-sqlite ==2.3.29 - - directory-ospath-streaming ==0.1.0.3 + - directory-ospath-streaming ==0.2.2 - directory-tree ==0.12.1 - dirichlet ==0.1.0.7 - discount ==0.1.1 @@ -657,24 +667,24 @@ default-package-overrides: - distributive ==0.6.2.1 - djinn-lib ==0.0.1.4 - djot ==0.1.2.2 - - dl-fedora ==1.2.1 + - dl-fedora ==2.0.1 - dlist ==1.0 - dlist-instances ==0.1.1.1 - - dlist-nonempty ==0.1.3 - dns ==4.2.0 - do-list ==1.0.1 - do-notation ==0.1.0.2 + - dobutokO2 ==0.45.3.0 - dockerfile ==0.2.0 - - doclayout ==0.5 + - doclayout ==0.5.0.1 - docopt ==0.7.0.8 - doctemplates ==0.11.0.1 - - doctest ==0.22.6 + - doctest ==0.24.2 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.8 - doctest-exitcode-stdio ==0.0.0.1 - doctest-extract ==0.1.2 - doctest-lib ==0.1.1.1 - - doctest-parallel ==0.3.1.1 + - doctest-parallel ==0.4 - doldol ==0.4.1.2 - domain ==0.1.1.5 - domain-aeson ==0.1.1.2 @@ -682,39 +692,40 @@ default-package-overrides: - domain-core ==0.1.0.4 - domain-optics ==0.1.0.4 - dot ==0.3 - - dotenv ==0.12.0.0 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - - dotparse ==0.1.2.2 + - dotparse ==0.1.2.3 - double-conversion ==2.0.5.0 - download ==0.3.2.7 - download-curl ==0.1.4 - DPutils ==0.1.1.0 - - drawille ==0.1.3.0 - drifter ==0.3.0 - drifter-postgresql ==0.2.1 - drifter-sqlite ==0.1.0.0 - dsp ==0.2.5.2 - dual-tree ==0.2.3.1 - dublincore-xml-conduit ==0.1.0.3 + - dunai ==0.14.1 - duration ==0.2.0.0 - - dvorak ==0.1.0.0 - dynamic-state ==0.3.2 - dyre ==0.9.2 - eap ==0.9.0.2 - Earley ==0.13.0.1 - easy-file ==0.2.5 - easy-logger ==0.1.0.7 + - easyplot ==1.0 - Ebnf2ps ==1.0.15 + - ech-config ==0.0.1 - echo ==0.1.4 - ecstasy ==0.2.1.0 - ed25519 ==0.0.5.0 + - ede ==0.3.4.0 - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - - effectful ==2.5.1.0 - - effectful-core ==2.5.1.0 - - effectful-plugin ==1.1.0.4 + - effectful ==2.6.1.0 + - effectful-core ==2.6.1.0 + - effectful-plugin ==2.0.0.1 - effectful-th ==1.0.0.3 - egison-pattern-src ==0.2.1.2 - either ==5.0.3 @@ -723,13 +734,13 @@ default-package-overrides: - ekg-core ==0.1.2.0 - ekg-json ==0.1.1.1 - ekg-statsd ==0.2.6.2 + - ekg-wai ==0.1.2.0 - elerea ==2.9.0 - elf ==0.31 - - eliminators ==0.9.4 + - eliminators ==0.9.5 - elm-bridge ==0.8.4 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm-street ==0.2.2.1 - elm-syntax ==0.3.3.0 - elm2nix ==0.4.0 - elynx ==0.8.0.0 @@ -738,12 +749,13 @@ default-package-overrides: - elynx-seq ==0.8.0.0 - elynx-tools ==0.8.0.0 - elynx-tree ==0.7.2.2 - - emacs-module ==0.2.1 + - emacs-module ==0.2.1.1 - email-validate ==2.3.2.21 - emd ==0.2.0.0 - emojis ==0.1.4.1 - enclosed-exceptions ==1.0.3 - - encoding ==0.8.10 + - encoding ==0.10.2 + - end-of-exe ==0.1.2.0 - ENIG ==0.0.1.0 - entropy ==0.4.1.11 - enum-subset-generate ==0.1.0.3 @@ -757,7 +769,7 @@ default-package-overrides: - eq ==4.3 - equal-files ==0.0.5.4 - equational-reasoning ==0.7.1.0 - - equivalence ==0.4.1 + - equivalence ==0.4.1.1 - erf ==2.0.0.0 - errata ==0.4.0.3 - error ==1.0.0.0 @@ -766,13 +778,13 @@ default-package-overrides: - errorcall-eq-instance ==0.3.0 - errors ==2.3.0 - errors-ext ==0.4.2 - - ersatz ==0.5 - - esqueleto ==3.5.14.0 - - essence-of-live-coding ==0.2.8 - - essence-of-live-coding-gloss ==0.2.8 - - essence-of-live-coding-pulse ==0.2.8 - - essence-of-live-coding-quickcheck ==0.2.8 - - essence-of-live-coding-warp ==0.2.8 + - ersatz ==0.6 + - esqueleto ==3.6.0.0 + - essence-of-live-coding ==0.2.9 + - essence-of-live-coding-gloss ==0.2.9 + - essence-of-live-coding-pulse ==0.2.9 + - essence-of-live-coding-quickcheck ==0.2.9 + - essence-of-live-coding-warp ==0.2.9 - event-list ==0.1.3 - every ==0.0.1 - evm-opcodes ==0.2.0 @@ -789,19 +801,17 @@ default-package-overrides: - exon ==1.7.2.0 - exp-pairs ==0.2.1.1 - expiring-cache-map ==0.0.6.1 - - explainable-predicates ==0.1.2.4 - explicit-exception ==0.2 - express ==1.0.18 - extended-reals ==0.2.7.0 - - extensible ==0.9.2 - - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.16 + - extra ==1.8 - extra-data-yj ==0.1.0.0 - extractable-singleton ==0.0.1 - extrapolate ==0.4.6 - fail ==4.9.0.0 - FailT ==0.1.2.0 + - fakedata ==1.0.5 - fakedata-parser ==0.1.0.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 @@ -812,19 +822,19 @@ default-package-overrides: - fast-logger ==3.2.6 - fast-math ==1.0.2 - fast-myers-diff ==0.0.1 + - fbrnch ==1.7.1 - fcf-family ==0.2.0.2 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - fedora-krb ==0.1.0 - - fedora-releases ==0.2.1 - - fedora-repoquery ==0.7.3 + - fedora-releases ==0.3.0 + - fedora-repoquery ==0.7.4 - feed ==1.3.2.1 - FenwickTree ==0.1.2.1 - fft ==0.1.8.7 - fftw-ffi ==0.1 - fgl ==5.8.3.0 - - fgl-arbitrary ==0.2.0.6 - - fields-and-cases ==0.2.0.0 + - fgl-visualize ==0.1.0.1 - fields-json ==0.4.0.0 - file-embed ==0.0.16.0 - file-embed-lzma ==0.1 @@ -832,29 +842,31 @@ default-package-overrides: - file-modules ==0.1.2.4 - file-path-th ==0.1.0.0 - filecache ==0.5.2 - - filelock ==0.1.1.7 + - filelock ==0.1.1.8 - filemanip ==0.3.6.3 + - filepath-bytestring ==1.5.2.0.3 - filepattern ==0.1.3 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.6.0 - fin ==0.3.2 - FindBin ==0.0.5 - - fingertree ==0.1.6.1 + - fingertree ==0.1.6.2 - finite-typelits ==0.2.1.0 - first-class-families ==0.8.1.0 - fits-parse ==0.4.2 - fitspec ==0.4.10 - fix-whitespace ==0.1 - fixed ==0.3 + - fixed-generic ==0.1.0.2 - fixed-length ==0.2.3.1 - - fixed-vector ==1.2.3.0 - - fixed-vector-hetero ==0.6.2.0 + - fixed-vector ==2.0.0.0 + - fixed-vector-hetero ==0.7.0.0 - flac ==0.2.1 - flac-picture ==0.1.3 - flags-applicative ==0.1.0.3 - flat ==0.6 - - flatparse ==0.5.2.1 + - flatparse ==0.5.3.0 - flay ==0.5 - flexible-defaults ==0.0.3 - FloatingHex ==0.5 @@ -867,22 +879,20 @@ default-package-overrides: - focus ==1.0.3.2 - focuslist ==0.1.1.0 - fold-debounce ==0.2.0.16 + - fold-debounce-conduit ==0.2.0.8 - foldable1-classes-compat ==0.1.2 - foldl ==1.4.18 - folds ==0.7.8 - FontyFruity ==0.5.3.5 - - force-layout ==0.4.0.6 + - force-layout ==0.4.1 - foreign-store ==0.2.1 - ForestStructures ==0.0.1.1 - forkable-monad ==0.2.0.3 - forma ==1.2.0 - format-numbers ==0.1.0.1 - - formatn ==0.3.1.0 + - formatn ==0.3.2.0 - formatting ==7.2.0 - - fortran-src ==0.16.7 - foundation ==0.0.30 - - fourmolu ==0.15.0.0 - - Frames ==0.7.4.2 - free ==5.2 - free-alacarte ==1.0.0.9 - free-categories ==0.2.0.2 @@ -890,17 +900,15 @@ default-package-overrides: - free-vl ==0.1.4 - freenect ==1.2.1 - freer-par-monad ==0.1.0.0 - - freer-simple ==1.2.1.2 - freetype2 ==0.2.0 - friendly-time ==0.4.1 - frisby ==0.2.5 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 - - fsnotify ==0.4.3.0 + - fsnotify ==0.4.4.0 - ftp-client ==0.5.1.6 - funcmp ==1.9 - function-builder ==0.3.0.1 - - functor-classes-compat ==2.0.0.2 - functor-combinators ==0.4.1.4 - functor-products ==0.1.2.2 - fused-effects ==1.1.2.5 @@ -909,22 +917,25 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.1.0 - fuzzy-dates ==0.1.1.2 - - fuzzy-time ==0.3.0.0 + - fuzzy-time ==0.3.0.1 - fuzzyset ==0.3.2 - - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 - gemini-exports ==0.1.0.2 - general-games ==1.1.1 + - generic-aeson ==0.2.0.14 - generic-arbitrary ==1.0.1.2 + - generic-case ==0.1.1.1 - generic-constraints ==1.1.1.1 - generic-data ==1.1.0.2 - generic-data-functions ==0.6.0 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.6 + - generic-enumeration ==0.1.0.4 - generic-functor ==1.1.0.0 - generic-lens ==2.2.2.0 - generic-lens-core ==2.2.1.0 + - generic-lexicographic-order ==0.1.0.1 - generic-monoid ==0.1.0.1 - generic-optics ==2.2.1.0 - generic-random ==1.5.0.1 @@ -935,7 +946,6 @@ default-package-overrides: - generics-eot ==0.4.0.1 - generics-sop ==0.5.1.4 - generics-sop-lens ==0.2.1 - - geniplate-mirror ==0.7.10 - genvalidity ==1.1.1.0 - genvalidity-aeson ==1.0.0.1 - genvalidity-appendful ==0.1.0.0 @@ -968,29 +978,32 @@ default-package-overrides: - genvalidity-unordered-containers ==1.0.0.1 - genvalidity-uuid ==1.0.0.1 - genvalidity-vector ==1.0.0.0 - - geodetics ==0.1.2 + - geodetics ==1.1.0 + - geoip2 ==0.4.1.3 - getopt-generics ==0.13.1.0 - ghc-bignum-orphans ==0.1.1 - ghc-byteorder ==4.11.0.0.10 - ghc-check ==0.5.0.8 + - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-events ==0.20.0.0 - - ghc-exactprint ==1.8.0.0 + - ghc-exactprint ==1.10.0.0 - ghc-hs-meta ==0.1.5.0 - - ghc-lib ==9.8.5.20250214 - - ghc-lib-parser ==9.8.5.20250214 - - ghc-lib-parser-ex ==9.8.0.2 + - ghc-lib ==9.12.2.20250421 + - ghc-lib-parser ==9.12.2.20250421 + - ghc-lib-parser-ex ==9.12.0.0 - ghc-parser ==0.2.7.0 - ghc-paths ==0.1.0.12 - ghc-source-gen ==0.4.6.0 - - ghc-syntax-highlighter ==0.0.11.0 + - ghc-syntax-highlighter ==0.0.13.0 - ghc-tcplugins-extra ==0.4.6 - ghc-trace-events ==0.1.2.10 - ghc-typelits-extra ==0.4.8 - ghc-typelits-knownnat ==0.7.13 - ghc-typelits-natnormalise ==0.7.10 - - ghc-typelits-presburger ==0.7.4.1 + - ghc-typelits-presburger ==0.7.4.2 - ghci-hexcalc ==0.1.1.0 + - ghci4luatex ==0.1.2 - ghcid ==0.8.9 - ghcjs-codemirror ==0.0.0.2 - ghcjs-dom ==0.9.9.2 @@ -1005,11 +1018,11 @@ default-package-overrides: - gi-dbusmenu ==0.4.14 - gi-dbusmenugtk3 ==0.4.16 - gi-freetype2 ==2.0.5 - - gi-gdk ==3.0.30 + - gi-gdk ==4.0.10 - gi-gdk3 ==3.0.30 - gi-gdk4 ==4.0.10 - gi-gdkpixbuf ==2.0.32 - - gi-gdkx11 ==3.0.17 + - gi-gdkx11 ==4.0.9 - gi-gdkx113 ==3.0.17 - gi-gdkx114 ==4.0.9 - gi-gio ==2.0.38 @@ -1018,36 +1031,36 @@ default-package-overrides: - gi-gobject ==2.0.31 - gi-graphene ==1.0.8 - gi-gsk ==4.0.9 - - gi-gtk ==3.0.44 - - gi-gtk-hs ==0.3.17 + - gi-gtk ==4.0.12 - gi-gtk3 ==3.0.44 - gi-gtk4 ==4.0.12 - - gi-gtksource ==3.0.30 - - gi-gtksource3 ==3.0.30 + - gi-gtksource ==5.0.2 + - gi-gtksource5 ==5.0.2 - gi-harfbuzz ==0.0.10 + - gi-javascriptcore ==6.0.5 + - gi-javascriptcore6 ==6.0.5 - gi-pango ==1.0.30 - - gi-soup ==2.4.30 - - gi-soup2 ==2.4.30 + - gi-soup ==3.0.4 + - gi-soup3 ==3.0.5 - gi-vte ==2.91.35 - gi-xlib ==2.0.14 + - ginger ==0.10.6.0 - gio ==0.13.12.0 - git-lfs ==1.2.5 - git-mediate ==1.1.0 - githash ==0.1.7.0 - - github ==0.29 + - github ==0.30.0.1 - github-release ==2.0.0.14 - github-rest ==1.2.1 - github-types ==0.2.1 - - github-webhooks ==0.17.0 - - gitlab-haskell ==1.0.2.2 - - gitlib ==3.1.3 - - gitlib-libgit2 ==3.1.2.1 - - gitlib-test ==3.1.2 + - github-webhooks ==0.18.0 + - gitlab-haskell ==1.1.0.0 - gitrev ==1.3.1 - gl ==0.9.1 - glabrous ==2.0.6.4 - glasso ==0.1.0 - GLFW-b ==3.3.9.1 + - glfw-group ==0.1.0.6 - glib ==0.13.12.0 - glib-stopgap ==0.1.0.1 - Glob ==0.10.2 @@ -1059,6 +1072,91 @@ default-package-overrides: - GLURaw ==2.0.0.5 - GLUT ==2.7.0.16 - gnuplot ==0.5.7 + - gogol ==1.0.0.0 + - gogol-adexchange-buyer ==1.0.0 + - gogol-adexchange-seller ==1.0.0 + - gogol-admin-datatransfer ==1.0.0 + - gogol-admin-directory ==1.0.0 + - gogol-admin-reports ==1.0.0 + - gogol-adsense ==1.0.0 + - gogol-adsense-host ==1.0.0 + - gogol-analytics ==1.0.0 + - gogol-android-enterprise ==1.0.0 + - gogol-android-publisher ==1.0.0 + - gogol-appengine ==1.0.0 + - gogol-apps-activity ==1.0.0 + - gogol-apps-calendar ==1.0.0 + - gogol-apps-licensing ==1.0.0 + - gogol-apps-reseller ==1.0.0 + - gogol-apps-tasks ==1.0.0 + - gogol-appstate ==1.0.0 + - gogol-bigquery ==1.0.0 + - gogol-billing ==1.0.0 + - gogol-blogger ==1.0.0 + - gogol-books ==1.0.0 + - gogol-civicinfo ==1.0.0 + - gogol-classroom ==1.0.0 + - gogol-cloudtrace ==1.0.0 + - gogol-compute ==1.0.0 + - gogol-container ==1.0.0 + - gogol-core ==1.0.0.0 + - gogol-customsearch ==1.0.0 + - gogol-dataflow ==1.0.0 + - gogol-dataproc ==1.0.0 + - gogol-datastore ==1.0.0 + - gogol-debugger ==1.0.0 + - gogol-deploymentmanager ==1.0.0 + - gogol-dfareporting ==1.0.0 + - gogol-discovery ==1.0.0 + - gogol-dns ==1.0.0 + - gogol-doubleclick-bids ==1.0.0 + - gogol-doubleclick-search ==1.0.0 + - gogol-drive ==1.0.0 + - gogol-firebase-rules ==1.0.0 + - gogol-fitness ==1.0.0 + - gogol-fonts ==1.0.0 + - gogol-fusiontables ==1.0.0 + - gogol-games ==1.0.0 + - gogol-games-configuration ==1.0.0 + - gogol-games-management ==1.0.0 + - gogol-genomics ==1.0.0 + - gogol-gmail ==1.0.0 + - gogol-groups-migration ==1.0.0 + - gogol-groups-settings ==1.0.0 + - gogol-identity-toolkit ==1.0.0 + - gogol-kgsearch ==1.0.0 + - gogol-logging ==1.0.0 + - gogol-mirror ==1.0.0 + - gogol-monitoring ==1.0.0 + - gogol-oauth2 ==1.0.0 + - gogol-pagespeed ==1.0.0 + - gogol-partners ==1.0.0 + - gogol-people ==1.0.0 + - gogol-play-moviespartner ==1.0.0 + - gogol-plus ==1.0.0 + - gogol-plus-domains ==1.0.0 + - gogol-proximitybeacon ==1.0.0 + - gogol-pubsub ==1.0.0 + - gogol-qpxexpress ==1.0.0 + - gogol-replicapool ==1.0.0 + - gogol-replicapool-updater ==1.0.0 + - gogol-resourcemanager ==1.0.0 + - gogol-script ==1.0.0 + - gogol-sheets ==1.0.0 + - gogol-shopping-content ==1.0.0 + - gogol-siteverification ==1.0.0 + - gogol-spectrum ==1.0.0 + - gogol-sqladmin ==1.0.0 + - gogol-storage ==1.0.0 + - gogol-storage-transfer ==1.0.0 + - gogol-tagmanager ==1.0.0 + - gogol-translate ==1.0.0 + - gogol-urlshortener ==1.0.0 + - gogol-vision ==1.0.0 + - gogol-webmaster-tools ==1.0.0 + - gogol-youtube ==1.0.0 + - gogol-youtube-analytics ==1.0.0 + - gogol-youtube-reporting ==1.0.0 - goldplate ==0.2.2.1 - google-isbn ==1.0.3 - google-oauth2-jwt ==0.3.3.1 @@ -1077,22 +1175,21 @@ default-package-overrides: - greskell-core ==1.0.0.6 - greskell-websocket ==1.0.0.4 - gridtables ==0.1.0.0 - - grisette ==0.9.0.0 + - grisette ==0.13.0.1 - groom ==0.1.2.1 - group-by-date ==0.1.0.5 - groups ==0.5.3 - gtk ==0.15.10 - - gtk-sni-tray ==0.1.8.1 - - gtk-strut ==0.1.3.2 - gtk2hs-buildtools ==0.13.12.0 - gtk3 ==0.15.10 - guarded-allocation ==0.0.1 - - hackage-cli ==0.1.0.3 - - hackage-security ==0.6.3.1 - - hackage-security-HTTP ==0.1.1.2 + - hackage-cli ==0.1.0.4 + - hackage-revdeps ==0.1 + - hackage-security ==0.6.3.2 + - hackage-security-HTTP ==0.1.1.3 - haddock-library ==1.11.0 - haha ==0.3.1.1 - - hakyll ==4.16.6.0 + - hakyll ==4.16.7.1 - hakyll-convert ==0.3.0.5 - hal ==1.1 - half ==0.3.3 @@ -1100,49 +1197,49 @@ default-package-overrides: - hamlet ==1.2.0 - hamtsolo ==1.0.4 - HandsomeSoup ==0.4.2 - - handwriting ==0.1.0.3 - happstack-jmacro ==7.0.12.6 - - happstack-server ==7.9.2.1 - - happstack-server-tls ==7.2.1.6 - - happy ==2.0.2 - - happy-lib ==2.0.2 + - happstack-server ==7.9.3 + - happstack-server-tls ==7.2.1.7 + - happy ==2.1.7 + - happy-lib ==2.1.7 - happy-meta ==0.2.1.0 - - harpie ==0.1.2.0 - - harpie-numhask ==0.1.0.1 + - harpie ==0.1.3.0 + - harpie-numhask ==0.1.0.2 - has-transformers ==0.1.0.4 - HasBigDecimal ==0.2.0.0 - - hashable ==1.4.7.0 - - hashids ==1.1.1.0 + - hashable ==1.5.0.0 - hashmap ==1.3.3 - - hashtables ==1.3.1 - - haskell-gi ==0.26.16 + - hashtables ==1.4.2 + - haskell-gi ==0.26.17 - haskell-gi-base ==0.26.9 - haskell-gi-overloading ==1.0 - - haskell-lexer ==1.1.2 - - haskell-src ==1.0.4.1 + - haskell-lexer ==1.2.1 + - haskell-src ==1.0.4.2 - haskell-src-exts ==1.23.1 - haskell-src-exts-simple ==1.23.1.0 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.15 + - HaskellNet ==0.6.2 + - HaskellNet-SSL ==0.4.0.2 - haskey-btree ==0.3.0.1 - haskintex ==0.8.0.3 - - haskoin-core ==1.1.0 - - haskoin-node ==1.1.4 - - haskoin-store-data ==1.4.0 + - haskoin-core ==1.2.2 + - haskoin-store-data ==1.5.16 - hasktags ==0.73.0 - - hasql ==1.8.1.4 + - hasql ==1.9.3.1 - hasql-dynamic-statements ==0.3.1.8 - hasql-implicits ==0.2.0.1 - hasql-interpolate ==1.0.1.0 - hasql-listen-notify ==0.1.0.1 - hasql-migration ==0.3.1 - - hasql-notifications ==0.2.3.2 - - hasql-optparse-applicative ==0.8.0.1 - - hasql-pool ==1.2.0.3 + - hasql-optparse-applicative ==0.9 + - hasql-pool ==1.3.0.3 - hasql-th ==0.4.0.23 - - hasql-transaction ==1.1.1.2 + - hasql-transaction ==1.2.1 + - Hastructure ==0.50.4 - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.4.2 + - HaTeX ==3.23.0.1 + - haveibeenpwned ==0.2.0.3 - HaXml ==1.25.14 - haxr ==3000.11.5.1 - Hclip ==3.0.0.4 @@ -1158,19 +1255,20 @@ default-package-overrides: - hedgehog ==1.5 - hedgehog-classes ==0.2.5.4 - hedgehog-corpus ==0.2.0 + - hedgehog-fakedata ==0.0.1.5 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.15.2 - hedn ==0.3.0.4 - - heftia ==0.5.0.0 - - heftia-effects ==0.5.0.0 - - hegg ==0.5.0.0 + - heftia ==0.7.0.0 + - heftia-effects ==0.7.0.0 - heist ==1.1.1.2 - here ==1.2.14 - heredoc ==0.2.0.0 - hetero-parameter-list ==0.1.0.21 - hetero-parameter-list-with-typelevel-tools ==0.1.0.1 - heterocephalus ==1.0.5.7 + - hetzner ==0.7.2.1 - hex ==0.2.0 - hex-text ==0.1.0.9 - hexml ==0.3.5 @@ -1179,9 +1277,8 @@ default-package-overrides: - hformat ==0.3.3.1 - hfsevents ==0.1.8 - hgal ==2.0.0.3 - - hi-file-parser ==0.1.7.0 + - hi-file-parser ==0.1.8.0 - hidapi ==0.1.8 - - hindent ==6.2.1 - hinfo ==0.0.3.0 - hinotify ==0.4.2 - hint ==0.9.0.8 @@ -1189,47 +1286,46 @@ default-package-overrides: - hjsmin ==0.2.1 - hkd-default ==1.1.0.0 - hkgr ==0.4.8 - - hledger ==1.40 + - hledger ==1.43.2 - hledger-iadd ==1.3.21 - hledger-interest ==1.6.7 - - hledger-lib ==1.40 + - hledger-lib ==1.43.2 - hledger-stockquotes ==0.1.3.2 - - hledger-ui ==1.40 - - hledger-web ==1.40 + - hledger-ui ==1.43.2 + - hledger-web ==1.43.2 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 - - hlint ==3.8 + - hlint ==3.10 - hmatrix ==0.20.2 - hmatrix-backprop ==0.1.3.0 - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.8 - hmatrix-morpheus ==0.1.1.2 + - hmatrix-repa ==0.1.2.2 - hmatrix-special ==0.19.0.0 - hmatrix-vector-sized ==0.1.3.0 - - hmm-lapack ==0.5.0.1 - - HMock ==0.5.1.2 - hmpfr ==0.4.5 - - hnix-store-core ==0.8.0.0 - hoare ==0.1.1.0 - - hoauth2 ==2.14.0 + - hoauth2 ==2.14.3 - hoogle ==5.0.18.4 - hopenssl ==2.2.5 - horizontal-rule ==0.7.0.0 - - hosc ==0.20 + - hosc ==0.21.1 - hostname ==1.0 - hostname-validate ==1.0.0 - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.10.1 - - hpack ==0.37.0 - - hpc-codecov ==0.6.2.0 - - hpc-lcov ==1.1.2 + - hpack ==0.38.2 + - hpc-codecov ==0.6.3.0 + - hpc-lcov ==1.2.0 - HPDF ==1.7 + - hpke ==0.0.0 - hpp ==0.6.5 - hpqtypes ==1.12.0.0 - - hpqtypes-extras ==1.16.4.4 - - hquantlib-time ==0.1.1 + - hpqtypes-extras ==1.18.0.0 + - hquantlib-time ==0.1.2 - hreader ==1.1.1 - hreader-lens ==0.1.3.0 - hruby ==0.5.1.0 @@ -1249,7 +1345,7 @@ default-package-overrides: - hsini ==0.5.2.2 - hsinstall ==2.8 - HSlippyMap ==3.0.1 - - hslogger ==1.3.1.2 + - hslogger ==1.3.2.0 - hslua ==2.3.1 - hslua-aeson ==2.3.1.1 - hslua-classes ==2.3.1 @@ -1323,11 +1419,11 @@ default-package-overrides: - http-date ==0.0.11 - http-directory ==0.1.11 - http-download ==0.2.1.0 - - http-io-streams ==0.1.7.0 + - http-io-streams ==0.1.7.2 - http-link-header ==1.2.3 - http-media ==0.8.1.1 - http-query ==0.1.3 - - http-reverse-proxy ==0.6.1.0 + - http-reverse-proxy ==0.6.2.0 - http-semantics ==0.3.0 - http-streams ==0.8.9.9 - http-types ==0.12.4 @@ -1345,13 +1441,11 @@ default-package-overrides: - hw-excess ==0.2.3.0 - hw-hedgehog ==0.1.1.1 - hw-int ==0.0.2.0 - - hw-json-simd ==0.1.1.2 - hw-kafka-client ==5.3.0 - hw-mquery ==0.2.1.2 - hw-parser ==0.1.1.0 - hw-prim ==0.6.3.2 - hw-rankselect-base ==0.3.4.1 - - hw-streams ==0.0.1.1 - hw-string-parse ==0.0.0.5 - hweblib ==0.6.3 - hwk ==0.6 @@ -1364,9 +1458,10 @@ default-package-overrides: - hxt-regex-xmlschema ==9.2.0.7 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 + - hxt-xpath ==9.1.2.2 - hybrid-vectors ==0.2.5 - - hyper ==0.2.1.1 - - hyperloglog ==0.4.6 + - hyperbole ==0.4.3 + - hyperloglog ==0.5 - hyphenation ==0.8.3 - iconv ==0.4.1.3 - identicon ==0.2.3 @@ -1374,15 +1469,15 @@ default-package-overrides: - if ==0.1.0.0 - IfElse ==0.85 - iff ==0.0.6.1 - - ihaskell ==0.11.0.0 + - ihaskell ==0.12.0.0 - ihaskell-hvega ==0.5.0.6 - ihs ==0.1.0.3 - - ilist ==0.4.0.1 - imagesize-conduit ==1.1 - Imlib ==0.1.2 - immortal ==0.3 - immortal-queue ==0.1.0.1 - imp ==1.0.3.3 + - ImpSpec ==0.1.0.0 - inbox ==0.2.0 - incipit-base ==0.6.1.1 - incipit-core ==0.6.1.1 @@ -1397,6 +1492,7 @@ default-package-overrides: - indexed-transformers ==0.1.0.4 - indexed-traversable ==0.1.4 - indexed-traversable-instances ==0.1.2 + - inf-backprop ==0.1.1.0 - infer-license ==0.2.0 - infinite-list ==0.1.2 - influxdb ==1.9.3.2 @@ -1406,14 +1502,14 @@ default-package-overrides: - inline-c-cpp ==0.5.0.2 - input-parsers ==0.3.0.2 - insert-ordered-containers ==0.2.7 - - inspection-testing ==0.5.0.3 + - inspection-testing ==0.6.2 - int-cast ==0.2.0.0 - int-supply ==1.0.0 - integer-conversion ==0.1.1 - integer-logarithms ==1.0.4 - - integer-roots ==1.0.2.0 - - integer-types ==0.1.4.1 + - integer-roots ==1.0.3.0 - integration ==0.2.1 + - intermediate-structures ==0.1.2.0 - intern ==0.9.6 - interpolate ==0.2.1 - interpolatedstring-perl6 ==1.0.2 @@ -1442,6 +1538,7 @@ default-package-overrides: - ipython-kernel ==0.11.0.0 - irc ==0.6.1.1 - irc-ctcp ==0.1.3.1 + - iri ==0.5.1.1 - isbn ==1.1.0.5 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 @@ -1461,35 +1558,34 @@ default-package-overrides: - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - - js-jquery ==3.3.1 + - js-jquery ==3.7.1 - jsaddle ==0.9.9.3 - jsaddle-dom ==0.9.9.2 + - jsaddle-warp ==0.9.9.5 - json ==0.11 - json-feed ==2.0.0.15 - json-rpc ==1.1.2 - json-spec ==1.1.1.2 - json-spec-elm ==0.4.0.6 - - json-spec-elm-servant ==0.4.3.0 - - json-spec-openapi ==1.0.1.1 + - json-spec-elm-servant ==0.4.4.1 + - json-spec-openapi ==1.0.1.3 - json-stream ==0.4.6.0 - jsonifier ==0.2.1.3 - jsonpath ==0.3.0.0 - JuicyCairo ==0.1.0.1 - JuicyPixels ==3.3.9 - JuicyPixels-extra ==0.6.0 - - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.4 - justified-containers ==0.3.0.0 - kan-extensions ==5.2.7 - kansas-comet ==0.4.3 - - katip ==0.8.8.2 + - katip ==0.8.8.4 - katip-logstash ==0.1.0.2 - katip-wai ==0.2.0.0 - kazura-queue ==0.1.0.4 - kdt ==0.2.6 - keep-alive ==0.2.1.0 - - keter ==2.1.9 - - keuringsdienst ==1.0.2.2 + - keter ==2.1.10 - keycode ==0.2.3 - keyed-vals ==0.2.3.2 - keyed-vals-hspec-tests ==0.2.3.2 @@ -1498,36 +1594,37 @@ default-package-overrides: - keys ==3.12.4 - ki ==1.0.1.2 - ki-unlifted ==1.0.0.2 - - kind-apply ==0.4.0.0 + - kind-apply ==0.4.0.1 - kind-generics ==0.5.0.0 - kmeans ==0.1.3 - knob ==0.2.2 - koji ==0.0.2 - - koji-tool ==1.2 + - koji-tool ==1.3 - kvitable ==1.1.0.1 - labels ==0.3.3 - lackey ==2.0.0.11 + - lambdabot-core ==5.3.1.2 + - lambdabot-irc-plugins ==5.3.1.2 + - LambdaHack ==0.11.0.1 - lame ==0.2.2 - language-avro ==0.1.4.0 + - language-bash ==0.11.1 - language-c ==0.10.0 - language-c-quote ==0.13.0.2 - language-c99 ==0.2.0 - language-c99-simple ==0.3.0 - language-c99-util ==0.2.0 - - language-docker ==13.0.0 + - language-docker ==14.0.1 - language-dot ==0.1.2 - language-glsl ==0.3.0 - language-java ==0.2.9 - language-javascript ==0.7.1.0 - language-lua ==0.11.0.2 - language-protobuf ==1.0.1 - - language-thrift ==0.13.0.0 - - lapack ==0.5.2 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1.1 - lapack-ffi ==0.0.3 - lapack-ffi-tools ==0.1.3.2 - - lapack-hmatrix ==0.0.0.2 - large-hashable ==0.1.2.0 - largeword ==1.2.5 - latex ==0.1.0.4 @@ -1536,10 +1633,9 @@ default-package-overrides: - lawful-conversions ==0.1.7 - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 - - lazyppl ==1.0 - lazysmallcheck ==0.6 - lca ==0.4 - - leancheck ==1.0.2 + - leancheck ==1.0.4 - leancheck-instances ==0.0.8 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.7 @@ -1563,32 +1659,38 @@ default-package-overrides: - libffi ==0.2.1 - libmpd ==0.10.0.1 - liboath-hs ==0.0.1.2 + - libsodium-bindings ==0.0.3.0 - libyaml ==0.1.4 - libyaml-clib ==0.2.5 - lift-generics ==0.3 - lift-type ==0.1.2.0 - lifted-async ==0.10.2.7 - lifted-base ==0.2.3.12 + - lifted-threads ==1.0 - linear ==1.23.2 - - linear-base ==0.4.0 - - linear-circuit ==0.1.0.4 + - linear-base ==0.5.0 - linear-generics ==0.2.3 + - linear-geo ==0.1.0.0 - linear-programming ==0.0.1 - linebreak ==1.1.0.4 - linux-capabilities ==0.1.1.0 - linux-file-extents ==0.2.0.1 - - linux-namespaces ==0.1.3.1 + - linux-namespaces ==0.2.0.1 + - liquid-fixpoint ==0.9.6.3.2 + - liquidhaskell ==0.9.10.1.2 + - liquidhaskell-boot ==0.9.10.1.2 - List ==0.6.2 - list-predicate ==0.1.0.1 - list-shuffle ==1.0.0.1 - list-t ==1.0.5.7 - list-transformer ==1.1.1 - list-witnesses ==0.1.4.1 - - ListLike ==4.7.8.3 + - ListLike ==4.7.8.4 + - lists-flines ==0.1.3.0 - listsafe ==0.1.0.1 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 - - literatex ==0.3.0.0 + - literatex ==0.4.0.0 - lmdb ==0.2.5 - load-env ==0.2.1.0 - locators ==0.3.0.5 @@ -1599,7 +1701,7 @@ default-package-overrides: - logfloat ==0.14.0 - logger-thread ==0.1.0.2 - logging ==3.0.6 - - logging-effect ==1.4.0 + - logging-effect ==1.4.1 - logging-facade ==0.3.1 - logging-facade-syslog ==1 - logict ==0.8.2.0 @@ -1608,9 +1710,9 @@ default-package-overrides: - lpeg ==1.1.0 - LPFP ==1.1.5 - LPFP-core ==1.1.5 + - lr-acts ==0.0.1 - lrucache ==1.2.0.1 - - lrucaching ==0.3.4 - - lsql-csv ==0.1.0.6 + - lsfrom ==2.0 - lua ==2.3.3 - lua-arbitrary ==1.0.1.1 - lucid ==2.11.20250303 @@ -1620,27 +1722,31 @@ default-package-overrides: - lukko ==0.1.2 - lumberjack ==1.0.3.0 - lz4 ==0.2.3.1 + - lz4-frame-conduit ==0.1.0.2 - lzma ==0.0.1.1 - lzma-clib ==5.2.2 - machines ==0.7.4 - magic ==1.1 - - magico ==0.0.2.3 + - mail-pool ==2.3.1 - mailtrap ==0.1.2.2 - main-tester ==0.2.0.1 - mainland-pretty ==0.7.1.1 - managed ==1.0.10 + - mandrill ==0.5.8.0 + - manifolds-core ==0.6.1.1 + - Mantissa ==0.1.0.0 - map-syntax ==0.3 - - mappings ==0.3.1.0 + - mappings ==0.3.2.0 - markdown ==0.1.17.5 - markdown-unlit ==0.6.0 - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - - markup-parse ==0.1.1.1 + - markup-parse ==0.2.1.0 - massiv ==1.0.5.0 - massiv-io ==1.0.0.1 - massiv-serialise ==1.0.0.2 - massiv-test ==1.1.0.1 - - matchable ==0.1.2.1 + - matchable ==0.2 - math-extras ==0.1.1.0 - math-functions ==0.3.4.4 - mathexpr ==0.3.1.0 @@ -1655,17 +1761,19 @@ default-package-overrides: - mbox-utility ==0.0.3.1 - mcmc ==0.8.3.1 - mcmc-types ==1.0.3 - - mealy ==0.5.0.0 + - mcp-server ==0.1.0.15 + - mealy ==0.5.0.1 - med-module ==0.1.3 - median-stream ==0.7.0.0 - - megaparsec ==9.6.1 - - megaparsec-tests ==9.6.1 + - megaparsec ==9.7.0 + - megaparsec-tests ==9.7.0 - melf ==1.3.1 - - mem-info ==0.3.1.0 + - mem-info ==0.4.1.1 - membership ==0.0.1 - memcache ==0.3.0.2 - memory ==0.18.0 - MemoTrie ==0.6.11 + - mempack ==0.1.2.0 - mergeful ==0.3.0.0 - mergeful-persistent ==0.3.0.1 - mergeless ==0.4.0.0 @@ -1676,13 +1784,13 @@ default-package-overrides: - messagepack ==0.5.5 - metrics ==0.4.1.1 - mfsolve ==0.3.2.2 - - microaeson ==0.1.0.2 - - microlens ==0.4.13.1 + - microaeson ==0.1.0.3 + - microlens ==0.4.14.0 - microlens-aeson ==2.5.2 - microlens-contra ==0.1.0.3 - - microlens-ghc ==0.4.14.3 - - microlens-mtl ==0.2.0.3 - - microlens-platform ==0.4.3.6 + - microlens-ghc ==0.4.15.1 + - microlens-mtl ==0.2.1.0 + - microlens-platform ==0.4.4.1 - microlens-th ==0.4.3.17 - microspec ==0.2.1.3 - microstache ==1.0.3 @@ -1694,12 +1802,13 @@ default-package-overrides: - mime-mail ==0.5.1 - mime-mail-ses ==0.4.3 - mime-types ==0.1.2.0 - - min-max-pqueue ==0.1.0.2 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.1 + - minisat ==0.1.4 - minisat-solver ==0.1 - miniterion ==0.1.1.1 - miniutter ==0.5.1.2 + - minmax ==0.1.1.0 - mintty ==0.1.4 - misfortune ==0.1.2.1 - miso ==1.8.7.0 @@ -1711,18 +1820,23 @@ default-package-overrides: - mmark-cli ==0.0.5.2 - mmark-ext ==0.2.1.5 - mmorph ==1.2.1 + - mmsyn2-array ==0.3.1.1 + - mmsyn7l ==0.9.2.0 + - mmsyn7ukr-array ==0.3.0.0 + - mmsyn7ukr-common ==0.3.1.0 - mnist-idx ==0.1.3.2 - mnist-idx-conduit ==0.4.0.0 - mockcat ==0.5.2.0 - mockery ==0.3.5 - - mod ==0.2.0.1 + - mod ==0.2.1.0 - modern-uri ==0.3.6.1 - modular ==0.1.0.8 - moffy ==0.1.1.0 - moffy-samples ==0.1.0.3 - moffy-samples-events ==0.2.2.5 - - monad-bayes ==1.3.0.4 - - monad-chronicle ==1.0.2 + - moffy-samples-gtk3 ==0.1.0.0 + - moffy-samples-gtk3-run ==0.1.0.7 + - monad-chronicle ==1.1 - monad-control ==1.0.3.1 - monad-control-aligned ==0.0.2.1 - monad-control-identity ==0.2.0.0 @@ -1730,7 +1844,8 @@ default-package-overrides: - monad-extras ==0.6.0 - monad-interleave ==0.2.0.1 - monad-logger ==0.3.42 - - monad-logger-aeson ==0.4.1.3 + - monad-logger-aeson ==0.4.1.4 + - monad-logger-extras ==0.1.1.2 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.2.0.2 - monad-logger-syslog ==0.1.6.1 @@ -1747,25 +1862,28 @@ default-package-overrides: - monad-time ==0.4.0.0 - monadlist ==0.0.2 - monadoid ==0.0.3 - - monadology ==0.3 + - monadology ==0.4 - MonadPrompt ==1.0.0.5 - MonadRandom ==0.6.2 - monads-tf ==0.3.0.1 - mongoDB ==2.7.1.4 - mono-traversable ==1.0.21.0 - mono-traversable-instances ==0.1.1.0 - - mono-traversable-keys ==0.3.0 - - monoid-extras ==0.6.5 + - monoid-extras ==0.7 + - monoid-insertleft ==0.1.0.1 + - monoid-map ==0.2.0.1 - monoid-subclasses ==1.2.6 - monoid-transformer ==0.0.4 - monoidal-containers ==0.6.6.0 - monoidal-functors ==0.2.3.0 - - monoidmap ==0.0.4.3 + - monoidmap ==0.0.4.4 + - monoidmap-aeson ==0.0.0.6 + - monoidmap-examples ==0.0.0.1 + - monoidmap-internal ==0.0.0.1 + - monoidmap-quickcheck ==0.0.0.3 - more-containers ==0.2.2.2 - - morpheus-graphql ==0.28.1 - morpheus-graphql-app ==0.28.1 - morpheus-graphql-client ==0.28.1 - - morpheus-graphql-code-gen ==0.28.1 - morpheus-graphql-code-gen-utils ==0.28.1 - morpheus-graphql-core ==0.28.1 - morpheus-graphql-server ==0.28.1 @@ -1776,11 +1894,11 @@ default-package-overrides: - mpi-hs-binary ==0.1.1.0 - mpi-hs-cereal ==0.1.0.0 - msgpack ==1.0.1.0 + - mstate ==0.2.11 - mt19937 ==0.1.1 - mtl-compat ==0.2.2 - mtl-misc-yj ==0.1.0.4 - mtl-prelude ==2.0.3.2 - - multi-containers ==0.2 - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.2.1 @@ -1797,8 +1915,6 @@ default-package-overrides: - mx-state-codes ==1.0.0.0 - myers-diff ==0.3.0.2 - mysql ==0.2.1 - - mysql-haskell ==1.1.6 - - mysql-haskell-nem ==0.1.0.0 - mysql-json-table ==0.1.4.1 - mysql-simple ==0.4.9 - n-tuple ==0.0.3 @@ -1809,30 +1925,31 @@ default-package-overrides: - named-text ==1.2.1.0 - names-th ==0.3.0.1 - nano-erl ==0.1.0.1 - - NanoID ==3.4.0.2 + - NanoID ==3.4.1.1 - nanospec ==0.2.2 - - nanovg ==0.8.1.0 - nats ==1.1.2 - natural-arithmetic ==0.2.3.0 - natural-induction ==0.2.0.0 - natural-sort ==0.1.2 - natural-transformation ==0.4.1 - neat-interpolation ==0.5.1.4 + - nerd-font-icons ==0.1.0.0 - netcode-io ==0.0.3 - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 - netlib-ffi ==0.1.2 - netpbm ==1.0.4 - - netrc ==0.2.0.1 + - netrc ==0.2.0.2 - nettle ==0.3.1.1 - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.12 - - network ==3.2.7.0 + - network ==3.2.8.0 - network-bsd ==2.8.1.0 - network-byte-order ==0.1.7 - network-conduit-tls ==1.4.0.1 - network-control ==0.1.7 + - network-house ==0.1.0.3 - network-info ==0.2.1 - network-ip ==0.3.0.3 - network-messagepack-rpc ==0.1.2.0 @@ -1851,8 +1968,9 @@ default-package-overrides: - nfc ==0.1.1 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - - nix-derivation ==1.1.3 + - nix-narinfo ==0.1.1.2 - nix-paths ==1.0.1 + - no-recursion ==0.1.2.3 - no-value ==1.0.0.0 - NoHoed ==0.1.1 - non-empty ==0.3.5 @@ -1865,37 +1983,52 @@ default-package-overrides: - nonempty-vector ==0.2.4 - nonempty-zipper ==1.0.1.1 - normaldistribution ==1.1.0.3 - - nothunks ==0.3.0.0 + - nothunks ==0.3.1 - nowdoc ==0.1.1.0 - - nqe ==0.6.6 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-limits ==0.1.0.0 - numeric-prelude ==0.4.4 - numeric-quest ==0.2.0.2 - - numhask ==0.12.1.0 - - numhask-array ==0.11.1.0 - - numhask-space ==0.11.1.0 + - numhask ==0.13.1.0 + - numhask-space ==0.13.1.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.3 - - nuxeo ==0.3.2 - nvim-hs ==2.3.2.4 - nvim-hs-contrib ==2.0.0.2 - nvim-hs-ghcid ==2.0.1.0 - - nvvm ==0.10.0.1 - o-clock ==1.4.0.1 - ObjectName ==1.1.0.2 - oblivious-transfer ==0.1.0 - odbc ==0.3.0 - - ods2csv ==0.1.0.1 + - ods2csv ==0.1.0.2 + - oeis ==0.3.10.1 - oeis2 ==1.0.9 - ofx ==0.4.4.0 + - ogma-cli ==1.7.0 + - ogma-core ==1.7.0 + - ogma-extra ==1.7.0 + - ogma-language-c ==1.7.0 + - ogma-language-copilot ==1.7.0 + - ogma-language-csv ==1.7.0 + - ogma-language-jsonspec ==1.7.0 + - ogma-language-lustre ==1.7.0 + - ogma-language-smv ==1.7.0 + - ogma-language-xlsx ==1.7.0 + - ogma-language-xmlspec ==1.7.0 + - ogma-spec ==1.7.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.4 - - ollama-haskell ==0.1.3.0 - - om-elm ==2.0.1.0 + - ollama-haskell ==0.2.0.0 + - om-doh ==0.1.0.4 + - om-elm ==2.0.1.1 + - om-fail ==0.1.0.6 + - om-fork ==0.7.1.12 + - om-http ==0.5.0.1 + - om-logging ==1.1.0.10 - om-show ==0.1.2.11 + - om-time ==0.3.1.1 - once ==0.4 - one-liner ==2.1 - one-liner-instances ==0.1.3.0 @@ -1903,9 +2036,9 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - oops ==0.2.0.1 - - opaleye ==0.10.5.0 - - open-browser ==0.2.1.1 - - open-witness ==0.6 + - opaleye ==0.10.7.0 + - open-browser ==0.4.0.0 + - open-witness ==0.7 - OpenAL ==1.7.0.5 - openapi3 ==3.2.4 - openexr-write ==0.1.0.2 @@ -1920,14 +2053,14 @@ default-package-overrides: - opentelemetry-wai ==0.8.0 - operational ==0.2.4.2 - opml-conduit ==0.9.0.0 - - opt-env-conf ==0.8.0.0 + - opt-env-conf ==0.9.0.0 - optics ==0.4.2.1 - optics-core ==0.4.1.1 - optics-extra ==0.4.2.1 - optics-operators ==0.1.0.1 - optics-th ==0.4.1 - optics-vl ==0.2.1 - - optima ==0.4.0.5 + - optima ==0.4.0.7 - optional-args ==1.0.2 - options ==1.2.1.2 - optparse-applicative ==0.18.1.0 @@ -1937,8 +2070,6 @@ default-package-overrides: - optparse-text ==0.1.1.0 - ordered-containers ==0.2.4 - OrderedBits ==0.0.2.0 - - ormolu ==0.7.4.0 - - os-string ==2.0.7 - overhang ==1.0.0 - packcheck ==0.7.1 - pager ==0.1.1.0 @@ -1946,9 +2077,9 @@ default-package-overrides: - pagure ==0.2.1 - pagure-cli ==0.2.2 - palette ==0.3.0.4 - - pandoc ==3.6 - - pandoc-cli ==3.6 - - pandoc-lua-engine ==0.4.1.1 + - pandoc ==3.7.0.2 + - pandoc-cli ==3.7.0.2 + - pandoc-lua-engine ==0.4.3 - pandoc-lua-marshal ==0.3.1 - pandoc-plot ==1.9.1 - pandoc-server ==0.1.0.11 @@ -1961,6 +2092,7 @@ default-package-overrides: - parallel-io ==0.3.5 - parameterized ==0.5.0.0 - parameterized-utils ==2.1.10.0 + - paramtree ==0.1.2 - park-bench ==0.1.1.0 - parseargs ==0.2.0.9 - parsec-class ==1.0.1.0 @@ -1969,16 +2101,18 @@ default-package-overrides: - ParsecTools ==0.0.2.0 - parser-combinators ==1.3.0 - parser-combinators-tests ==1.3.0 + - parser-regex ==0.3.0.0 - parsers ==0.12.12 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.4.0 - - partial-order ==0.2.0.0 - - partialord ==0.0.2 + - partialord ==0.1.1 - password ==3.1.0.1 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 - - path ==0.9.5 + - patch ==0.0.8.4 + - path ==0.9.6 - path-binary-instance ==0.1.0.1 + - path-dhall-instance ==0.2.1.0 - path-extensions ==0.1.1.0 - path-extra ==0.3.1 - path-io ==1.8.2 @@ -1988,7 +2122,7 @@ default-package-overrides: - pathtype ==0.8.1.3 - pathwalk ==0.3.1.2 - patience ==0.3 - - patrol ==1.0.1.0 + - patrol ==1.1.0.0 - pava ==0.1.1.4 - pcg-random ==0.1.4.0 - pcre-heavy ==1.0.0.4 @@ -1999,36 +2133,35 @@ default-package-overrides: - pdf-toolbox-content ==0.1.2 - pdf-toolbox-core ==0.1.3 - pdf-toolbox-document ==0.1.4 - - peano ==0.1.0.2 + - peano ==0.1.0.3 - pedersen-commitment ==0.2.0 - pem ==0.2.4 - percent-format ==0.0.4 - - perf ==0.13.0.0 + - perf ==0.14.0.3 - perfect-hash-generator ==1.0.0 - persistable-record ==0.6.0.6 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.14.6.3 + - persistent ==2.17.1.0 - persistent-discover ==0.1.0.7 - persistent-documentation ==0.1.0.6 - persistent-lens ==1.0.0 - persistent-mongoDB ==2.13.1.0 - - persistent-mtl ==0.5.1 + - persistent-mtl ==0.5.2 - persistent-mysql ==2.13.1.5 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.6.2 - - persistent-qq ==2.12.0.6 + - persistent-postgresql ==2.13.7.0 + - persistent-qq ==2.12.0.7 - persistent-redis ==2.13.0.2 - - persistent-sqlite ==2.13.3.0 + - persistent-sqlite ==2.13.3.1 - persistent-template ==2.12.0.0 - - persistent-test ==2.13.1.3 + - persistent-test ==2.13.2.0 - persistent-typed-db ==0.1.0.7 - - pfile ==0.1.0.1 - pg-harness-client ==0.6.0 - pg-transact ==0.3.2.0 - phantom-state ==0.2.1.5 - - phatsort ==0.6.0.0 - pid1 ==0.1.3.1 - pinch ==0.5.2.0 + - pinecone ==1.0.0 - pipes ==4.3.16 - pipes-aeson ==0.4.2 - pipes-attoparsec ==0.6.0 @@ -2040,6 +2173,7 @@ default-package-overrides: - pipes-fastx ==0.3.0.0 - pipes-fluid ==0.6.0.1 - pipes-group ==1.0.12 + - pipes-http ==1.0.6 - pipes-mongodb ==0.1.0.0 - pipes-ordered-zip ==1.2.1 - pipes-parse ==3.0.9 @@ -2066,6 +2200,8 @@ default-package-overrides: - polysemy-fs ==0.1.0.0 - polysemy-plugin ==0.4.5.3 - polysemy-webserver ==0.2.1.2 + - pontarius-xmpp ==0.5.7.2 + - pontarius-xmpp-extras ==0.1.0.12 - pooled-io ==0.0.2.3 - port-utils ==0.2.1.0 - portable-lines ==0.1 @@ -2074,19 +2210,18 @@ default-package-overrides: - possibly ==1.0.0.0 - post-mess-age ==0.2.1.0 - postgres-options ==0.2.2.0 - - postgresql-binary ==0.14.0.1 + - postgresql-binary ==0.14.2 - postgresql-libpq ==0.11.0.0 - postgresql-libpq-configure ==0.11 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.8 - postgresql-schema ==0.1.14 - - postgresql-simple ==0.7.0.0 - - postgresql-simple-url ==0.2.1.0 - - postgresql-syntax ==0.4.1.2 + - postgresql-simple ==0.7.0.1 + - postgresql-syntax ==0.4.1.3 - postgresql-typed ==0.6.2.5 - pptable ==0.3.0.0 - pqueue ==1.5.0.0 - - prairie ==0.0.4.0 + - prairie ==0.1.0.0 - pred-set ==0.0.1 - prefix-units ==0.3.0.1 - prelude-compat ==0.0.0.2 @@ -2098,7 +2233,7 @@ default-package-overrides: - pretty-simple ==4.1.3.0 - pretty-sop ==0.2.0.3 - pretty-terminal ==0.1.0.0 - - prettychart ==0.2.2.0 + - prettychart ==0.3.0.2 - prettyclass ==1.0.0.0 - prettyprinter ==1.7.1 - prettyprinter-ansi-terminal ==1.1.3 @@ -2116,9 +2251,10 @@ default-package-overrides: - primitive-offset ==0.2.0.1 - primitive-serial ==0.1 - primitive-unaligned ==0.1.1.2 - - primitive-unlifted ==2.1.0.0 + - primitive-unlifted ==2.2.0.0 - print-console-colors ==0.1.0.0 - probability ==0.2.8 + - probability-polynomial ==1.0.0.1 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.4 - product-profunctors ==0.11.1.1 @@ -2129,12 +2265,12 @@ default-package-overrides: - prometheus-client ==1.1.1 - prometheus-metrics-ghc ==1.0.1.2 - promises ==0.3 + - prompt-hs ==1.0.3.1 - prospect ==0.1.0.0 - proto-lens ==0.7.1.6 - - proto-lens-arbitrary ==0.1.2.14 - proto-lens-optparse ==0.1.1.13 - - proto-lens-protobuf-types ==0.7.2.1 - - proto-lens-protoc ==0.8.0.1 + - proto-lens-protobuf-types ==0.7.2.2 + - proto-lens-protoc ==0.9.0.0 - proto-lens-runtime ==0.7.0.7 - proto-lens-setup ==0.4.0.9 - protobuf ==0.2.1.3 @@ -2143,30 +2279,35 @@ default-package-overrides: - protocol-radius-test ==0.1.0.1 - protolude ==0.3.5 - proxied ==0.3.2 + - pseudo-boolean ==0.1.12.0 - psql-helpers ==0.1.0.0 - - PSQueue ==1.2.1 - - psqueues ==0.2.8.1 + - PSQueue ==1.2.2 + - psqueues ==0.2.8.2 - pthread ==0.2.1 - ptr ==0.16.8.7 - ptr-poker ==0.1.2.16 - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 + - puresat ==0.1 - purescript-bridge ==0.15.0.0 - - pusher-http-haskell ==2.1.0.20 + - pusher-http-haskell ==2.1.0.21 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - PyF ==0.11.4.0 - qchas ==1.1.0.1 - quaalude ==0.0.0.1 - - quadratic-irrational ==0.1.1 + - quadratic-irrational ==0.1.2 + - quantizer ==0.4.0.0 - QuasiText ==0.1.2.6 + - queue-sheet ==0.8.0.1 - queues ==1.0.0 - quickbench ==1.0.1 - - QuickCheck ==2.14.3 + - QuickCheck ==2.15.0.1 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 + - quickcheck-dynamic ==4.0.1 - quickcheck-groups ==0.0.1.5 - quickcheck-higherorder ==0.1.0.1 - quickcheck-instances ==0.3.33 @@ -2174,7 +2315,8 @@ default-package-overrides: - quickcheck-monoid-subclasses ==0.3.0.6 - quickcheck-quid ==0.0.1.8 - quickcheck-simple ==0.1.1.1 - - quickcheck-state-machine ==0.10.1 + - quickcheck-special ==0.1.0.6 + - quickcheck-state-machine ==0.10.2 - quickcheck-text ==0.1.2.1 - quickcheck-transformer ==0.3.1.2 - quickcheck-unicode ==1.0.1.0 @@ -2196,8 +2338,8 @@ default-package-overrides: - random-tree ==0.6.0.5 - range ==0.3.0.2 - range-set-list ==0.1.4 - - ranged-list ==0.1.2.1 - - Ranged-sets ==0.4.0 + - ranged-list ==0.1.2.3 + - Ranged-sets ==0.5.0 - ranges ==0.2.4 - rank1dynamic ==0.4.3 - rank2classes ==1.5.4 @@ -2208,14 +2350,14 @@ default-package-overrides: - ratel-wai ==2.0.0.10 - ratio-int ==0.1.2 - rattle ==0.2 - - rattletrap ==14.1.3 - - Rattus ==0.5.1.1 + - rattletrap ==14.1.4 - raw-strings-qq ==1.1 - rawfilepath ==1.1.1 - rawstring-qm ==0.2.3.1 - rcu ==0.2.7 - rdf ==0.1.0.8 - rdtsc ==1.3.0.1 + - re2 ==0.3 - reactive-balsa ==0.4.0.1 - reactive-banana ==1.3.2.0 - reactive-banana-bunch ==1.0.0.1 @@ -2227,11 +2369,11 @@ default-package-overrides: - real-dice ==0.1.0.5 - rebase ==1.21.2 - rec-def ==0.2.2 - - record-dot-preprocessor ==0.2.17 - record-hasfield ==1.0.1 + - recover-rtti ==0.5.1 - recursion-schemes ==5.2.3 - recv ==0.1.1 - - redact ==0.5.0.0 + - redact ==0.6.0.0 - reddit-scrape ==0.0.1 - redis-glob ==0.1.0.11 - redis-resp ==1.0.0 @@ -2240,7 +2382,12 @@ default-package-overrides: - ref-tf ==0.5.0.1 - refact ==0.3.0.2 - refined ==0.8.2 + - refined-containers ==0.1.2.0 - reflection ==2.1.9 + - reflex ==0.9.3.4 + - reflex-dom-core ==0.8.1.4 + - reflex-fsnotify ==0.3.0.2 + - reflex-gadt-api ==0.2.2.3 - RefSerialize ==0.4.0 - regex ==1.1.0.2 - regex-applicative ==0.3.4 @@ -2254,9 +2401,6 @@ default-package-overrides: - regex-with-pcre ==1.1.0.2 - registry ==0.6.3.2 - registry-aeson ==0.3.1.2 - - registry-hedgehog ==0.8.2.2 - - registry-hedgehog-aeson ==0.3.1.2 - - regression-simple ==0.2.1 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.1 - relational-query ==0.12.3.1 @@ -2264,9 +2408,12 @@ default-package-overrides: - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.1 - reliable-io ==0.0.2 - - relude ==1.2.2.0 + - relude ==1.2.2.2 - renderable ==0.2.0.1 - reorder-expression ==0.1.0.2 + - repa ==3.4.2.0 + - repa-algorithms ==3.4.2.0 + - repa-io ==3.4.2.0 - replace-attoparsec ==1.5.0.0 - replace-megaparsec ==1.5.0.1 - repline ==0.4.3.0 @@ -2275,22 +2422,23 @@ default-package-overrides: - rerebase ==1.21.2 - rerefined ==0.8.0 - reroute ==0.7.0.0 - - resistor-cube ==0.0.1.4 - - resolv ==0.2.0.2 + - resolv ==0.2.0.3 - resource-pool ==0.4.0.0 - resourcet ==1.3.0 - rest-rewrite ==0.4.5 - result ==0.2.6.0 - retry ==0.9.3.1 + - rev-scientific ==0.2.1.0 - rev-state ==0.2.0.1 - rex ==0.6.2 - rfc1751 ==0.1.4 - rfc5051 ==0.2 - rg ==1.4.0.0 + - rhbzquery ==0.4.5 - rhine ==1.5 - - rhine-bayes ==1.5 - rhine-gloss ==1.5 - rhine-terminal ==1.5 + - rhythmic-sequences ==0.8.0.0 - riak-protobuf ==0.25.0.0 - richenv ==0.1.0.3 - rio ==0.1.22.0 @@ -2314,12 +2462,10 @@ default-package-overrides: - rrb-vector ==0.2.2.1 - RSA ==2.4.1 - rss ==3000.2.0.8 - - rss-conduit ==0.6.0.1 - - run-haskell-module ==0.0.2 - run-st ==0.1.3.3 - runmemo ==1.0.0.1 - rvar ==0.3.0.2 - - rzk ==0.7.5 + - rzk ==0.7.6 - s-cargot ==0.1.6.0 - s3-signer ==0.5.0.0 - safe ==0.3.21 @@ -2334,26 +2480,27 @@ default-package-overrides: - safe-gen ==1.0.1 - safe-json ==1.2.1.0 - safe-money ==0.9.1 - - safecopy ==0.10.4.2 + - safecopy ==0.10.4.3 - safeio ==0.0.6.0 - SafeSemaphore ==0.10.1 + - saltine ==0.2.2.0 - salve ==2.0.0.8 - sample-frame ==0.0.4 - sample-frame-np ==0.0.5 - sampling ==0.3.5 - samsort ==0.1.0.0 - sandi ==0.5 - - sandwich ==0.3.0.4 + - sandwich ==0.3.0.5 - sandwich-contexts ==0.3.0.3 - sandwich-hedgehog ==0.1.3.1 - - sandwich-quickcheck ==0.1.0.7 + - sandwich-quickcheck ==0.2.0.0 - sandwich-slack ==0.1.2.0 - sandwich-webdriver ==0.3.0.1 - - saturn ==1.0.0.8 + - saturn ==1.0.0.9 - say ==0.1.0.1 - sayable ==1.2.5.0 - - sbp ==6.2.1 - - sbv ==11.0 + - sbp ==6.2.2 + - sbv ==11.7 - scalpel ==0.6.2.2 - scalpel-core ==0.6.2.2 - scanf ==0.1.0.0 @@ -2364,10 +2511,16 @@ default-package-overrides: - scientist ==0.0.0.0 - scotty ==0.22 - scrypt ==0.5.0 + - sdl2 ==2.5.5.1 + - sdl2-gfx ==0.3.0.0 + - sdl2-image ==2.1.0.0 + - sdl2-mixer ==1.2.0.0 + - sdl2-ttf ==2.1.3 - search-algorithms ==0.3.4 - secp256k1-haskell ==1.4.6 - securemem ==0.1.10 - - select-rpms ==0.2.0 + - sel ==0.1.0.0 + - select-rpms ==0.3.1 - selections ==0.3.0.0 - selective ==0.7.0.1 - semialign ==1.3.1 @@ -2381,8 +2534,8 @@ default-package-overrides: - seqalign ==0.2.0.4 - seqid ==0.6.3 - seqid-streams ==0.7.2 - - sequence-formats ==1.10.0.0 - - sequenceTools ==1.5.3.1 + - sequence-formats ==1.11.0.2 + - sequenceTools ==1.6.0.0 - serialise ==0.2.6.1 - servant ==0.20.3.0 - servant-auth ==0.4.2.0 @@ -2411,7 +2564,6 @@ default-package-overrides: - servant-multipart-client ==0.12.2 - servant-openapi3 ==2.0.1.6 - servant-pipes ==0.16.1 - - servant-quickcheck ==0.1.1.0 - servant-rate-limit ==0.2.0.0 - servant-rawm ==1.0.0.0 - servant-server ==0.20.3.0 @@ -2419,37 +2571,37 @@ default-package-overrides: - servant-swagger ==1.2.1 - servant-swagger-ui ==0.3.5.5.0.1 - servant-swagger-ui-core ==0.3.5 + - servant-swagger-ui-redoc ==0.3.5 - servant-websockets ==2.0.0 - servant-xml ==1.0.3 - serversession ==1.0.3 - serversession-backend-acid-state ==1.0.5 - - serversession-backend-persistent ==2.0.3 - serversession-backend-redis ==1.0.5 - serversession-frontend-wai ==1.0.1 - serversession-frontend-yesod ==1.0.1 - servius ==1.2.3.0 - ses-html ==0.4.0.0 - set-cover ==0.1.1.1 - - set-monad ==0.3.0.0 - setenv ==0.1.1.3 - setlocale ==1.0.0.10 - sexp-grammar ==2.3.4.2 - SHA ==1.6.4.4 - shake ==0.19.8 - shake-plus ==0.3.4.0 - - shakespeare ==2.1.4 + - shakespeare ==2.1.0.1 - shakespeare-text ==1.1.0 - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - shell-utility ==0.1 - - shellify ==0.11.0.4 + - shellify ==0.14.0.2 - shellmet ==0.0.5.0 - shelltestrunner ==1.10 - - shellwords ==0.1.4.3 - - shelly ==1.12.1 + - shellwords ==0.1.4.4 + - shelly ==1.12.1.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.2.0.0 + - shower ==0.2.0.4 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5.4 @@ -2462,6 +2614,7 @@ default-package-overrides: - simple-expr ==0.1.1.0 - simple-media-timestamp ==0.2.1.0 - simple-media-timestamp-attoparsec ==0.1.0.0 + - simple-pango ==0.1.0.2 - simple-prompt ==0.2.3 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.32 @@ -2473,33 +2626,42 @@ default-package-overrides: - singleton-bool ==0.1.8 - singleton-nats ==0.4.7 - singletons ==3.0.4 - - singletons-base ==3.3 - - singletons-presburger ==0.7.4.0 - - singletons-th ==3.3 + - singletons-base ==3.4 + - singletons-presburger ==0.7.4.1 + - singletons-th ==3.4 - Sit ==0.2023.8.3 - sitemap-gen ==0.1.0.0 - size-based ==0.1.3.3 - sized ==1.1.0.2 - skein ==1.0.9.4 + - skeletest ==0.2.1 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.14.5 - - skylighting-core ==0.14.5 + - skylighting ==0.14.7 + - skylighting-core ==0.14.7 - skylighting-format-ansi ==0.1 - skylighting-format-blaze-html ==0.1.1.3 - skylighting-format-context ==0.1.0.2 - skylighting-format-latex ==0.1 + - skylighting-format-typst ==0.1 + - slack-web ==2.2.0.0 - slave-thread ==1.1.0.3 - slick ==1.3.1.0 - slist ==0.2.1.0 - slynx ==0.8.0.0 - smallcheck ==1.2.1.1 + - smith ==0.2.0.0 + - smtlib-backends ==0.4 + - smtlib-backends-process ==0.3 + - smtlib-backends-tests ==0.3 - smtp-mail ==0.5.0.0 - snap ==1.1.3.3 - snap-blaze ==0.2.1.5 - snap-core ==1.0.5.1 - snap-server ==1.1.2.1 + - snappy ==0.2.0.4 - snowflake ==0.1.1.1 + - socket ==0.8.3.0 - socks ==0.6.1 - solana-staking-csvs ==0.1.3.0 - some ==1.0.6 @@ -2511,6 +2673,8 @@ default-package-overrides: - sourcemap ==0.1.7 - sox ==0.2.3.2 - soxlib ==0.0.3.2 + - spacecookie ==1.0.0.3 + - spdx ==1.1 - special-values ==0.1.0.0 - speculate ==0.4.20 - specup ==0.2.0.6 @@ -2521,7 +2685,7 @@ default-package-overrides: - split ==0.2.5 - split-record ==0.1.1.4 - splitmix ==0.1.3.1 - - splitmix-distributions ==1.0.0 + - splitmix-distributions ==1.1.0 - Spock-api ==0.14.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.10 @@ -2530,9 +2694,9 @@ default-package-overrides: - sqlite-simple ==0.4.19.0 - squeather ==0.8.0.0 - srcloc ==0.6.0.1 - - srtree ==2.0.0.2 + - srtree ==2.0.1.5 - stache ==2.3.4 - - stack-all ==0.6.4 + - stack-all ==0.7.1 - stack-clean-old ==0.5.1 - stack-templatizer ==0.1.1.0 - stamina ==0.1.0.3 @@ -2545,8 +2709,9 @@ default-package-overrides: - static-text ==0.2.0.7 - statistics ==0.16.3.0 - statistics-linreg ==0.3 + - statsd-rupp ==0.5.0.1 - status-notifier-item ==0.3.1.0 - - step-function ==0.2.0.1 + - step-function ==0.2.1 - stitch ==0.6.0.0 - stm-chans ==3.0.0.9 - stm-conduit ==4.0.1 @@ -2556,9 +2721,10 @@ default-package-overrides: - stm-hamt ==1.2.1.1 - stm-split ==0.0.2.1 - stm-supply ==0.2.0.0 - - STMonadTrans ==0.4.8 + - STMonadTrans ==0.4.8.1 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6.1 + - storable-generic ==0.1.0.5 - storable-hetero-list ==0.1.0.4 - storable-peek-poke ==0.1.0.2 - storable-record ==0.0.7 @@ -2566,14 +2732,19 @@ default-package-overrides: - storablevector ==0.2.13.2 - store ==0.7.20 - store-core ==0.4.4.7 + - store-streaming ==0.2.0.5 - stratosphere ==0.60.0 - Stream ==0.4.7.2 - streaming ==0.2.4.0 - streaming-attoparsec ==1.0.0.1 + - streaming-binary ==0.3.0.1 - streaming-bytestring ==0.3.4 - streaming-commons ==0.2.3.0 - streaming-wai ==0.1.1 + - streamly ==0.10.1 + - streamly-bytestring ==0.2.3 - streamly-core ==0.2.3 + - streamly-process ==0.3.1 - streams ==3.3.3 - strict ==0.5.1 - strict-base-types ==0.8.1 @@ -2582,33 +2753,37 @@ default-package-overrides: - strict-list ==0.1.7.6 - strict-mutable-base ==1.1.0.0 - strict-tuple ==0.1.5.4 - - strict-wrapper ==0.0.1.0 + - strict-wrapper ==0.0.2.0 - string-class ==0.1.7.2 - string-combinators ==0.6.0.5 - string-conv ==0.2.0 - string-conversions ==0.4.0.1 - string-interpolate ==0.3.4.0 - string-qq ==0.0.6 + - string-random ==0.1.4.5 - string-transform ==1.1.1 - string-variants ==0.3.1.1 - stringable ==0.1.3 - stringbuilder ==0.5.1 - stringprep ==1.0.0 - stringsearch ==0.3.6.6 - - strive ==6.0.0.12 - - strongweak ==0.11.0 + - strive ==6.0.0.17 + - strongweak ==0.12.0 - structs ==0.1.9 - - structured ==0.1.1 - - stylish-haskell ==0.14.6.0 - - subcategories ==0.2.1.1 + - stylish-haskell ==0.15.1.0 + - subcategories ==0.2.1.2 - sundown ==0.6 - svg-builder ==0.1.1 - svg-tree ==0.6.2.4 - - SVGFonts ==1.8.0.1 + - SVGFonts ==1.8.1 - swagger2 ==2.8.10 - swish ==0.10.10.0 + - swizzle ==0.1.0.4 + - swizzle-lens ==0.1.0.0 + - swizzle-modify ==0.1.0.0 + - swizzle-set ==0.2.0.0 - syb ==0.7.2.4 - - sydtest ==0.19.0.0 + - sydtest ==0.20.0.0 - sydtest-aeson ==0.2.0.1 - sydtest-amqp ==0.1.0.0 - sydtest-autodocodec ==0.0.0.0 @@ -2629,6 +2804,7 @@ default-package-overrides: - sydtest-webdriver-yesod ==0.0.0.1 - sydtest-yesod ==0.3.0.3 - symbol ==0.2.4.1 + - symbolize ==1.0.3.1 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 - symparsec ==1.1.1 @@ -2643,9 +2819,10 @@ default-package-overrides: - system-info ==0.5.2 - system-linux-proc ==0.1.1.1 - systemd ==2.4.0 + - table-layout ==1.0.0.2 - tabular ==0.2.2.8 - tagchup ==0.4.1.2 - - tagged ==0.8.8 + - tagged ==0.8.9 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.5 - tagged-transformer ==0.8.3 @@ -2653,14 +2830,13 @@ default-package-overrides: - tagstream-conduit ==0.5.6 - tao ==1.0.0 - tao-example ==1.0.0 - - tar ==0.6.3.0 + - tar ==0.6.4.0 - tar-conduit ==0.4.1 - tardis ==0.5.0 - tasty ==1.5.3 - tasty-ant-xml ==1.1.9 - tasty-autocollect ==0.4.4 - tasty-bench ==0.4.1 - - tasty-bench-fit ==0.1.1 - tasty-checklist ==1.0.6.0 - tasty-dejafu ==2.1.0.2 - tasty-discover ==5.0.2 @@ -2679,11 +2855,11 @@ default-package-overrides: - tasty-lua ==1.1.1.1 - tasty-papi ==0.1.2.0 - tasty-program ==1.1.0 - - tasty-quickcheck ==0.11 + - tasty-quickcheck ==0.11.1 - tasty-rerun ==1.1.20 - - tasty-silver ==3.3.2 + - tasty-silver ==3.3.2.1 - tasty-smallcheck ==0.8.2 - - tasty-sugar ==2.2.2.0 + - tasty-sugar ==2.2.2.1 - tasty-tap ==0.1.0 - tasty-th ==0.1.7 - tasty-wai ==0.1.2.0 @@ -2700,7 +2876,7 @@ default-package-overrides: - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - - tensort ==1.0.1.4 + - tensort ==1.1.0.0 - termbox ==2.0.0.2 - termbox-banana ==2.0.0.1 - termbox-bindings-c ==0.1.0.2 @@ -2709,7 +2885,6 @@ default-package-overrides: - terminal ==0.2.0.0 - terminal-progress-bar ==0.4.2 - terminal-size ==0.3.4 - - termonad ==4.6.0.0 - test-certs ==0.1.1.1 - test-framework ==0.8.2.2 - test-framework-hunit ==0.3.0.2 @@ -2719,13 +2894,17 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.10.1 + - texmath ==0.12.10.3 - text-ansi ==0.3.0.1 - text-binary ==0.2.1.1 - - text-builder ==0.6.10 - - text-builder-dev ==0.3.10 + - text-builder ==1.0.0.4 + - text-builder-core ==0.1.1.1 + - text-builder-dev ==0.4 - text-builder-linear ==0.1.3 - text-conversions ==0.3.1.1 + - text-convert ==0.1.0.1 + - text-display ==1.0.0.0 + - text-encode ==0.2.0.0 - text-icu ==0.8.0.5 - text-iso8601 ==0.1.1 - text-latin1 ==0.3.1 @@ -2736,7 +2915,7 @@ default-package-overrides: - text-postgresql ==0.0.3.1 - text-printer ==0.5.0.2 - text-regex-replace ==0.1.1.5 - - text-rope ==0.2 + - text-rope ==0.3 - text-short ==0.1.6 - text-show ==3.11.2 - text-show-instances ==3.9.10 @@ -2750,7 +2929,7 @@ default-package-overrides: - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.3.1 - th-deepstrict ==0.1.1.0 - - th-desugar ==1.16 + - th-desugar ==1.17 - th-env ==0.1.1 - th-expand-syns ==0.4.12.0 - th-extras ==0.0.0.8 @@ -2775,10 +2954,12 @@ default-package-overrides: - threads ==0.5.1.8 - threads-extras ==0.1.0.3 - threepenny-gui ==0.9.4.2 - - tidal ==1.9.5 - - tidal-link ==1.0.3 + - thyme ==0.4.1 + - tidal ==1.10.1 + - tidal-core ==1.10.1 + - tidal-link ==1.2.0 - tile ==0.3.0.0 - - time-compat ==1.9.7 + - time-compat ==1.9.8 - time-domain ==0.1.0.5 - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 @@ -2797,18 +2978,19 @@ default-package-overrides: - timezone-series ==0.1.13 - titlecase ==1.0.1 - tldr ==0.9.2 - - tls ==2.1.1 + - tls ==2.1.8 - tls-session-manager ==0.0.8 - tlynx ==0.8.0.0 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-proc ==0.7.2.2 - tmp-proc-postgres ==0.7.2.4 + - tmp-proc-rabbitmq ==0.7.2.4 - tmp-proc-redis ==0.7.2.4 - token-bucket ==0.1.0.1 - tokenize ==0.3.0.1 - toml-parser ==2.0.1.2 - - toml-reader ==0.2.2.0 + - toml-reader ==0.3.0.0 - toml-reader-parse ==0.1.1.1 - tomland ==1.3.3.3 - tools-yj ==0.1.0.45 @@ -2829,9 +3011,8 @@ default-package-overrides: - trifecta ==2.1.4 - trimdent ==0.1.0.0 - trivial-constraint ==0.7.0.0 - - true-name ==0.2.0.0 - tsv2csv ==0.1.0.2 - - ttc ==1.4.0.0 + - ttc ==1.5.0.0 - ttrie ==0.1.2.2 - tuple ==0.3.0.2 - tuple-sop ==0.3.1.0 @@ -2859,15 +3040,15 @@ default-package-overrides: - type-rig ==0.1 - type-set ==0.1.0.0 - type-spec ==0.4.0.0 - - typecheck-plugin-nat-simple ==0.1.0.9 + - typecheck-plugin-nat-simple ==0.1.0.11 - typed-process ==0.2.13.0 - typed-uuid ==0.2.0.0 - typelevel-tools-yj ==0.1.0.9 - typelits-witnesses ==0.4.1.0 - typenums ==0.1.4 - typography-geometry ==1.0.1.0 - - typst ==0.6.1 - - typst-symbols ==0.1.7 + - typst ==0.8.0.2 + - typst-symbols ==0.1.8.1 - tz ==0.1.3.6 - tzdata ==0.2.20250115.0 - tztime ==0.1.1.0 @@ -2881,6 +3062,7 @@ default-package-overrides: - unboxing-vector ==0.2.0.0 - uncaught-exception ==0.1.0 - uncertain ==0.4.0.1 + - unconditional-jump ==1.0.0 - unconstrained ==0.1.0.2 - unexceptionalio ==0.5.1 - unexceptionalio-trans ==0.5.2 @@ -2891,16 +3073,16 @@ default-package-overrides: - unicode-transforms ==0.4.0.1 - unidecode ==0.1.0.4 - unification-fd ==0.12.0.2 - - union ==0.1.2 + - union ==0.1.3 - union-angle ==0.1.0.1 - - union-color ==0.1.2.1 + - union-color ==0.1.4.0 - union-find-array ==0.1.0.4 - unipatterns ==0.0.0.0 - uniplate ==1.6.13 - uniq-deep ==1.2.1 - - unique ==0.0.1 - unique-logic ==0.4.0.1 - - unique-logic-tf ==0.5.1 + - unique-logic-tf ==0.5.1.1 + - uniqueness-periods-vector-stats ==0.4.0.0 - unit-constraint ==0.0.0 - units ==2.4.1.5 - units-defs ==2.2.1 @@ -2911,26 +3093,24 @@ default-package-overrides: - universe-instances-extended ==1.1.4 - universe-reverse-instances ==1.1.2 - universe-some ==1.2.2 - - universum ==1.8.2.2 - unix-bytestring ==0.4.0.3 - - unix-compat ==0.7.4 + - unix-compat ==0.7.4.1 - unix-time ==0.4.17 - unjson ==0.15.4 - unlifted ==0.2.3.0 - unliftio ==0.2.25.1 - unliftio-core ==0.2.1.0 - unliftio-path ==0.0.2.0 - - unliftio-pool ==0.4.3.0 + - unliftio-pool ==0.4.3.1 - unliftio-streams ==0.2.0.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.20 - unsafe ==0.0 - - uri-bytestring ==0.3.3.1 + - uri-bytestring ==0.4.0.1 - uri-bytestring-aeson ==0.1.0.9 - uri-encode ==1.5.0.7 - url ==2.1.3 - urlpath ==11.0.2 - - userid ==0.1.3.8 - users ==0.5.0.0 - users-test ==0.5.0.1 - utf8-light ==0.4.4.0 @@ -2959,8 +3139,10 @@ default-package-overrides: - validity-uuid ==0.1.0.3 - validity-vector ==0.2.0.3 - valor ==1.0.0.0 + - vary ==0.1.1.3 - varying ==0.8.1.0 - vault ==0.3.1.5 + - vcr ==0.1.0 - vcs-ignore ==0.0.2.0 - vec ==0.5.1 - vector ==0.13.2.0 @@ -2969,18 +3151,22 @@ default-package-overrides: - vector-buffer ==0.4.1 - vector-builder ==0.3.8.6 - vector-bytes-instances ==0.1.1 - - vector-extras ==0.2.8.2 + - vector-extras ==0.3 + - vector-fftw ==0.1.4.1 - vector-hashtables ==0.1.2.1 - vector-instances ==3.4.3 - vector-mmap ==0.0.3 + - vector-quicksort ==0.2 - vector-rotcev ==0.1.0.2 - vector-sized ==1.6.1 - - vector-space ==0.16 + - vector-space ==0.19 - vector-split ==1.0.0.4 - vector-stream ==0.1.0.1 - vector-th-unbox ==0.2.2 + - verbosity ==0.4.0.0 - verset ==0.0.1.11 - versions ==6.0.8 + - vessel ==0.3.0.2 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -2990,10 +3176,10 @@ default-package-overrides: - vivid-osc ==0.5.0.0 - vivid-supercollider ==0.4.1.2 - void ==0.7.3 - - vty ==6.2 + - vty ==6.4 - vty-crossplatform ==0.4.0.0 - vty-unix ==0.2.0.0 - - vty-windows ==0.2.0.4 + - vty-windows ==0.2.0.3 - wai ==3.2.4 - wai-app-static ==3.1.9 - wai-cli ==0.2.3 @@ -3001,7 +3187,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.16 + - wai-extra ==3.1.18 - wai-feature-flags ==0.1.0.8 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.5.0 @@ -3024,23 +3210,25 @@ default-package-overrides: - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.4.8 - - warp-tls ==3.4.9 + - warp ==3.4.9 + - warp-tls ==3.4.13 - wave ==0.2.1 - wcwidth ==0.0.2 - - web-rep ==0.12.3.0 + - web-cookiejar ==0.1.3.0 + - web-rep ==0.14.0.0 - web-routes ==0.27.16 - - web-routes-boomerang ==0.28.4.5 - - web-routes-th ==0.22.8.2 + - web-routes-th ==0.22.8.3 + - web-view ==0.7.0 - webdriver ==0.12.0.1 + - webdriver-precore ==0.1.0.2 - webdriver-wrapper ==0.2.0.1 - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 - - webgear-core ==1.3.1 - - webgear-openapi ==1.3.1 - - webgear-server ==1.3.1 - - webgear-swagger ==1.3.1 - - webgear-swagger-ui ==1.3.1 + - webgear-core ==1.4.0 + - webgear-openapi ==1.4.0 + - webgear-server ==1.4.0 + - webgear-swagger ==1.4.0 + - webgear-swagger-ui ==1.4.0 - webpage ==0.0.5.1 - webrtc-vad ==0.1.0.3 - websockets ==0.13.0.0 @@ -3050,24 +3238,24 @@ default-package-overrides: - welford-online-mean-variance ==0.2.0.0 - what4 ==1.6.3 - wherefrom-compat ==0.1.1.1 - - wide-word ==0.1.7.1 + - which ==0.2.0.3 + - wide-word ==0.1.8.1 - wild-bind ==0.1.2.12 - wild-bind-x11 ==0.2.0.17 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.2.4.0 - - with-location ==0.1.0 + - witch ==1.3.0.6 - with-utf8 ==1.1.0.0 - withdependencies ==0.3.1 - witherable ==0.5 - within ==0.2.0.1 - - witness ==0.6.2 + - witness ==0.7 - wizards ==1.0.3 - wkt-types ==0.1.0.0 - wl-pprint ==1.2.1 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-text ==1.2.0.2 - - wled-json ==0.0.1.1 + - wled-json ==0.1.0.0 - word-compat ==0.0.6 - word-trie ==0.3.0 - word-wrap ==0.5 @@ -3079,7 +3267,7 @@ default-package-overrides: - wreq-stringless ==0.5.9.1 - writer-cps-transformers ==0.5.6.1 - ws ==0.0.6 - - wuss ==2.0.2.0 + - wuss ==2.0.2.5 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -3088,15 +3276,16 @@ default-package-overrides: - xdg-desktop-entry ==0.1.1.2 - xdg-userdirs ==0.1.0.2 - xeno ==0.6 + - xls ==0.1.3 - xlsx ==1.1.4 - xml ==1.3.14 - xml-basic ==0.1.3.3 - - xml-conduit ==1.9.1.4 - - xml-conduit-writer ==0.1.1.5 + - xml-conduit ==1.10.0.1 - xml-hamlet ==0.5.0.2 - xml-helpers ==1.0.0 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 + - xml-parser ==0.1.1.2 - xml-picklers ==0.3.6 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 @@ -3109,11 +3298,16 @@ default-package-overrides: - xmonad-contrib ==0.18.1 - xor ==0.0.1.3 - xss-sanitize ==0.3.7.2 - - xxhash-ffi ==0.3 + - xxhash-ffi ==0.3.1 - yaml ==0.11.11.2 - - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.12 + - yaml-unscrambler ==0.1.0.20 + - Yampa ==0.15 - yarn-lock ==0.6.5 + - yaya ==0.6.2.3 + - yaya-containers ==0.1.2.2 + - yaya-hedgehog ==0.3.0.5 + - yaya-quickcheck ==0.2.0.3 + - yaya-unsafe ==0.4.1.4 - yes-precure5-command ==5.5.3 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 @@ -3122,8 +3316,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.4.0 - yesod-bin ==1.6.2.3 - - yesod-core ==1.6.27.0 - - yesod-csp ==0.2.6.0 + - yesod-core ==1.6.27.1 - yesod-eventsource ==1.6.0.1 - yesod-form ==1.7.9 - yesod-form-bootstrap4 ==3.0.1.1 @@ -3138,7 +3331,7 @@ default-package-overrides: - yesod-routes-flow ==3.0.0.2 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - - yesod-test ==1.6.16 + - yesod-test ==1.6.19 - yesod-websockets ==0.3.0.3 - yggdrasil-schema ==1.0.0.6 - yi ==0.19.3 @@ -3157,16 +3350,18 @@ default-package-overrides: - yjtools ==0.9.18 - yoga ==0.0.0.8 - youtube ==0.2.1.1 + - zenacy-html ==2.1.2 + - zenacy-unicode ==1.0.3 - zenc ==0.1.2 - zeromq4-haskell ==0.8.0 - zeromq4-patterns ==0.3.1.0 - zigzag ==0.1.0.0 - zim-parser ==0.2.1.0 - - zip ==2.1.0 + - zip ==2.2.1 - zip-archive ==0.4.3.2 - zip-stream ==0.2.2.0 - zippers ==0.3.2 - - zlib ==0.7.1.0 + - zlib ==0.7.1.1 - zlib-bindings ==0.1.1.5 - zlib-clib ==1.3.1 - zot ==0.0.3 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 41803d6cd10e8..c90f169b77bd6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -12,10 +12,20 @@ dont-distribute-packages: - ac-machine-conduit - accelerate-arithmetic - accelerate-fourier + - accelerate-io + - accelerate-io-array + - accelerate-io-bmp + - accelerate-io-bytestring + - accelerate-io-cereal + - accelerate-io-JuicyPixels + - accelerate-io-repa + - accelerate-io-serialise + - accelerate-io-vector - accelerate-llvm - accelerate-llvm-native - accelerate-typelits - access-token-provider + - acme-circular-containers - acme-php - acme-safe - activehs @@ -57,7 +67,6 @@ dont-distribute-packages: - AlignmentAlgorithms - alloy-proxy-fd - alms - - alpha - alsa-gui - alsa-pcm-tests - alsa-seq-tests @@ -119,8 +128,13 @@ dont-distribute-packages: - arithmetic-circuits - array-forth - arraylist + - arx + - ascii - ascii-cows + - ascii-numbers + - ascii-superset - ascii-table + - ascii-th - asic - ASN1 - assert4hs @@ -135,13 +149,11 @@ dont-distribute-packages: - atlassian-connect-core - atmos-dimensional-tf - atom-msp430 - - atomic-css - atomic-primops-foreign - atp - attenuation-profunctors - AttoJson - attoparsec-enumerator - - attoparsec-isotropic - attoparsec-iteratee - attoparsec-text-enumerator - atuin @@ -158,7 +170,6 @@ dont-distribute-packages: - aviation-cessna172-weight-balance - aviation-navigation - aviation-weight-balance - - AvlTree - awesomium - awesomium-glut - aws-configuration-tools @@ -194,13 +205,11 @@ dont-distribute-packages: - bamboo-plugin-photo - bamboo-theme-blueprint - bamboo-theme-mini-html5 - - bamse - bamstats - barley - Barracuda - base32-bytestring - baserock-schema - - base_4_21_0_0 - BASIC - basic - batchd @@ -232,6 +241,7 @@ dont-distribute-packages: - binary-file - binary-protocol-zmq - binary-streams + - binary-tagged - binding-gtk - binding-wx - bindings-apr-util @@ -268,6 +278,7 @@ dont-distribute-packages: - birch-beer - bird - BirdPP + - bisc - biscuit-servant - bishbosh - bit-array @@ -280,9 +291,12 @@ dont-distribute-packages: - Bitly - bitly-cli - bitmaps + - bits-extra - bittorrent - bla - blakesum-demo + - Blammo + - Blammo-wai - BlastHTTP - blastxml - blatex @@ -292,6 +306,7 @@ dont-distribute-packages: - blink1 - blip - Blobs + - blockio - blogination - BlogLiterately-diagrams - bloxorz @@ -321,6 +336,7 @@ dont-distribute-packages: - bricks-parsec - bricks-rendering - bricks-syntax + - brillo-examples - bronyradiogermany-streaming - btc-lsp - btree @@ -333,6 +349,7 @@ dont-distribute-packages: - buster-gtk - buster-network - butterflies + - bv-little - bytable - bytestring-read - bytetrie @@ -417,6 +434,7 @@ dont-distribute-packages: - cheapskate-highlight - cheapskate-terminal - check-pvp + - chessIO - chevalier-common - chiasma-test - chitauri @@ -463,10 +481,8 @@ dont-distribute-packages: - clickhouse-haskell - clifford - clippings - - clod - cloud-haskell - cloud-seeder - - cloudevents-haskell - cloudyfs - clr-bindings - clr-inline @@ -498,6 +514,7 @@ dont-distribute-packages: - color-counter - colorless-http-client - colorless-scotty + - colour-accelerate - colour-space - columbia - columnar @@ -510,6 +527,7 @@ dont-distribute-packages: - comonad-random - ComonadSheet - compact-mutable + - compdata-automata - compdoc - compdoc-dhall-decoder - complexity @@ -539,10 +557,14 @@ dont-distribute-packages: - conduit-throttle - conduit-vfs-zip - confcrypt + - conferer-aeson + - conferer-dhall + - conferer-hedis - conferer-provider-dhall - conferer-provider-yaml - conferer-source-dhall - conferer-source-yaml + - conferer-yaml - conffmt - confide - config-select @@ -561,8 +583,6 @@ dont-distribute-packages: - container - containers-accelerate - content-store - - continuum - - continuum-client - control - control-monad-attempt - control-monad-exception @@ -573,7 +593,6 @@ dont-distribute-packages: - conversion-text - conversions - convert - - convert-annotation - convertible-ascii - convertible-text - coordinate @@ -606,6 +625,9 @@ dont-distribute-packages: - crf-chain2-tiers - criu-rpc - cron-compat + - crucible-llvm + - crux + - crux-llvm - crypto-classical - crypto-conduit - crypto-pubkey @@ -656,6 +678,7 @@ dont-distribute-packages: - datadog-tracing - datafix - dataflow + - dataframe_0_3_0_4 - datasets - date-conversions - dbjava @@ -692,6 +715,7 @@ dont-distribute-packages: - definitive-parser - definitive-reactive - definitive-sound + - defun - deka-tests - delicious - delimited-text @@ -717,6 +741,7 @@ dont-distribute-packages: - dfinity-radix-tree - dhall-lex - dhall-secret + - dhscanner-kbgen - dia-functions - diagrams-html5 - diagrams-wx @@ -745,7 +770,7 @@ dont-distribute-packages: - distribution-plot - dixi - dl-fedora - - dl-fedora_2_0_1 + - dl-fedora_2_1 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -761,6 +786,7 @@ dont-distribute-packages: - DocTest - dojang - DOM + - dom-parser - domaindriven - dormouse-client - dovetail @@ -809,6 +835,7 @@ dont-distribute-packages: - EditTimeReport - effect-monad - effective-aspects-mzv + - effects-parser - egison - egison-quote - egison-tutorial @@ -882,7 +909,6 @@ dont-distribute-packages: - exference - exist - exist-instances - - expand - expat-enumerator - expiring-containers - explicit-iomodes-bytestring @@ -895,6 +921,7 @@ dont-distribute-packages: - extensible-skeleton - extract-dependencies - factual-api + - fadno - FailureT - fair - fallingblocks @@ -948,12 +975,12 @@ dont-distribute-packages: - findhttp - finitary-derive - finite-table + - FiniteCategories - FiniteMap - firstify - FirstOrderTheory - fishfood - fix-parser-simple - - fixed-generic - fixed-point-vector - fixed-point-vector-space - fixhs @@ -1003,9 +1030,12 @@ dont-distribute-packages: - Frank - freckle-app - freckle-ecs + - freckle-exception - freckle-http + - freckle-kafka - freckle-memcached - freckle-otel + - freckle-prelude - freckle-stats - free-functors - free-game @@ -1023,6 +1053,7 @@ dont-distribute-packages: - frpnow-gtk - frpnow-gtk3 - frpnow-vty + - fs-sim - ftdi - ftp-client-conduit - FTPLine @@ -1038,6 +1069,7 @@ dont-distribute-packages: - functor-monad - funflow - funflow-nix + - fungll-combinators - funion - funsat - fwgl-glfw @@ -1081,21 +1113,23 @@ dont-distribute-packages: - getemx - ghc-debugger - ghc-dump-util - - ghc-experimental - ghc-imported-from - ghc-instances - ghc-mod - ghc-plugs-out - ghc-session + - ghci-pretty - ghcjs-dom-webkit - ghcjs-hplay - ght - gi-cairo-again - gi-ges - gi-gstpbutils + - gi-gtk-declarative-app-simple - git-config - git-fmt - git-gpush + - git-monitor - git-object - git-remote-ipfs - git-sanity @@ -1103,7 +1137,10 @@ dont-distribute-packages: - github-data - github-webhook-handler-snap - gitlib-cross + - gitlib-libgit2 - gitlib-s3 + - gitlib-sample + - gitlib-test - gitson - givegif - gladexml-accessor @@ -1112,6 +1149,7 @@ dont-distribute-packages: - glazier-react - glazier-react-examples - glazier-react-widget + - glean - GLFW-OGL - GLFW-task - global @@ -1123,7 +1161,7 @@ dont-distribute-packages: - gloss-raster-accelerate - gloss-sodium - gltf-loader - - gmap + - glue-example - gmndl - gnome-desktop - gnomevfs @@ -1135,6 +1173,7 @@ dont-distribute-packages: - goatee-gtk - google-drive - google-mail-filters + - google-maps-geocoding - GoogleDirections - googleplus - GoogleSB @@ -1155,10 +1194,6 @@ dont-distribute-packages: - GPipe-TextureLoad - gps - gps2htmlReport - - gpu-vulkan - - gpu-vulkan-khr-surface - - gpu-vulkan-khr-surface-glfw - - gpu-vulkan-khr-swapchain - GPX - grab-form - graflog @@ -1192,7 +1227,6 @@ dont-distribute-packages: - gridland - grisette - grisette-monad-coroutine - - grisette_0_13_0_0 - gross - groundhog-converters - groundhog-inspector @@ -1214,6 +1248,7 @@ dont-distribute-packages: - gtfs - gtfs-realtime - gtk-serialized-event + - gtk-sni-tray - gtk2hs-cast-glade - gtk2hs-cast-gnomevfs - gtk2hs-cast-gtk @@ -1227,7 +1262,6 @@ dont-distribute-packages: - guarded-rewriting - GuiHaskell - GuiTV - - H - h3spec - habit - hablo @@ -1304,6 +1338,7 @@ dont-distribute-packages: - HasGP - hash-addressed - hash-addressed-cli + - hashable-accelerate - Hashell - hashflare - hask-home @@ -1315,6 +1350,8 @@ dont-distribute-packages: - haskell-admin-managed-functions - haskell-aliyun - haskell-bitmex-client + - haskell-debug-adapter + - haskell-debugger - haskell-docs - haskell-eigen-util - haskell-ftp @@ -1384,10 +1421,10 @@ dont-distribute-packages: - haskus-web - haslo - hasloGUI - - hasmtlib - hasql-postgres - hasql-postgres-options - hasql-queue + - hasql-streams-core - hasql-streams-example - hastache-aeson - haste-app @@ -1486,6 +1523,7 @@ dont-distribute-packages: - hgeometry-ipe - hgeometry-svg - hgithub + - hgraph - hiccup - hie-core - hierarchical-clustering-diagrams @@ -1516,6 +1554,7 @@ dont-distribute-packages: - hist-pl-lmf - hit - hit-graph + - hjpath - HJScript - hjsonschema - hjugement-cli @@ -1534,6 +1573,8 @@ dont-distribute-packages: - hmeap - hmeap-utils - hmep + - HMock + - hMPC - hmt-diagrams - HNM - hnormalise @@ -1547,6 +1588,7 @@ dont-distribute-packages: - Holumbus-Storage - holy-project - hommage + - homotuple - HongoDB - hood - hoodie @@ -1561,6 +1603,7 @@ dont-distribute-packages: - hoppy-docs - hoppy-runtime - hoppy-std + - horde-ad - hotswap - hp2any-graph - hp2any-manager @@ -1579,7 +1622,6 @@ dont-distribute-packages: - HPong - hpqtypes-effectful - hpqtypes-extras - - hpqtypes-extras_1_18_0_0 - hprotoc - hprotoc-fork - hps @@ -1626,9 +1668,7 @@ dont-distribute-packages: - hscassandra - hscope - hsdev - - hsec-core - Hsed - - hsendxmpp - hsfacter - HSGEP - HSHHelpers @@ -1692,15 +1732,20 @@ dont-distribute-packages: - huzzy - hw-all - hw-balancedparens + - hw-bits - hw-eliasfano - hw-excess + - hw-int + - hw-ip - hw-json - hw-json-demo - hw-json-lens - hw-json-simple-cursor - hw-json-standard-cursor + - hw-kafka-avro - hw-rankselect - hw-simd + - hw-streams - hw-succinct - hw-uri - hworker-ses @@ -1740,8 +1785,8 @@ dont-distribute-packages: - ifscs - ige-mac-integration - igrf - - ihaskell-inline-r - ihaskell-rlangqq + - ihaskell-symtegration - ihttp - imap - imbib @@ -1796,12 +1841,12 @@ dont-distribute-packages: - ipatch - ipc - ipld-cid + - ipprint - iptadmin - irc-fun-bot - irc-fun-client - irc-fun-color - irc-fun-messages - - iri-orphans - ironforge - isevaluated - ismtp @@ -1851,6 +1896,7 @@ dont-distribute-packages: - jordan-servant-client - jordan-servant-openapi - jordan-servant-server + - jsaddle-webkitgtk - jsc - JsContracts - jsmw @@ -1926,16 +1972,15 @@ dont-distribute-packages: - kit - kmeans-par - kmeans-vector - - knead - knit-haskell - koji-install - koji-tool - - koji-tool_1_3 - korfu - ks-test - kubernetes-client - kure-your-boilerplate - kurita + - kvitable - laborantin-hs - labsat - labyrinth @@ -1964,8 +2009,8 @@ dont-distribute-packages: - lame-tester - landlock - lang - - langchain-hs - language-ats + - language-avro - language-boogie - language-ecmascript-analysis - language-eiffel @@ -2022,7 +2067,6 @@ dont-distribute-packages: - libraft - librarian - librato - - libssh2-conduit - libxml-enumerator - lifted-base-tf - lightning-haskell @@ -2043,16 +2087,11 @@ dont-distribute-packages: - liquid-base - liquid-bytestring - liquid-containers - - liquid-ghc-prim - - liquid-parallel - liquid-platform - - liquid-prelude - - liquid-vector - - liquidhaskell - - liquidhaskell-boot - liquidhaskell-cabal-demo - list-t-attoparsec - list-t-html-parser + - list-tuple - listenbrainz-client - ListT - liszt @@ -2063,7 +2102,6 @@ dont-distribute-packages: - llvm-base-types - llvm-base-util - llvm-data-interop - - llvm-dsl - llvm-general - llvm-general-quote - llvm-hs-pretty @@ -2104,6 +2142,7 @@ dont-distribute-packages: - lrucaching-haxl - ls-usb - LslPlus + - lsm-tree - lsystem - luachunk - lucid-colonnade @@ -2146,6 +2185,7 @@ dont-distribute-packages: - manatee-template - manatee-terminal - manatee-welcome + - mangle - mangopay - mangrove - manifold-random @@ -2154,6 +2194,7 @@ dont-distribute-packages: - markdown-pap - markdown2svg - markov-processes + - markup-preview - marmalade-upload - marquise - marvin @@ -2192,13 +2233,17 @@ dont-distribute-packages: - metar - metar-http - Metrics + - metro + - metro-socket + - metro-transport-crypto + - metro-transport-websockets + - metro-transport-xor - metronome - MFlow - Mhailist - Michelangelo - micro-gateway - microformats2-types - - MicroHs - MicrosoftTranslator - midimory - mig-server @@ -2225,6 +2270,7 @@ dont-distribute-packages: - mmsyn7s - mmsyn7ukr - mmtl-base + - mmzk-env - moan - modify-fasta - modsplit @@ -2250,10 +2296,9 @@ dont-distribute-packages: - mongrel2-handler - monky - Monocle - - monoidmap-aeson - - monoidmap-examples - - monoidmap-quickcheck + - monomer - monomer-flatpak-example + - monomer-hagrid - monte-carlo - moo - moo-nad @@ -2261,6 +2306,7 @@ dont-distribute-packages: - morley-client - morley-prelude - morley-upgradeable + - morpheus-graphql - morphisms-functors-inventory - motor - motor-diagrams @@ -2271,6 +2317,7 @@ dont-distribute-packages: - mpretty - mprover - mps + - mptcp - mptcpanalyzer - msgpack-arbitrary - msgpack-binary @@ -2313,7 +2360,6 @@ dont-distribute-packages: - multirec-binary - multisetrewrite - Munkres-simple - - murder - murmurhash3 - mushu - music-graphics @@ -2329,6 +2375,7 @@ dont-distribute-packages: - MutationOrder - mute-unmute - mvclient + - mwc-random-accelerate - mwc-random-monad - mxnet-dataiter - mxnet-examples @@ -2344,6 +2391,7 @@ dont-distribute-packages: - nakadi-client - named-servant-client - named-servant-server + - named-text - nanq - NaperianNetCDF - national-australia-bank @@ -2355,6 +2403,8 @@ dont-distribute-packages: - nero-wai - nero-warp - nested-routes + - net-mqtt-lens + - net-mqtt-rpc - net-spider-cli - net-spider-pangraph - net-spider-rpl @@ -2436,7 +2486,6 @@ dont-distribute-packages: - oath - oauth2-jwt-bearer - obdd - - oberon0 - obj - objectid - objective @@ -2451,7 +2500,6 @@ dont-distribute-packages: - ogma-language-fret-cs - ogma-language-fret-reqs - ois-input-manager - - ollama-holes-plugin - olwrapper - om-kubernetes - online-csv @@ -2519,7 +2567,6 @@ dont-distribute-packages: - partage - partial-semigroup-test - passman-cli - - patch-image - pathfindingcore - patterns - paypal-rest-client @@ -2537,6 +2584,7 @@ dont-distribute-packages: - penny-bin - penny-lib - peparser + - perceptual-hash - perdure - perf-analysis - perfecthash @@ -2552,11 +2600,13 @@ dont-distribute-packages: - persistent-hssqlppp - persistent-iproute - persistent-map + - persistent-postgresql_2_14_0_0 - persistent-protobuf - persona-idp - peyotls - peyotls-codec - pg-entity + - phatsort - phladiprelio-general-shared - phladiprelio-general-simple - phladiprelio-ukrainian-shared @@ -2580,10 +2630,10 @@ dont-distribute-packages: - pianola - pier - pine + - ping - pinpon - pipe-enumerator - pipes-attoparsec-streaming - - pipes-cacophony - pipes-cereal-plus - pipes-conduit - pipes-courier @@ -2608,6 +2658,7 @@ dont-distribute-packages: - pms-domain-service - pms-infra-cmdrun - pms-infra-procspawn + - pms-infra-serial - pms-infra-socket - pms-infra-watch - pms-infrastructure @@ -2620,8 +2671,8 @@ dont-distribute-packages: - pointless-rewrite - poker - polh-lexicon - - poly-rec - polydata + - polynomial-algebra - polysemy-account - polysemy-account-api - polysemy-db @@ -2655,6 +2706,7 @@ dont-distribute-packages: - poseidon - poseidon-postgis - postgresql-common-persistent + - postgresql-pure - postgresql-simple-ltree - postgresql-simple-queue - postgresql-simple-typed @@ -2728,7 +2780,6 @@ dont-distribute-packages: - pure-cdb - pure-priority-queue-tests - purescript-iso - - pursuit-client - push-notify - push-notify-ccs - push-notify-general @@ -2747,6 +2798,7 @@ dont-distribute-packages: - qtah-qt5 - qtah-qt6 - quantfin + - quantification-aeson - Quelea - queryparser - queryparser-demo @@ -2793,7 +2845,6 @@ dont-distribute-packages: - random-extras - random-hypergeometric - range-space - - ranged-list_0_1_2_3 - Ranka - rasa - rasa-example-config @@ -2843,8 +2894,6 @@ dont-distribute-packages: - reflex-localize - reflex-monad-auth - reflex-process - - reform-blaze - - reform-happstack - refractor - refurb - reg-alloc-graph-color @@ -2859,6 +2908,10 @@ dont-distribute-packages: - regions-monadsfd - regions-monadstf - regions-mtl + - registry + - registry-aeson + - registry-hedgehog + - registry-hedgehog-aeson - regular-extras - regular-web - regular-xmlpickler @@ -2947,6 +3000,8 @@ dont-distribute-packages: - rose-trie - roshask - rosmsg-bin + - rounded + - rounded-hw - roundtrip-xml - route-generator - route-planning @@ -2987,8 +3042,8 @@ dont-distribute-packages: - sandwich-contexts-kubernetes - sandwich-contexts-minio - sandwich-webdriver + - sandwich-webdriver_0_4_0_1 - sarsi - - sasha - sasl - sat-micro-hs - satchmo-examples @@ -3028,6 +3083,7 @@ dont-distribute-packages: - scrapbook - SCRIPTWriter - scroll + - scubature - Scurry - sdl2-sprite - sdp-binary @@ -3045,6 +3101,8 @@ dont-distribute-packages: - secrm - sednaDBXML - seitz-symbol + - selda-json + - selda-sqlite - SelectSequencesFromMSA - selenium-server - semantic-source @@ -3059,7 +3117,6 @@ dont-distribute-packages: - seqloc - seqloc-datafiles - sequor - - serdoc-binary - serpentine - serv - serv-wai @@ -3087,6 +3144,7 @@ dont-distribute-packages: - servant-pushbullet-client - servant-rate-limit - servant-reason + - servant-routes-golden - servant-serialization - servant-server-namedargs - servant-snap @@ -3161,10 +3219,11 @@ dont-distribute-packages: - SimpleServer - simseq - singletons-base_3_5 + - singletons-presburger - siphon - siren-json - sirkel - - sitemap + - sized - skeleton - skeletons - skylark-client @@ -3183,7 +3242,6 @@ dont-distribute-packages: - smith-client - Smooth - smt - - smtlib-backends-z3 - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck @@ -3292,6 +3350,7 @@ dont-distribute-packages: - steeloverseer - stern-brocot - STLinkUSB + - stm-sbchan - STM32-Zombie - stmcontrol - StockholmAlignment @@ -3309,6 +3368,8 @@ dont-distribute-packages: - streaming-sort - strelka - strelka-wai + - strict-containers-lens + - strict-containers-serialise - strict-data - string-typelits - stripe-haskell @@ -3364,12 +3425,12 @@ dont-distribute-packages: - syntax-example-json - syntax-pretty - syntax-printer - - SyntaxMacros - syntaxnet-haskell - sys-process - systemstats - t3-client - ta + - taffybar - tag-stream - tagged-list - tagged-th @@ -3396,6 +3457,7 @@ dont-distribute-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens + - tasty-sugar - TastyTLT - tateti-tateti - Taxonomy @@ -3407,7 +3469,6 @@ dont-distribute-packages: - techlab - telegram-bot - telegram-raw-api - - telescope - ten-lens - ten-unordered-containers - terminal-text @@ -3456,7 +3517,6 @@ dont-distribute-packages: - toboggan - todos - toktok - - toml-reader_0_3_0_0 - tomlcheck - tonatona - tonatona-google-server-api @@ -3466,12 +3526,12 @@ dont-distribute-packages: - tonatona-servant - too-many-cells - top + - topaz - total-map - toxcore - toxcore-c - toysolver - tpb - - trace-embrace - tracing-control - trajectory - trans-fx-data @@ -3506,6 +3566,7 @@ dont-distribute-packages: - tuple-gen - tuple-ops - turingMachine + - turncoat - TV - tweet-hs - twentefp-eventloop-graphics @@ -3513,7 +3574,6 @@ dont-distribute-packages: - twentefp-graphs - twentefp-rosetree - twentefp-trees - - twentyseven - twfy-api-client - twidge - twilight-stm @@ -3527,15 +3587,14 @@ dont-distribute-packages: - type-combinators-quote - type-combinators-singletons - type-digits + - type-natural - type-ord - type-ord-spine-cereal - type-sets - type-structure - type-sub-th - - typecheck-plugin-nat-simple_0_1_0_11 - TypeClass - typed-encoding-encoding - - typed-gui - typed-protocols-doc - typed-streams - typedflow @@ -3577,6 +3636,7 @@ dont-distribute-packages: - universal - universe-th - unix-fcntl + - unleash-client-haskell - unpacked-these - unpacked-validation - unparse-attoparsec @@ -3607,6 +3667,7 @@ dont-distribute-packages: - uu-cco-hut-parsing - uu-cco-uu-parsinglib - uu-options + - uuagc - uuid-crypto - uvector-algorithms - v4l2 @@ -3680,6 +3741,7 @@ dont-distribute-packages: - wavy - weatherhs - weave + - web-browser-in-haskell - web-mongrel2 - web-routes-hsp - web-routes-regular @@ -3697,8 +3759,10 @@ dont-distribute-packages: - WebCont - webcrank-wai - webdriver-w3c + - webdriver_0_13_0_0 - webify - webserver + - websnap - WEditorBrick - WEditorHyphen - weekdaze @@ -3711,13 +3775,14 @@ dont-distribute-packages: - wheb-strapped - whitespace - wholepixels + - WidgetRattus - wikimusic-api - wikimusic-api-spec - wikimusic-ssr - wikipedia4epub + - wild-bind-task-x11 - windowslive - winery - - winio - Wired - wl-pprint-ansiterm - wl-pprint-terminfo @@ -3828,6 +3893,7 @@ dont-distribute-packages: - yoko - york-lava - yql + - yu-auth - yu-launch - yuuko - Z-Botan diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bfe4b607b0342..fef271f1fbeaa 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -123,6 +123,9 @@ builtins.intersectAttrs super { + drv.preCheck or ""; }) super.agda2lagda; + # Executable is of interest without the closure of the library + fix-whitespace = enableSeparateBinOutput super.fix-whitespace; + # scrypt requires SSE2 password = super.password.override ( lib.optionalAttrs (!(lib.meta.availableOn pkgs.stdenv.hostPlatform self.scrypt)) { @@ -155,7 +158,13 @@ builtins.intersectAttrs super { # cabal2nix incorrectly resolves this to pkgs.zip (could be improved over there). streamly-zip = super.streamly-zip.override { zip = pkgs.libzip; }; - threadscope = enableSeparateBinOutput super.threadscope; + # Requires wrapGAppsHook otherwise we get: https://github.com/haskell/ThreadScope/issues/143 + # We cannot use enableSeparateBinOutput here since it doesn't work with wrapGAppsHook + threadscope = ( + overrideCabal (drv: { + executableToolDepends = (drv.executableToolDepends or [ ]) ++ [ pkgs.wrapGAppsHook3 ]; + }) super.threadscope + ); # Binary may be used separately for e.g. editor integrations cabal-cargs = enableSeparateBinOutput super.cabal-cargs; @@ -263,7 +272,22 @@ builtins.intersectAttrs super { ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] ( enableSeparateBinOutput super.ormolu ); - hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] super.hnix; + + hnix = lib.pipe super.hnix [ + (self.generateOptparseApplicativeCompletions [ "hnix" ]) + # For nix-instantiate(1) + (addTestToolDepends [ pkgs.nix ]) + (overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "-p" + # Need to connect to the Nix daemon (?) + "!(/eval-okay-context-introspection/ || /eval-okay-context/ || /eval-okay-eq-derivations/ || /eval-okay-path/)" + ]; + })) + ]; + + # Provides a library and an executable (pretty-derivation) + nix-derivation = enableSeparateBinOutput super.nix-derivation; # Generate shell completion. cabal2nix = self.generateOptparseApplicativeCompletions [ "cabal2nix" ] super.cabal2nix; @@ -423,6 +447,14 @@ builtins.intersectAttrs super { hasql-pool = dontCheck super.hasql-pool; hasql-transaction = dontCheck super.hasql-transaction; + # Test dependency tree-sitter-while is not uploaded to Hackage, + # so cabal2nix automatically marks it as broken + hs-tree-sitter-capi = lib.pipe super.hs-tree-sitter-capi [ + dontCheck + doDistribute + unmarkBroken + ]; + # Avoid compiling twice by providing executable as a separate output (with small closure size), postgres-websockets = lib.pipe super.postgres-websockets [ enableSeparateBinOutput @@ -752,6 +784,15 @@ builtins.intersectAttrs super { # Break infinite recursion cycle with criterion and network-uri. js-flot = dontCheck super.js-flot; + # Test suite unsets PATH, but wants to be able to run `whoami` + # https://github.com/stackbuilders/dotenv-hs/commit/6125dc2d260c5042f5416c1431882d1c2c91d3c8#issuecomment-3163926427 + dotenv = overrideCabal (drv: { + postPatch = drv.postPatch or "" + '' + substituteInPlace spec/fixtures/.dotenv spec/Configuration/DotenvSpec.hs \ + --replace-fail "whoami" "$(type -p whoami)" + ''; + }) super.dotenv; + # Break infinite recursion cycle between QuickCheck and splitmix. splitmix = dontCheck super.splitmix; splitmix_0_1_1 = dontCheck super.splitmix_0_1_1; @@ -774,11 +815,30 @@ builtins.intersectAttrs super { # loc and loc-test depend on each other for testing. Break that infinite cycle: loc-test = super.loc-test.override { loc = dontCheck self.loc; }; - # The test suites try to run the "fixpoint" and "liquid" executables built just - # before and fail because the library search paths aren't configured properly. - # Also needs https://github.com/ucsd-progsys/liquidhaskell/issues/1038 resolved. - liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; - liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); + smtlib-backends-process = overrideCabal (drv: { + testSystemDepends = (drv.testSystemDepends or [ ]) ++ [ pkgs.z3 ]; + }) super.smtlib-backends-process; + + # overrideCabal because the tests need to execute the built executable "fixpoint" + liquid-fixpoint = overrideCabal (drv: { + preCheck = '' + export PATH=$PWD/dist/build/fixpoint:$PATH + '' + + (drv.preCheck or ""); + testSystemDepends = (drv.testSystemDepends or [ ]) ++ [ + pkgs.cvc5 + pkgs.z3 + ]; + }) super.liquid-fixpoint; + + # overrideCabal because the tests need to execute the built executable "liquid" + liquidhaskell = overrideCabal (drv: { + preCheck = '' + export PATH=$PWD/dist/build/liquid:$PATH + '' + + (drv.preCheck or ""); + libraryToolDepends = (drv.libraryToolDepends or [ ]) ++ [ pkgs.z3 ]; + }) super.liquidhaskell; # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; @@ -1021,7 +1081,7 @@ builtins.intersectAttrs super { addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.pango ); - spago = + spago-legacy = let docsSearchApp_0_0_10 = pkgs.fetchurl { url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js"; @@ -1043,49 +1103,43 @@ builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; in - lib.pipe - (super.spago.override { - # base <4.19, text <2.1 - versions = doJailbreak self.versions_5_0_5; - fsnotify = self.fsnotify_0_3_0_1; - }) - [ - (overrideCabal (drv: { - postUnpack = (drv.postUnpack or "") + '' - # Spago includes the following two files directly into the binary - # with Template Haskell. They are fetched at build-time from the - # `purescript-docs-search` repo above. If they cannot be fetched at - # build-time, they are pulled in from the `templates/` directory in - # the spago source. - # - # However, they are not actually available in the spago source, so they - # need to fetched with nix and put in the correct place. - # https://github.com/spacchetti/spago/issues/510 - cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js" - cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js" - cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10" - cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11" - - # For some weird reason, on Darwin, the open(2) call to embed these files - # requires write permissions. The easiest resolution is just to permit that - # (doesn't cause any harm on other systems). - chmod u+w \ - "$sourceRoot/templates/docs-search-app-0.0.10.js" \ - "$sourceRoot/templates/purescript-docs-search-0.0.10" \ - "$sourceRoot/templates/docs-search-app-0.0.11.js" \ - "$sourceRoot/templates/purescript-docs-search-0.0.11" - ''; - })) + lib.pipe super.spago-legacy [ + (overrideCabal (drv: { + postUnpack = (drv.postUnpack or "") + '' + # Spago includes the following two files directly into the binary + # with Template Haskell. They are fetched at build-time from the + # `purescript-docs-search` repo above. If they cannot be fetched at + # build-time, they are pulled in from the `templates/` directory in + # the spago source. + # + # However, they are not actually available in the spago source, so they + # need to fetched with nix and put in the correct place. + # https://github.com/spacchetti/spago/issues/510 + cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js" + cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js" + cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10" + cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11" + + # For some weird reason, on Darwin, the open(2) call to embed these files + # requires write permissions. The easiest resolution is just to permit that + # (doesn't cause any harm on other systems). + chmod u+w \ + "$sourceRoot/templates/docs-search-app-0.0.10.js" \ + "$sourceRoot/templates/purescript-docs-search-0.0.10" \ + "$sourceRoot/templates/docs-search-app-0.0.11.js" \ + "$sourceRoot/templates/purescript-docs-search-0.0.11" + ''; + })) - # Tests require network access. - dontCheck + # Tests require network access. + dontCheck - # Overly strict upper bound on text - doJailbreak + # Overly strict upper bound on text (<1.3) + doJailbreak - # Generate shell completion for spago - (self.generateOptparseApplicativeCompletions [ "spago" ]) - ]; + # Generate shell completion for spago + (self.generateOptparseApplicativeCompletions [ "spago" ]) + ]; # checks SQL statements at compile time, and so requires a running PostgreSQL # database to run it's test suite @@ -1267,22 +1321,7 @@ builtins.intersectAttrs super { # not used to link against by anyone, we can make it’s closure smaller and # add its runtime dependencies in `haskellPackages` (as opposed to cabal2nix). cabal2nix-unstable = overrideCabal (drv: { - buildTools = (drv.buildTools or [ ]) ++ [ - pkgs.buildPackages.makeWrapper - ]; - postInstall = '' - ${drv.postInstall or ""} - - wrapProgram $out/bin/cabal2nix \ - --prefix PATH ":" "${ - pkgs.lib.makeBinPath [ - pkgs.nix - pkgs.nix-prefetch-scripts - ] - }" - ''; - - passthru = { + passthru = drv.passthru or { } // { updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; # This is used by regenerate-hackage-packages.nix to supply the configuration @@ -1308,7 +1347,7 @@ builtins.intersectAttrs super { >> "$out" ''; }; - }) (justStaticExecutables super.cabal2nix-unstable); + }) (enableSeparateBinOutput super.cabal2nix-unstable); # test suite needs local redis daemon nri-redis = dontCheck super.nri-redis; @@ -1714,8 +1753,8 @@ builtins.intersectAttrs super { gi-javascriptcore4 gi-javascriptcore6 gi-webkit2webextension - gi-gtk_4_0_12 - gi-gdk_4_0_10 + gi-gtk + gi-gdk gi-gdk4 gi-gdkx114 gi-gtk4 @@ -1742,6 +1781,31 @@ builtins.intersectAttrs super { jsaddle-warp = addTestToolDepends [ pkgs.nodejs ] super.jsaddle-warp; + # Hackage tarball doesn't have the executable bits from git repo + wai-app-file-cgi = overrideCabal (drv: { + preCheck = '' + ${drv.preCheck or ""} + chmod +x test/cgi-bin/* + patchShebangs test/cgi-bin + ''; + }) super.wai-app-file-cgi; + + # All flags are off by default + mighttpd2 = lib.pipe super.mighttpd2 [ + # Library shouldn't increase closure size of resulting daemon and utility executables + enableSeparateBinOutput + # Enable all possible features + (enableCabalFlag "dhall") + (addBuildDepends [ self.dhall ]) + (enableCabalFlag "tls") + (addBuildDepends [ + self.warp-tls + self.tls + ]) + # Can't build quic with Stackage LTS at the moment (random >= 1.3, tls >= 2.1.10) + (disableCabalFlag "quic") + ]; + # Makes the mpi-hs package respect the choice of mpi implementation in Nixpkgs. # Also adds required test dependencies for checks to pass mpi-hs = @@ -1807,48 +1871,37 @@ builtins.intersectAttrs super { xmobar = enableSeparateBinOutput super.xmobar; - # These test cases access the network - hpack_0_38_1 = doDistribute ( - overrideCabal (drv: { - testFlags = drv.testFlags or [ ] ++ [ - "--skip" - "/Hpack.Defaults/ensureFile/with 404/does not create any files/" - "--skip" - "/Hpack.Defaults/ensureFile/downloads file if missing/" - "--skip" - "/EndToEnd/hpack/defaults/fails if defaults don't exist/" - ]; - }) super.hpack_0_38_1 - ); + # Combination of library and executable + extensions = enableSeparateBinOutput super.extensions; - # 2024-08-09: Disable some cabal-doctest tests pending further investigation. + # These test cases access the network inherit (lib.mapAttrs ( - _: doctest: - lib.pipe doctest [ - (overrideCabal (drv: { - patches = drv.patches or [ ] ++ [ - (pkgs.fetchpatch { - name = "doctest-0.23.0-ghc-9.12.patch"; - url = "https://github.com/sol/doctest/commit/77373c5d84cd5e59ea86ec30b9ada874f50fad9e.patch"; - sha256 = "07dx99lna17fni1ccbklijx1ckkf2p4kk9wvkwib0ihmra70zpn2"; - includes = [ "test/**" ]; - }) - ]; - testFlags = drv.testFlags or [ ] ++ [ - # These tests require cabal-install (would cause infinite recursion) - "--skip=/Cabal.Options" - "--skip=/Cabal.Paths/paths" - "--skip=/Cabal.ReplOptions" # >= 0.23 - ]; - })) - doDistribute - ] - ) { inherit (super) doctest doctest_0_23_0; }) - doctest - doctest_0_23_0 + _: + overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "--skip" + "/Hpack.Defaults/ensureFile/with 404/does not create any files/" + "--skip" + "/Hpack.Defaults/ensureFile/downloads file if missing/" + "--skip" + "/EndToEnd/hpack/defaults/fails if defaults don't exist/" + ]; + }) + ) super) + hpack + hpack_0_38_1 ; + doctest = overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + # These tests require cabal-install (would cause infinite recursion) + "--skip=/Cabal.Options" + "--skip=/Cabal.Paths/paths" + "--skip=/Cabal.ReplOptions" # >= 0.23 + ]; + }) super.doctest; + # tracked upstream: https://github.com/snapframework/openssl-streams/pull/11 # certificate used only 1024 Bit RSA key and SHA-1, which is not allowed in OpenSSL 3.1+ # security level 2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 06b7b99e5cd72..d8774a01c39a5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1039,8 +1039,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "ANum"; - version = "0.2.0.2"; - sha256 = "06mvkp9b0hxlp1w2yp7bb6340l88mzs15azx7nma401icqdhvbpn"; + version = "0.2.0.4"; + sha256 = "19wacb1n731b5xckhryry3kyxdp6wmzgw54jv70y18an3jdnlzhd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Num instance for Applicatives provided via the ANum newtype"; @@ -2123,8 +2123,6 @@ self: { doHaddock = false; description = "Call AppleScript from Haskell, and then call back into Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -2209,8 +2207,6 @@ self: { ]; description = "First-class Attribute Grammars implemented using type-level programming"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -2251,6 +2247,8 @@ self: { ]; description = "An asynchronous modal FRP language"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -2432,7 +2430,6 @@ self: { ]; description = "Balanced binary trees using the AVL algorithm"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -2550,8 +2547,8 @@ self: { }: mkDerivation { pname = "BNFC"; - version = "2.9.5"; - sha256 = "0ssp096ilnwyn1n20jlnkv67r033g7sm18w20ilc64mxlaifjdgs"; + version = "2.9.6.1"; + sha256 = "0h06vg9d71igr4rvs82f8sfa0grv6cvwpix82wal7b1ri0gskz97"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2617,8 +2614,8 @@ self: { pname = "BNFC-meta"; version = "0.6.1"; sha256 = "0snackflcjxza4iqbd85fdsmylwr3bj71nsfrs2s2idc3nlxc7ia"; - revision = "5"; - editedCabalFile = "1d0p524370r8jff7p3rnp6hrqlr85nhg8n2ydpfjwwmp4arp1il2"; + revision = "6"; + editedCabalFile = "12nc2pxd5cmy51avgbcnygg7v3aw214mj8ja2yi4llzd0pj4xwqy"; libraryHaskellDepends = [ alex-meta array @@ -4404,6 +4401,7 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Batteries-included Structured Logging library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -4457,6 +4455,7 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Using Blammo with WAI"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -5379,15 +5378,11 @@ self: { { mkDerivation, base }: mkDerivation { pname = "COrdering"; - version = "2.3"; - sha256 = "1lkav4wkyrraq1f6kyqfyjrxasgkayg4hmyv8a1gkr4h484b1cx8"; - revision = "1"; - editedCabalFile = "00byh0a7j7gnv8aq67fiairzvwz9csg49s2zqqj9f5pwgpmccn1v"; + version = "2.3.1"; + sha256 = "1my9l7rxsnr78xqsmajbr6jk0rxy8mm7i8f3s8v0k6l0qr5ig3w3"; libraryHaskellDepends = [ base ]; description = "An algebraic data type similar to Prelude Ordering"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -5933,6 +5928,57 @@ self: { } ) { }; + Cabal_3_16_0_0 = callPackage ( + { + mkDerivation, + array, + base, + bytestring, + Cabal-syntax, + containers, + deepseq, + directory, + filepath, + mtl, + parsec, + pretty, + process, + time, + transformers, + unix, + }: + mkDerivation { + pname = "Cabal"; + version = "3.16.0.0"; + sha256 = "030v97qnq7299ldi6zz9lb8ashldybp9l1x2f9ga8l7m8xns72nn"; + setupHaskellDepends = [ + mtl + parsec + ]; + libraryHaskellDepends = [ + array + base + bytestring + Cabal-syntax + containers + deepseq + directory + filepath + mtl + parsec + pretty + process + time + transformers + unix + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + Cabal-hooks = callPackage ( { mkDerivation, @@ -5944,8 +5990,8 @@ self: { }: mkDerivation { pname = "Cabal-hooks"; - version = "3.14"; - sha256 = "0fj770ix5a9n7nbfmp0919c2qgg20h3m1lwjdwq27mrgzk770s57"; + version = "3.16"; + sha256 = "1s28vzj1s4yc54w4nrxvj786f9h5p89mazww3iia7m7sb2r21fjr"; libraryHaskellDepends = [ base Cabal @@ -5955,6 +6001,8 @@ self: { ]; description = "API for the Hooks build-type"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -6226,6 +6274,52 @@ self: { } ) { }; + Cabal-syntax_3_16_0_0 = callPackage ( + { + mkDerivation, + alex, + array, + base, + binary, + bytestring, + containers, + deepseq, + directory, + filepath, + mtl, + parsec, + pretty, + text, + time, + transformers, + }: + mkDerivation { + pname = "Cabal-syntax"; + version = "3.16.0.0"; + sha256 = "17w0av34br7l5p2hw4bvzjmmrass6s0775big1w3hiig0lbx8nzl"; + libraryHaskellDepends = [ + array + base + binary + bytestring + containers + deepseq + directory + filepath + mtl + parsec + pretty + text + time + transformers + ]; + libraryToolDepends = [ alex ]; + description = "A library for working with .cabal files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + CabalSearch = callPackage ( { mkDerivation, @@ -7424,63 +7518,12 @@ self: { description = "An FFI interface to the DevIL library"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { IL = null; }; Color = callPackage ( - { - mkDerivation, - base, - colour, - criterion, - data-default-class, - deepseq, - hspec, - hspec-discover, - HUnit, - JuicyPixels, - massiv, - massiv-test, - QuickCheck, - random, - vector, - }: - mkDerivation { - pname = "Color"; - version = "0.3.3"; - sha256 = "14sf71lhqc1w6s3p1k8a99xgzcwfnr3v5irvfkr09rvv7fd66nva"; - libraryHaskellDepends = [ - base - data-default-class - deepseq - vector - ]; - testHaskellDepends = [ - base - colour - hspec - HUnit - JuicyPixels - massiv - massiv-test - QuickCheck - random - vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base - colour - criterion - deepseq - random - ]; - description = "Color spaces and conversions between them"; - license = lib.licenses.bsd3; - } - ) { }; - - Color_0_4_0 = callPackage ( { mkDerivation, base, @@ -7530,7 +7573,6 @@ self: { ]; description = "Color spaces and conversions between them"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -7789,7 +7831,9 @@ self: { ]; description = "Cluster algorithms, PCA, and chemical conformere analysis"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "conclusion"; + broken = true; } ) { }; @@ -8425,13 +8469,14 @@ self: { HUnit, mtl, old-locale, + open-browser, QuickCheck, time, }: mkDerivation { pname = "Craft3e"; - version = "0.1.1.1"; - sha256 = "0p5cdayl6j25pk7ab857bf3mcdp73464z56d98apnsb94j0d3whg"; + version = "0.2.0.2"; + sha256 = "1i0w6sxzi0v1vc5nd72q4pvqk9wcckhm7nmbrvh7ib3vjfyngsjb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8439,10 +8484,11 @@ self: { HUnit mtl old-locale + open-browser QuickCheck time ]; - doHaddock = false; + executableHaskellDepends = [ base ]; description = "Code for Haskell: the Craft of Functional Programming, 3rd ed"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -8772,7 +8818,9 @@ self: { ]; description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "dbfunctor-example"; + broken = true; } ) { }; @@ -10141,44 +10189,6 @@ self: { ) { }; Diff = callPackage ( - { - mkDerivation, - array, - base, - directory, - pretty, - process, - QuickCheck, - test-framework, - test-framework-quickcheck2, - }: - mkDerivation { - pname = "Diff"; - version = "0.5"; - sha256 = "0la5npl3zglzbsnlbksp0s6khb79cm6hbdxhy29sd3xivzg89k03"; - revision = "1"; - editedCabalFile = "1fxg0ibi80dq68draxfh1p0n4mkmyn7gm0b51jwpkq6rx8p9g2lw"; - libraryHaskellDepends = [ - array - base - pretty - ]; - testHaskellDepends = [ - array - base - directory - pretty - process - QuickCheck - test-framework - test-framework-quickcheck2 - ]; - description = "Diff algorithm in pure Haskell"; - license = lib.licenses.bsd3; - } - ) { }; - - Diff_1_0_2 = callPackage ( { mkDerivation, array, @@ -10211,7 +10221,6 @@ self: { ]; description = "Diff algorithm in pure Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -12647,8 +12656,8 @@ self: { }: mkDerivation { pname = "FULE"; - version = "0.3.1.1"; - sha256 = "04hmq6hv6wbs51ckbdia1jrd8a3qw645x9g550m4iwhy89gs0dnq"; + version = "0.3.1.2"; + sha256 = "07i0bzindm64fczhblzirrjhal09c0hfwn1zw1fcrbllk958m2z4"; libraryHaskellDepends = [ base containers @@ -13334,6 +13343,7 @@ self: { ]; description = "Finite categories and usual categorical constructions on them"; license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -14226,6 +14236,8 @@ self: { ]; description = "Data frames for working with tabular data files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -15038,8 +15050,8 @@ self: { pname = "GLUT"; version = "2.7.0.16"; sha256 = "0vdkfj4wjzigdpzgr5l001y9wkhwgl00mclr26gf93kps14fkymn"; - revision = "3"; - editedCabalFile = "00jj0f8vxfz11kpw673v5hs72xciyz4jvhp8p74cbqyj11dbp35d"; + revision = "4"; + editedCabalFile = "0xfm8l90llyyqj3aip0i87ykq936zfl3bc7sibgdng8dhi5xj7y3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15108,10 +15120,8 @@ self: { }: mkDerivation { pname = "GOST34112012-Hash"; - version = "0.1.1.2"; - sha256 = "143nppw4b5drfx3444a1gw02x0cjj0ngfcrai1aj03mf88ikgjj4"; - revision = "2"; - editedCabalFile = "0rir26yvx52qvrzribdy3l2d07p4wq287iwr62qn4h0wdc4240dh"; + version = "0.1.1.3"; + sha256 = "1ppib03jgnyciy3080669f0xni6a99x7yrv576rajqy2bwip84s2"; libraryHaskellDepends = [ base bytestring @@ -15124,8 +15134,6 @@ self: { ]; description = "Bindings to the GOST R 34.11-2012 hashing implementation"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -17068,7 +17076,6 @@ self: { ]; description = "The Haskell/R mixed programming environment"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "H"; } ) { }; @@ -19287,6 +19294,7 @@ self: { ]; description = "A flexible mock framework for testing effectful code"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -19492,6 +19500,76 @@ self: { } ) { }; + HPDF_1_8 = callPackage ( + { + mkDerivation, + array, + base, + base64-bytestring, + binary, + bytestring, + containers, + errors, + file-embed, + filepath, + HTF, + hyphenation, + mtl, + network-uri, + parsec, + random, + text, + vector, + zlib, + }: + mkDerivation { + pname = "HPDF"; + version = "1.8"; + sha256 = "0ni65ga5dkpyp357xwkn809b52k6p08hdq9agbqr3ny4yligvi2k"; + revision = "1"; + editedCabalFile = "06887s81xfzpz6cx3indnhhv8i1zkgripp157m01ar0yma5f82pl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array + base + base64-bytestring + binary + bytestring + containers + errors + file-embed + filepath + hyphenation + mtl + network-uri + parsec + random + text + vector + zlib + ]; + executableHaskellDepends = [ + array + base + filepath + network-uri + random + text + vector + ]; + testHaskellDepends = [ + base + HTF + ]; + testToolDepends = [ HTF ]; + description = "Generation of PDF documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "HPDF-Demo"; + } + ) { }; + HPath = callPackage ( { mkDerivation, @@ -21207,53 +21285,6 @@ self: { ) { }; HaTeX = callPackage ( - { - mkDerivation, - base, - bibtex, - bytestring, - containers, - hashable, - matrix, - parsec, - prettyprinter, - QuickCheck, - tasty, - tasty-quickcheck, - text, - transformers, - }: - mkDerivation { - pname = "HaTeX"; - version = "3.22.4.2"; - sha256 = "1wfyzv5kpi5npqfya11dalrxffygcz7rdsmk8kk85fvzyka8p5kf"; - libraryHaskellDepends = [ - base - bibtex - bytestring - containers - hashable - matrix - parsec - prettyprinter - QuickCheck - text - transformers - ]; - testHaskellDepends = [ - base - parsec - QuickCheck - tasty - tasty-quickcheck - text - ]; - description = "The Haskell LaTeX library"; - license = lib.licenses.bsd3; - } - ) { }; - - HaTeX_3_23_0_1 = callPackage ( { mkDerivation, base, @@ -21297,7 +21328,6 @@ self: { ]; description = "The Haskell LaTeX library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -22493,6 +22523,200 @@ self: { } ) { }; + Hastructure = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + attoparsec, + attoparsec-aeson, + base, + base-compat, + bytestring, + containers, + Decimal, + deepseq, + dlist, + generic-lens, + hashable, + http-types, + lens, + math-functions, + MissingH, + monad-loops, + mtl, + numeric-limits, + openapi3, + parallel, + regex-base, + regex-pcre-builtin, + scientific, + servant, + servant-openapi3, + servant-server, + split, + string-conversions, + swagger2, + tabular, + tasty, + tasty-golden, + tasty-hspec, + tasty-hunit, + template-haskell, + text, + time, + vector, + wai, + wai-cors, + warp, + yaml, + }: + mkDerivation { + pname = "Hastructure"; + version = "0.50.4"; + sha256 = "15g4hsgh2spfmynz4rs9za0ifcgdgcvp4n5qgm2szf4i9sdly0cf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + aeson-pretty + attoparsec + attoparsec-aeson + base + base-compat + bytestring + containers + Decimal + deepseq + dlist + generic-lens + hashable + http-types + lens + math-functions + MissingH + monad-loops + mtl + numeric-limits + openapi3 + parallel + regex-base + regex-pcre-builtin + scientific + servant + servant-openapi3 + servant-server + split + string-conversions + swagger2 + tabular + template-haskell + text + time + vector + wai + wai-cors + warp + yaml + ]; + executableHaskellDepends = [ + aeson + aeson-pretty + attoparsec + attoparsec-aeson + base + base-compat + bytestring + containers + Decimal + deepseq + dlist + generic-lens + hashable + http-types + lens + math-functions + MissingH + monad-loops + mtl + numeric-limits + openapi3 + parallel + regex-base + regex-pcre-builtin + scientific + servant + servant-openapi3 + servant-server + split + string-conversions + swagger2 + tabular + tasty + tasty-golden + tasty-hspec + tasty-hunit + template-haskell + text + time + vector + wai + wai-cors + warp + yaml + ]; + testHaskellDepends = [ + aeson + aeson-pretty + attoparsec + attoparsec-aeson + base + base-compat + bytestring + containers + Decimal + deepseq + dlist + generic-lens + hashable + http-types + lens + math-functions + MissingH + monad-loops + mtl + numeric-limits + openapi3 + parallel + regex-base + regex-pcre-builtin + scientific + servant + servant-openapi3 + servant-server + split + string-conversions + swagger2 + tabular + tasty + tasty-golden + tasty-hspec + tasty-hunit + template-haskell + text + time + vector + wai + wai-cors + warp + yaml + ]; + description = "Cashflow modeling library for structured finance"; + license = lib.licenses.bsd3; + mainProgram = "Hastructure-exe"; + } + ) { }; + Hate = callPackage ( { mkDerivation, @@ -24353,6 +24577,8 @@ self: { ]; description = "A package for solving dynamic programming problems in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -26007,6 +26233,8 @@ self: { ]; description = "Scale JuicyPixels images with DCT"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -26236,21 +26464,27 @@ self: { mkDerivation, base, containers, + directory, + generic-lens, + lens, mtl, }: mkDerivation { pname = "Kawaii-Parser"; - version = "2.0.0"; - sha256 = "1b0b6hr128jahwlivl0w27s11l51p6y5xjijjlgqhb17yjicxfl1"; + version = "3.0.0"; + sha256 = "09zj4ryqypd46i4ilfqx9mf9y9cs4p4gjyqyks3a11b0qmvlhna9"; + revision = "2"; + editedCabalFile = "0m63mixkaiwzw0m6ksl28q26cijkkxiydrjn6vcz10ymfyjm7mkw"; libraryHaskellDepends = [ base containers + directory + generic-lens + lens mtl ]; - description = "A simple parsing library"; + description = "A simple parsing library and some additional utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -27946,15 +28180,14 @@ self: { fmlist, HUnit, QuickCheck, - random, text, utf8-string, vector, }: mkDerivation { pname = "ListLike"; - version = "4.7.8.3"; - sha256 = "0diq2dzg2bhl40n9xidlnlzxyqdi11rybqrkgmxg3msypzlvxzhl"; + version = "4.7.8.4"; + sha256 = "1i397ig6pz1aa404gfjz2s340mlc97x9yywprx3hp684q81ybirv"; libraryHaskellDepends = [ array base @@ -27976,7 +28209,6 @@ self: { fmlist HUnit QuickCheck - random text utf8-string vector @@ -29652,7 +29884,6 @@ self: { ]; description = "A small compiler for Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "mhs"; } ) { }; @@ -29708,27 +29939,31 @@ self: { happy, haskell-src-exts, mtl, + optparse-applicative, pretty, process, + string-qq, transformers, }: mkDerivation { pname = "MiniAgda"; - version = "0.2022.3.11"; - sha256 = "1h1zcq3hsx8nxayzp3sa1qd1mlaigshqknkp3xn66yiv08f6vgmc"; - isLibrary = false; + version = "0.2025.7.23"; + sha256 = "13vxbq62jvbrgcxmswcb8izfwyh5d01a6n47vaz0i6qkx5hwx7xk"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ array base containers haskell-src-exts mtl + optparse-applicative pretty + string-qq transformers ]; - executableToolDepends = [ + libraryToolDepends = [ alex happy ]; @@ -31613,47 +31848,6 @@ self: { ) { }; NanoID = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - cereal, - extra, - mwc-random, - optparse-applicative, - text, - }: - mkDerivation { - pname = "NanoID"; - version = "3.4.0.2"; - sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; - revision = "2"; - editedCabalFile = "0yb2bkc0mdywmn1px7i4fpfa6n37fj1fgdzsl3bmcbw9w26qikxc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - base - bytestring - cereal - extra - mwc-random - text - ]; - executableHaskellDepends = [ - base - bytestring - mwc-random - optparse-applicative - ]; - description = "NanoID generator"; - license = lib.licenses.bsd3; - mainProgram = "nanoid"; - } - ) { }; - - NanoID_3_4_1_1 = callPackage ( { mkDerivation, aeson, @@ -31690,7 +31884,6 @@ self: { ]; description = "NanoID generator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "nanoid"; } ) { }; @@ -34156,17 +34349,19 @@ self: { base, QuickCheck, tasty, + tasty-hunit, tasty-quickcheck, }: mkDerivation { pname = "PSQueue"; - version = "1.2.1"; - sha256 = "0h46jcpmispysxgj4jy69p9b3ksi981q8qnabs0bjq60c28dks85"; + version = "1.2.2"; + sha256 = "1jm8fswmmlrlg0cxgc358sc4jinjligm5qzqrzdli8pi8d06p5ni"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck tasty + tasty-hunit tasty-quickcheck ]; description = "Priority Search Queue"; @@ -34903,8 +35098,10 @@ self: { }: mkDerivation { pname = "PenroseKiteDart"; - version = "1.4.3"; - sha256 = "1nrp9cr7jxjvplkfgp4lxh3rvzf1pms8bm7kwhc4w4fzmpy3p3p1"; + version = "1.5"; + sha256 = "0p0nf91vy5akgpnv8bb0i7bv92y0z774yh5xxynkf5f4rn7bcqjg"; + revision = "2"; + editedCabalFile = "1xdnbssmm0h9dvqpxivs2i037r5sj7cn5pnqzsm1h9cainj2w9g9"; libraryHaskellDepends = [ base containers @@ -36360,8 +36557,10 @@ self: { }: mkDerivation { pname = "QuickCheck"; - version = "2.14.3"; - sha256 = "0085lwy14r7hk7ibmv8d7d54ja9zin0ijf0b27xai898dfrj43sw"; + version = "2.15.0.1"; + sha256 = "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3"; + revision = "1"; + editedCabalFile = "0cgfp4s51cjphsn9cls6rndisvqmi94vn95xan9g1yz6p5xk7z8c"; libraryHaskellDepends = [ base containers @@ -36373,6 +36572,7 @@ self: { ]; testHaskellDepends = [ base + containers deepseq process ]; @@ -37477,34 +37677,6 @@ self: { ) { }; Ranged-sets = callPackage ( - { - mkDerivation, - base, - HUnit, - QuickCheck, - }: - mkDerivation { - pname = "Ranged-sets"; - version = "0.4.0"; - sha256 = "1skd2a6yw7dd5vq8x81kwh28gi8sgyzg9qqqyadxmgpvy11sh9ab"; - revision = "2"; - editedCabalFile = "1dl69wa509yn2jvl0d4c5c036swq22i6nd73kqn0bp7vhbj4rfq4"; - libraryHaskellDepends = [ - base - HUnit - QuickCheck - ]; - testHaskellDepends = [ - base - HUnit - QuickCheck - ]; - description = "Ranged sets for Haskell"; - license = lib.licenses.bsd3; - } - ) { }; - - Ranged-sets_0_5_0 = callPackage ( { mkDerivation, base, @@ -37526,7 +37698,6 @@ self: { ]; description = "Ranged sets for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -37683,6 +37854,8 @@ self: { ]; description = "A modal FRP language"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -39211,15 +39384,12 @@ self: { }: mkDerivation { pname = "STMonadTrans"; - version = "0.4.8"; - sha256 = "0ldqsl5axz1xlzha4b58kzpf35nr81ki3psy91zx7lpiv4agz7l3"; - revision = "1"; - editedCabalFile = "0bmmlg4kwsarkkm214fcqdvkah3pbk9ay8m9bnggb3ds7sc897i2"; + version = "0.4.8.1"; + sha256 = "0559yqgkcs520bhipf9pxy6rc7ydy9m48yj5s233g67g83k1ya3v"; libraryHaskellDepends = [ array base mtl - transformers ]; testHaskellDepends = [ array @@ -39297,58 +39467,6 @@ self: { ) { }; SVGFonts = callPackage ( - { - mkDerivation, - attoparsec, - base, - blaze-markup, - blaze-svg, - bytestring, - cereal, - cereal-vector, - containers, - data-default-class, - diagrams-core, - diagrams-lib, - directory, - parsec, - split, - text, - vector, - xml, - }: - mkDerivation { - pname = "SVGFonts"; - version = "1.8.0.1"; - sha256 = "0r3z7i7x56qvhyc51jlq084c1biy9xn72nm19mw116gx49rm32k9"; - revision = "2"; - editedCabalFile = "1kk7hbsd0aard9457y674rw5yvailfap1jzmvmvzmfi4ripwqxag"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec - base - blaze-markup - blaze-svg - bytestring - cereal - cereal-vector - containers - data-default-class - diagrams-core - diagrams-lib - directory - parsec - split - text - vector - xml - ]; - description = "Fonts from the SVG-Font format"; - license = lib.licenses.bsd3; - } - ) { }; - - SVGFonts_1_8_1 = callPackage ( { mkDerivation, attoparsec, @@ -39395,7 +39513,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -40264,10 +40381,8 @@ self: { }: mkDerivation { pname = "ShellCheck"; - version = "0.10.0"; - sha256 = "08bdjcdl457xz2vh8y2w29bcwh1k7sfzyvszln3498vm5m1xn22d"; - revision = "1"; - editedCabalFile = "1935jrzy1r3g9cc74b330fmxnz2i1j8hsdk9jnl557qgk6xjqzs7"; + version = "0.11.0"; + sha256 = "003lhhmaqbzvddw2im4ki5vz6v4imd8f5cp470gk122p36f2x9w1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42906,16 +43021,14 @@ self: { base, bifunctors, containers, - deepseq, generics-sop, - HUnit, QuickCheck, template-haskell, }: mkDerivation { pname = "StrictCheck"; - version = "0.3.0"; - sha256 = "16p1njy866gsg8jxyhx91x8nq67cr5w61fhqwffh6fyfhcybm2ag"; + version = "0.4.0"; + sha256 = "0l7h39a7a1zc7xrsz6ggscn6406q3wi57n50w8hvdm4dd6qf333f"; libraryHaskellDepends = [ base bifunctors @@ -42926,15 +43039,10 @@ self: { ]; testHaskellDepends = [ base - deepseq - generics-sop - HUnit QuickCheck ]; description = "StrictCheck: Keep Your Laziness In Check"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -43123,7 +43231,6 @@ self: { ]; description = "Syntax Macros in the form of an EDSL"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -44616,11 +44723,11 @@ self: { pname = "TreeStructures"; version = "0.0.2"; sha256 = "1lcj166i8f7850fqjv7xqxdn6zwpdynzxn3bf243wdnwmnn5pysx"; + revision = "1"; + editedCabalFile = "0znqwxxwash1bwfkx6qf5sd5r8mql262rwwqrm1qaz7xvldpxsk2"; libraryHaskellDepends = [ base ]; description = "A collection of heaps and search trees"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -45095,10 +45202,8 @@ self: { }: mkDerivation { pname = "Unique"; - version = "0.4.7.9"; - sha256 = "14f1qnmhdmbam8qis725dhwq1mk9h86fsnzhkwhsx73ny9z29s1l"; - revision = "1"; - editedCabalFile = "10s0npnfkh7naj49afmyrvnilikp6426fbhi49f97pxrgcmy4dvw"; + version = "0.4.8.0"; + sha256 = "1wv9dskvs2im5a97h3xm161sbqcbw81d7knk81y876ghqqf3hr56"; libraryHaskellDepends = [ base containers @@ -46229,6 +46334,8 @@ self: { testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; license = lib.licenses.lgpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -46612,6 +46719,7 @@ self: { ]; description = "An asynchronous modal FRP language for GUI programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -48105,40 +48213,6 @@ self: { ) { }; Yampa = callPackage ( - { - mkDerivation, - base, - criterion, - deepseq, - filepath, - random, - simple-affine-space, - time, - }: - mkDerivation { - pname = "Yampa"; - version = "0.14.12"; - sha256 = "032kzcrxpsdb53xg7qrjl1h8vfd8alfknd8s03zsn8gg85grdnl3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - deepseq - random - simple-affine-space - ]; - benchmarkHaskellDepends = [ - base - criterion - filepath - time - ]; - description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; - license = lib.licenses.bsd3; - } - ) { }; - - Yampa_0_15 = callPackage ( { mkDerivation, base, @@ -48169,7 +48243,6 @@ self: { ]; description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -48731,17 +48804,19 @@ self: { { mkDerivation, base, + syb, syz, }: mkDerivation { pname = "ZipperAG"; - version = "0.9"; - sha256 = "0nl08r7s3r5hr5jag499fillca16wsb8yqz1dlzydvacqcklcxr9"; + version = "1.0.0"; + sha256 = "1rcg38g6qkzvnfixidsvbwv0lrl8p3rpzlxyc0v7pziwvq8sadqk"; libraryHaskellDepends = [ base + syb syz ]; - description = "An implementationg of Attribute Grammars using Functional Zippers"; + description = "An implementation of Attribute Grammars using Functional Zippers"; license = lib.licenses.bsd3; } ) { }; @@ -49294,8 +49369,8 @@ self: { }: mkDerivation { pname = "ac-library-hs"; - version = "1.5.2.0"; - sha256 = "028781j64wv42j9i2gmgccmlakyjchpxqk13rk5n59xavlyv7yw9"; + version = "1.5.3.0"; + sha256 = "059b54g043b5a8zszavdzw8s8pgiz6zi6qzi7zjdyi2vlxam6v6l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49305,6 +49380,7 @@ self: { primitive random transformers + unordered-containers vector vector-algorithms wide-word @@ -49316,6 +49392,7 @@ self: { primitive random transformers + unordered-containers vector vector-algorithms wide-word @@ -49354,6 +49431,7 @@ self: { random tagged transformers + unordered-containers vector vector-algorithms wide-word @@ -49537,6 +49615,8 @@ self: { ]; description = "An embedded language for accelerated array processing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -50178,6 +50258,7 @@ self: { ]; description = "Convert between Accelerate arrays and raw pointers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -50354,6 +50435,7 @@ self: { ]; description = "Binary serialisation of Accelerate arrays using serialise"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -51029,10 +51111,8 @@ self: { }: mkDerivation { pname = "acid-state"; - version = "0.16.1.3"; - sha256 = "0vmggxzp6alv92ycwc9bc53vn73s1cbn8rhmbcb2jvcglyakvws5"; - revision = "2"; - editedCabalFile = "1a6l987cajb70h3i6gpd4im7s0y81cikkyr10hyc6lkq79inlr26"; + version = "0.16.1.4"; + sha256 = "1z3q0d83dmdhr2s0bh4vhlyz82wik3w8gdmqs5mxk6kw6g7f0xzl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51065,7 +51145,6 @@ self: { directory hedgehog hspec - hspec-discover mtl network safecopy @@ -51280,6 +51359,7 @@ self: { ]; description = "Spineless containers which are fast to read but inefficient to update"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -52674,7 +52754,9 @@ self: { ]; description = "Convert adblock config files to privoxy format"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "adblock2privoxy"; + broken = true; } ) { }; @@ -53851,6 +53933,8 @@ self: { ]; description = "Aeson combinators for dead simple JSON decoding"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -54579,6 +54663,8 @@ self: { ]; description = "Type-level default fields for aeson Generic FromJSON parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -54778,41 +54864,6 @@ self: { ) { }; aeson-jsonpath = callPackage ( - { - mkDerivation, - aeson, - base, - hspec, - parsec, - template-haskell, - text, - vector, - }: - mkDerivation { - pname = "aeson-jsonpath"; - version = "0.2.0.0"; - sha256 = "1zh3psdbmcvfai6sfnkxhzfsk9icw3fbadhkhcs5k2lag9fhzy76"; - libraryHaskellDepends = [ - aeson - base - parsec - template-haskell - text - vector - ]; - testHaskellDepends = [ - aeson - base - hspec - parsec - vector - ]; - description = "Parse and run JSONPath queries on Aeson documents"; - license = lib.licenses.mit; - } - ) { }; - - aeson-jsonpath_0_3_0_2 = callPackage ( { mkDerivation, aeson, @@ -54848,7 +54899,6 @@ self: { ]; description = "Parse and run JSONPath queries on Aeson documents"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -56674,8 +56724,8 @@ self: { }: mkDerivation { pname = "agda2hs"; - version = "1.3"; - sha256 = "0vifmyqyhsjib3yqdxj59qlxh22wmbz7vbj1z0axwfpvy5mhvidk"; + version = "1.4"; + sha256 = "1i5knj68c90gpwfgsmfi7ps3arw2kjs5h838byj0d5i1s7qnl8m8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -56736,6 +56786,40 @@ self: { } ) { }; + agda2lagda_0_2025_9_5 = callPackage ( + { + mkDerivation, + base, + directory, + filepath, + goldplate, + optparse-applicative, + process, + }: + mkDerivation { + pname = "agda2lagda"; + version = "0.2025.9.5"; + sha256 = "05j9yv8hh3mi15s2fzrqz3db98mpqkxmjhkkgy7q50irh0b4ph14"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + directory + filepath + optparse-applicative + ]; + testHaskellDepends = [ + base + process + ]; + testToolDepends = [ goldplate ]; + description = "Translate .agda files into .lagda.tex files."; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + mainProgram = "agda2lagda"; + } + ) { }; + agda2train = callPackage ( { mkDerivation, @@ -58101,8 +58185,8 @@ self: { }: mkDerivation { pname = "alex"; - version = "3.5.3.0"; - sha256 = "1ily1dp24i760m8p4l7x99ig532v8g1lxqp24f2i6dr8vpi55kd5"; + version = "3.5.4.0"; + sha256 = "1plasa0h85dfcga2h4yd1bqfi8smx4ghscyg299nh3lhqkr71sm9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -58193,8 +58277,8 @@ self: { pname = "alex-tools"; version = "0.6.1"; sha256 = "1nh8qbsv4sn6gxc7j8cbp2pb85cajilzhp8rchlwnk7bv8lzf8ji"; - revision = "3"; - editedCabalFile = "020l3qsm10jag2lblcfr7anissn2gi2p9nagwcs8am56siv14n0h"; + revision = "4"; + editedCabalFile = "05q29c54lkd3qcsixlwwcsy0f0pfpqlqv2n9kd6jrzs08whrgj4m"; libraryHaskellDepends = [ base bytestring @@ -59741,7 +59825,6 @@ self: { ]; description = "A compiler for the Alpha language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "alpha"; } ) { }; @@ -60322,6 +60405,8 @@ self: { pname = "altsvc"; version = "0.1.0.0"; sha256 = "0lgfj02ryc3130ymrkw179j311df2cj0ry9w32mvd77mwx48396c"; + revision = "1"; + editedCabalFile = "1la8bczba2qswdd8skz7cwkrnk1yjllv0kg00nrk9lkisz60wyff"; libraryHaskellDepends = [ base bytestring @@ -75040,8 +75125,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.6.6.0"; - sha256 = "08s3djzf4jpz765myxa2jl4sng61892xalczsgka2rnpgvxgcap0"; + version = "0.6.7.2"; + sha256 = "0ypkx415bvd7rd5466df3c9rhplgirwr61c7dswkwwnjwnvvz85w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76098,8 +76183,8 @@ self: { }: mkDerivation { pname = "anitomata-aseprite"; - version = "0.1.1.3"; - sha256 = "0zbqvhj3rlzma19mw6mwdwwqknribm7srn390zvzf5gfzcp5gi70"; + version = "0.1.1.4"; + sha256 = "1s7a2b92qdp3sq55dyyqb31j35amwmiq7ksf0xswzkamhvkq05kd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76443,8 +76528,8 @@ self: { }: mkDerivation { pname = "ansi-terminal"; - version = "1.1.2"; - sha256 = "1c2n051943gkwc87vpw7nrjxr5hivzq128x9k5j2mqji0hz4ml58"; + version = "1.1.3"; + sha256 = "14n0d3a4351mlin4dvk9xjg3x7dksnpkdg5l0gbby2fpbhb1mlc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76547,8 +76632,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-types"; - version = "1.1"; - sha256 = "09axg8lpyyzm436lfmk21hawqxljln0hrjhg6gfz99cdnwz37rgj"; + version = "1.1.3"; + sha256 = "12d625xa33qwwzpw75zpw05mk2a5qvqwj8jdkbcrp27iawhwxjcz"; libraryHaskellDepends = [ base colour @@ -77905,8 +77990,8 @@ self: { }: mkDerivation { pname = "aoc"; - version = "0.2.0.0"; - sha256 = "0hamr2sqw00njwg4sdir81fmsgc29ic21m0rzqnrfmd5jgdmg27h"; + version = "0.2.1.0"; + sha256 = "1mc8nlrzyx8h2capq9ik52wffp3vsjd3hjzfnlka311xdlyzzvqv"; libraryHaskellDepends = [ base containers @@ -77916,6 +78001,8 @@ self: { ]; description = "Utility functions commonly used while solving Advent of Code puzzles"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -80540,107 +80627,11 @@ self: { ) { }; apply-refact = callPackage ( - { - mkDerivation, - base, - containers, - directory, - extra, - filemanip, - filepath, - ghc, - ghc-boot-th, - ghc-exactprint, - ghc-paths, - optparse-applicative, - process, - refact, - silently, - syb, - tasty, - tasty-expected-failure, - tasty-golden, - transformers, - uniplate, - unix-compat, - }: - mkDerivation { - pname = "apply-refact"; - version = "0.14.0.0"; - sha256 = "17dndhrpli0149rqbcyygb4w3lpmz8068pyrkcpwvfkd21p8yikk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - containers - directory - extra - filemanip - ghc - ghc-boot-th - ghc-exactprint - process - refact - syb - transformers - uniplate - unix-compat - ]; - executableHaskellDepends = [ - base - containers - directory - extra - filemanip - filepath - ghc - ghc-boot-th - ghc-exactprint - ghc-paths - optparse-applicative - process - refact - syb - transformers - uniplate - unix-compat - ]; - testHaskellDepends = [ - base - containers - directory - extra - filemanip - filepath - ghc - ghc-boot-th - ghc-exactprint - ghc-paths - optparse-applicative - process - refact - silently - syb - tasty - tasty-expected-failure - tasty-golden - transformers - uniplate - unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = lib.licenses.bsd3; - mainProgram = "refactor"; - } - ) { }; - - apply-refact_0_15_0_0 = callPackage ( { mkDerivation, base, containers, data-default, - data-default-class, directory, extra, filemanip, @@ -80671,7 +80662,6 @@ self: { base containers data-default - data-default-class directory extra filemanip @@ -80689,7 +80679,6 @@ self: { base containers data-default - data-default-class directory extra filemanip @@ -80709,7 +80698,6 @@ self: { testHaskellDepends = [ base containers - data-default directory extra filemanip @@ -80732,7 +80720,6 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "refactor"; } ) { }; @@ -81782,8 +81769,10 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.12.0.1"; - sha256 = "0j8j22yy3mz31ypw3j8bk4cz5n2pfvv41m5smg0jxxxvdf6jbdia"; + version = "0.12.1"; + sha256 = "0qfa2mkxhbg6pq8c1jfwwdkrfyabkq1jmk9b0rkqi6j1zb9y2knv"; + revision = "1"; + editedCabalFile = "10f3l5gbj7g60p2d6hsgwkjfiqydsig05rx9jdyj2phcsbmlxcj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81860,8 +81849,12 @@ self: { mkDerivation, aeson, base, + bytestring, + containers, deriving-aeson, + directory, exceptions, + filepath, http-client, http-client-tls, http-types, @@ -81871,18 +81864,23 @@ self: { servant, servant-client, servant-client-core, + template-haskell, text, time, }: mkDerivation { pname = "arch-web"; - version = "0.3.1"; - sha256 = "1z8zfl0dskp7i0h5kgrw1nh94sxrmmfdpaykdjqiingn9dqnsmqm"; + version = "0.3.2"; + sha256 = "0gqkgfd5rn7qwkca0zav6wkrr43lk56cyi92gvqn87kydgbbsc5r"; libraryHaskellDepends = [ aeson base + bytestring + containers deriving-aeson + directory exceptions + filepath http-client http-client-tls http-types @@ -81891,14 +81889,19 @@ self: { servant servant-client servant-client-core + template-haskell text time ]; testHaskellDepends = [ aeson base + bytestring + containers deriving-aeson + directory exceptions + filepath http-client http-client-tls http-types @@ -81908,6 +81911,7 @@ self: { servant servant-client servant-client-core + template-haskell text time ]; @@ -83109,8 +83113,8 @@ self: { arithmoi = callPackage ( { mkDerivation, - array, base, + bitvec, chimera, constraints, containers, @@ -83137,14 +83141,12 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.13.1.0"; - sha256 = "0ka0sqkrkqrln6ci8fxzls9r5bhwii48xc39bbapdqbn4sc2c5bf"; - revision = "2"; - editedCabalFile = "1q81krc6qgg495qqlnh7kbzg2fk57amgiqa5xmxwhxrhlffjsk3d"; + version = "0.13.2.0"; + sha256 = "0kb7x4nh21vhiqy2l08k4dg49ffp022bj86vkpy9icgsaskh7b4i"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ - array base + bitvec chimera constraints containers @@ -83169,7 +83171,6 @@ self: { mod QuickCheck quickcheck-classes - random semirings smallcheck tasty @@ -83177,15 +83178,12 @@ self: { tasty-quickcheck tasty-rerun tasty-smallcheck - transformers vector ]; benchmarkHaskellDepends = [ - array base constraints containers - deepseq infinite-list integer-logarithms mod @@ -83392,15 +83390,15 @@ self: { bytestring, natural-arithmetic, primitive, - run-st, tasty, tasty-hunit, + text, text-short, }: mkDerivation { pname = "array-builder"; - version = "0.1.4.1"; - sha256 = "11hzfx6h0xrgbj8hginp91yj01kzyx8wh35bx22cb5ydfl7wpdcv"; + version = "0.2.0.0"; + sha256 = "1171isfkz9iqlz64vj8gba9gygahg6z49jrn3smd3h8c8v44fjv9"; libraryHaskellDepends = [ array-chunks base @@ -83409,7 +83407,7 @@ self: { bytestring natural-arithmetic primitive - run-st + text text-short ]; testHaskellDepends = [ @@ -83560,6 +83558,20 @@ self: { } ) { }; + array-mhs = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "array-mhs"; + version = "0.5.8.0"; + sha256 = "0w1w7vvf3xp6q6xg257ddczi3yx2s3cl4x7r2cd4p80y8gs85jcx"; + libraryHaskellDepends = [ base ]; + description = "Mutable and immutable arrays"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + array-primops = callPackage ( { mkDerivation, @@ -84015,6 +84027,7 @@ self: { ]; description = "Archive execution tool"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "arx"; } ) { }; @@ -84203,6 +84216,7 @@ self: { ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -84292,6 +84306,8 @@ self: { ]; description = "ASCII character without an upper/lower case distinction"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -84394,6 +84410,8 @@ self: { ]; description = "ASCII character groups"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -84464,6 +84482,7 @@ self: { ]; description = "ASCII representations of numbers"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -84615,6 +84634,7 @@ self: { ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -84689,6 +84709,7 @@ self: { ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -87314,8 +87335,8 @@ self: { }: mkDerivation { pname = "atomic-css"; - version = "0.1.0"; - sha256 = "088j3fmzvwrwrc4fk851788fw696aw972bi73p7jqrpj3idvh9lf"; + version = "0.2.0"; + sha256 = "0qldgfr5g6dk5g5f6844ymfymkgmwahmgsc3hlyp5r155gx2yp6d"; libraryHaskellDepends = [ base bytestring @@ -87342,6 +87363,7 @@ self: { description = "Type-safe, composable CSS utility functions. Inspired by Tailwindcss and Elm-UI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -88811,7 +88833,6 @@ self: { doHaddock = false; description = "right-to-left parser backward compatible with attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -89827,8 +89848,8 @@ self: { }: mkDerivation { pname = "auto-split"; - version = "0.1.0.4"; - sha256 = "0h5amma97l6m8dxvhnnksskfm55zgpfx3qm24wivv7slhp7s9q2q"; + version = "0.1.0.5"; + sha256 = "01b6paj9fr72a6yylzrl9kc5klgc6b7viip00vs34l7pmg06w46x"; libraryHaskellDepends = [ base ghc @@ -89927,54 +89948,6 @@ self: { ) { }; autodocodec = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - containers, - dlist, - doctest, - hashable, - mtl, - scientific, - text, - time, - unordered-containers, - validity, - validity-scientific, - vector, - }: - mkDerivation { - pname = "autodocodec"; - version = "0.4.2.2"; - sha256 = "1m6mhss3iw49xsc0yr663hy9prkwwwsbzg82mi27z4iq4v0hdmm6"; - libraryHaskellDepends = [ - aeson - base - bytestring - containers - dlist - hashable - mtl - scientific - text - time - unordered-containers - validity - validity-scientific - vector - ]; - testHaskellDepends = [ - base - doctest - ]; - description = "Self-documenting encoder and decoder"; - license = lib.licenses.mit; - } - ) { }; - - autodocodec_0_5_0_0 = callPackage ( { mkDerivation, aeson, @@ -90019,7 +89992,6 @@ self: { ]; description = "Self-documenting encoder and decoder"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -90059,43 +90031,10 @@ self: { ]; description = "Exact decoder for autodocodec"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; autodocodec-nix = callPackage ( - { - mkDerivation, - aeson, - autodocodec, - base, - containers, - scientific, - text, - unordered-containers, - vector, - }: - mkDerivation { - pname = "autodocodec-nix"; - version = "0.0.1.5"; - sha256 = "0lfp0li2hjqad4pw27cyhzsy17frg0i1a6v6irihl362ymk8dj22"; - libraryHaskellDepends = [ - aeson - autodocodec - base - containers - scientific - text - unordered-containers - vector - ]; - description = "Autodocodec interpreters for nix"; - license = lib.licenses.mit; - } - ) { }; - - autodocodec-nix_0_1_0_0 = callPackage ( { mkDerivation, aeson, @@ -90123,7 +90062,6 @@ self: { ]; description = "Autodocodec interpreters for nix"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -90143,8 +90081,8 @@ self: { }: mkDerivation { pname = "autodocodec-openapi3"; - version = "0.2.1.4"; - sha256 = "12mvgidsjw21q180z3z9gfms4lallixr9swslcac090y92m57q3s"; + version = "0.3.0.1"; + sha256 = "1p48w9w58csgyy2gk5c4j094hs2qglgy4irmzim4c4g6lajwfrvj"; libraryHaskellDepends = [ aeson autodocodec @@ -90202,39 +90140,6 @@ self: { ) { }; autodocodec-servant-multipart = callPackage ( - { - mkDerivation, - aeson, - autodocodec, - base, - bytestring, - servant-multipart, - servant-multipart-api, - text, - unordered-containers, - vector, - }: - mkDerivation { - pname = "autodocodec-servant-multipart"; - version = "0.0.0.1"; - sha256 = "194k3y3c8mz7x3pvghjrg7vax5hgzn86b3xrm68azxvz3q1chk3q"; - libraryHaskellDepends = [ - aeson - autodocodec - base - bytestring - servant-multipart - servant-multipart-api - text - unordered-containers - vector - ]; - description = "Autodocodec interpreters for Servant Multipart"; - license = lib.licenses.mit; - } - ) { }; - - autodocodec-servant-multipart_0_0_0_2 = callPackage ( { mkDerivation, aeson, @@ -90264,7 +90169,6 @@ self: { ]; description = "Autodocodec interpreters for Servant Multipart"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -90300,45 +90204,6 @@ self: { ) { }; autodocodec-yaml = callPackage ( - { - mkDerivation, - autodocodec, - autodocodec-schema, - base, - bytestring, - containers, - path, - path-io, - safe-coloured-text, - scientific, - text, - vector, - yaml, - }: - mkDerivation { - pname = "autodocodec-yaml"; - version = "0.4.0.1"; - sha256 = "04f55h2cg81iwql5rkyap86yy6g2h4jp1wlga1hvr0yrmkfvjm7g"; - libraryHaskellDepends = [ - autodocodec - autodocodec-schema - base - bytestring - containers - path - path-io - safe-coloured-text - scientific - text - vector - yaml - ]; - description = "Autodocodec interpreters for yaml"; - license = lib.licenses.mit; - } - ) { }; - - autodocodec-yaml_0_4_0_2 = callPackage ( { mkDerivation, autodocodec, @@ -90374,7 +90239,6 @@ self: { ]; description = "Autodocodec interpreters for yaml"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -91492,6 +91356,8 @@ self: { ]; description = "Avro serialization support for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -93405,6 +93271,8 @@ self: { ]; description = "Fetch data from AWS Secrets Manager"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -93714,8 +93582,8 @@ self: { }: mkDerivation { pname = "aws-spend-summary"; - version = "0.3.0.0"; - sha256 = "0lnwlvjqjs4hxqfblrhgqjq6309c466hlnamryprgd3l8nhnpak3"; + version = "0.3.0.1"; + sha256 = "1vf0p0lqi9y04zvyc0h3pg2sd2q3c2s2rxw7z7lf1wjd5w90xp4y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94344,13 +94212,14 @@ self: { deepseq, hspec, mtl, + primitive, QuickCheck, - stm, + sparse-set, }: mkDerivation { pname = "aztecs"; - version = "0.12.0"; - sha256 = "0r904arfgisqg83ps9schak9pwhf9r17rpilj2qx8fy2iwvfs98k"; + version = "0.14.0"; + sha256 = "0v9k2svhcrsj5gqwjrd4xhd4f3gxghwjr7mnb6ifbilw17h86651"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94358,11 +94227,12 @@ self: { containers deepseq mtl - stm + primitive + sparse-set ]; executableHaskellDepends = [ base - deepseq + mtl ]; testHaskellDepends = [ base @@ -94375,10 +94245,11 @@ self: { base criterion deepseq + primitive + sparse-set ]; description = "A modular game engine and Entity-Component-System (ECS) for Haskell"; license = lib.licenses.bsd3; - mainProgram = "ecs"; } ) { }; @@ -96164,6 +96035,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "hsDotnetGen"; + broken = true; } ) { }; @@ -96226,39 +96098,10 @@ self: { }: mkDerivation { pname = "bank-holiday-germany"; - version = "1.3.1.0"; - sha256 = "1a9n5vc9bqs6a6nh87px4lb9i73ad4yg0l67rlwiv80l4pqia1fi"; - libraryHaskellDepends = [ - base - time - ]; - testHaskellDepends = [ - base - doctest - hedgehog - hspec - hspec-hedgehog - time - ]; - description = "German bank holidays and public holidays"; - license = lib.licenses.mit; - } - ) { }; - - bank-holiday-germany_2_1_0_0 = callPackage ( - { - mkDerivation, - base, - doctest, - hedgehog, - hspec, - hspec-hedgehog, - time, - }: - mkDerivation { - pname = "bank-holiday-germany"; - version = "2.1.0.0"; - sha256 = "1p0grrrd949ng2hjwfx66v42c9sl2lhwxy0qg1r4b0myr77wia03"; + version = "2.1.0.1"; + sha256 = "17mfcdm55bh8a4a00khwvij5zc2iibr7hibw9fh5zz9yzywvqniw"; + revision = "1"; + editedCabalFile = "0wzq52z1fv59pwvhwjpj2jw6mf2jkqpxlcil6kr8i1pngpc8lp5p"; libraryHaskellDepends = [ base time @@ -96273,7 +96116,6 @@ self: { ]; description = "German bank holidays and public holidays"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -96486,17 +96328,17 @@ self: { attoparsec, base, bytestring, + containers, mtl, optparse-applicative, - shh, + process, text, + unix, }: mkDerivation { pname = "barbly"; - version = "0.1.0.0"; - sha256 = "1mmbvgw5g2jb8qv7vd00iym9xyb07jx03wi6x1ldqvzfn2vcc22l"; - revision = "1"; - editedCabalFile = "09xb9p2ik8kpa2gras9jqs4rr55bsbd7xnmgijxxzwf9hl00k0by"; + version = "0.2.0.0"; + sha256 = "039q8jcfqkcgyf8yf3a7mm33dihjr7i3fz54r30mq8cbf75zxws8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96505,10 +96347,12 @@ self: { attoparsec base bytestring + containers mtl optparse-applicative - shh + process text + unix ]; description = "Create status bar menus for macOS from executables"; license = lib.licenses.bsd3; @@ -96804,27 +96648,6 @@ self: { ) { }; base-compat = callPackage ( - { - mkDerivation, - base, - ghc-prim, - unix, - }: - mkDerivation { - pname = "base-compat"; - version = "0.13.1"; - sha256 = "08c43vzhq0dsnd8lqzrpimlj3h2386ybb8qksdk01fy8as6rw7fv"; - libraryHaskellDepends = [ - base - ghc-prim - unix - ]; - description = "A compatibility layer for base"; - license = lib.licenses.mit; - } - ) { }; - - base-compat_0_14_1 = callPackage ( { mkDerivation, base, @@ -96842,7 +96665,6 @@ self: { ]; description = "A compatibility layer for base"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -96858,8 +96680,8 @@ self: { }: mkDerivation { pname = "base-compat-batteries"; - version = "0.13.1"; - sha256 = "00m8lx2raldr6xvlc92za11a2sj3x0031vi6v3as0cnvl58mnliy"; + version = "0.14.1"; + sha256 = "1q9873jrfld2gqkw8xfhcmw1r3hqkvi58r1lxpvwh0nd0hpz8arx"; libraryHaskellDepends = [ base base-compat @@ -96876,34 +96698,17 @@ self: { } ) { }; - base-compat-batteries_0_14_1 = callPackage ( - { - mkDerivation, - base, - base-compat, - ghc-prim, - hspec, - hspec-discover, - QuickCheck, - }: + base-compat-constptr = callPackage ( + { mkDerivation, base }: mkDerivation { - pname = "base-compat-batteries"; - version = "0.14.1"; - sha256 = "1q9873jrfld2gqkw8xfhcmw1r3hqkvi58r1lxpvwh0nd0hpz8arx"; - libraryHaskellDepends = [ - base - base-compat - ghc-prim - ]; - testHaskellDepends = [ - base - hspec - QuickCheck - ]; - testToolDepends = [ hspec-discover ]; - description = "base-compat with extra batteries"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; + pname = "base-compat-constptr"; + version = "0.1.0.0"; + sha256 = "06da4aylbnihfxf3sap6mczyrlpia0l80r1ilmbng7x5bda24443"; + revision = "2"; + editedCabalFile = "03x7hrd4xv9xa0v72srn19v402nwws93n7jgakliabfshacd4pp3"; + libraryHaskellDepends = [ base ]; + description = "Backport of 'Foreign.C.ConstPtr'"; + license = lib.licenses.agpl3Only; } ) { }; @@ -99224,8 +99029,8 @@ self: { bcp47 = callPackage ( { mkDerivation, - aeson, base, + case-insensitive, containers, country, doctest, @@ -99238,11 +99043,11 @@ self: { }: mkDerivation { pname = "bcp47"; - version = "0.2.0.6"; - sha256 = "0k226jmpv6fnifbmbgdfvbj375an5g7bzzlcvfa1n5x65512ibp2"; + version = "0.3.0.0"; + sha256 = "0w2cxmr43vqjr8jfn9drgj8brdwi3wbais9bj1d7lhvadmjn5yp5"; libraryHaskellDepends = [ - aeson base + case-insensitive containers country generic-arbitrary @@ -99252,7 +99057,6 @@ self: { text ]; testHaskellDepends = [ - aeson base containers country @@ -99270,6 +99074,8 @@ self: { bcp47-orphans = callPackage ( { mkDerivation, + aeson, + autodocodec, base, bcp47, cassava, @@ -99278,6 +99084,8 @@ self: { hashable, hspec, http-api-data, + lens, + openapi3, path-pieces, persistent, QuickCheck, @@ -99286,11 +99094,11 @@ self: { }: mkDerivation { pname = "bcp47-orphans"; - version = "0.1.0.6"; - sha256 = "18r6wwj7sq5q1r9fg0kiss5p7h0qh485paginrc46lzygx4l5r3q"; - revision = "1"; - editedCabalFile = "0mf4plqqr6aw9jprp3fmmkpvk2g3h8hjn4wkp23ni07v818mlvlf"; + version = "0.1.3.0"; + sha256 = "0b1hwlgi7kib9fkj3cy4mx9d3pakrs2dszc7gzx1i3f079mgmdy2"; libraryHaskellDepends = [ + aeson + autodocodec base bcp47 cassava @@ -99298,12 +99106,15 @@ self: { esqueleto hashable http-api-data + lens + openapi3 path-pieces persistent serialise text ]; testHaskellDepends = [ + aeson base bcp47 cassava @@ -99926,6 +99737,8 @@ self: { pname = "beam-core"; version = "0.10.4.0"; sha256 = "1zxqyxxyid186s86lfw0sq030jckh83j3rwj6ibx4wg3flslk515"; + revision = "1"; + editedCabalFile = "1zwvxqfrmwnvsdj959ir6pwy3bbssyzgngh23kz40965pazxg8g6"; libraryHaskellDepends = [ aeson base @@ -99969,9 +99782,7 @@ self: { large-generics, large-records, microlens, - record-dot-preprocessor, record-hasfield, - sop-core, sqlite-simple, tasty, tasty-hunit, @@ -99980,15 +99791,13 @@ self: { }: mkDerivation { pname = "beam-large-records"; - version = "0.1.1"; - sha256 = "1vsc8aikpxwhzgjk4vlvs9wkg9hlq0942zqz0r8s98s1ad2pfmih"; + version = "0.1.2"; + sha256 = "193r7r9rnbqn3k8kq6s80dq8spvgbbnm9kn80xa7irp0qb2q25p6"; libraryHaskellDepends = [ base beam-core large-generics microlens - sop-core - text ]; testHaskellDepends = [ base @@ -99998,7 +99807,6 @@ self: { large-generics large-records microlens - record-dot-preprocessor record-hasfield sqlite-simple tasty @@ -100013,69 +99821,6 @@ self: { ) { }; beam-migrate = callPackage ( - { - mkDerivation, - aeson, - base, - beam-core, - bytestring, - containers, - deepseq, - dependent-map, - dependent-sum, - free, - ghc-prim, - hashable, - haskell-src-exts, - microlens, - mtl, - parallel, - pqueue, - pretty, - scientific, - text, - time, - unordered-containers, - uuid-types, - vector, - }: - mkDerivation { - pname = "beam-migrate"; - version = "0.5.3.1"; - sha256 = "0qx1nh5vvncgr4ixnraaahwp879v8wgn2lhixgzndk6zrs3y4a21"; - revision = "1"; - editedCabalFile = "0sm683b4k7km2378gqkvii1lb7bx79pscll72jnwfzh72dxqc2fh"; - libraryHaskellDepends = [ - aeson - base - beam-core - bytestring - containers - deepseq - dependent-map - dependent-sum - free - ghc-prim - hashable - haskell-src-exts - microlens - mtl - parallel - pqueue - pretty - scientific - text - time - unordered-containers - uuid-types - vector - ]; - description = "SQL DDL support and migrations support library for Beam"; - license = lib.licenses.mit; - } - ) { }; - - beam-migrate_0_5_3_2 = callPackage ( { mkDerivation, aeson, @@ -100105,6 +99850,8 @@ self: { pname = "beam-migrate"; version = "0.5.3.2"; sha256 = "05cz2gh9r00dr6knigq9v7zcdmpk2b19z0pg79wimkcxa2fblb5z"; + revision = "1"; + editedCabalFile = "0v1hx1pxwb7xxqdcdqyj8fv9liiz44ak2wmi7my267amxdx2n6h2"; libraryHaskellDepends = [ aeson base @@ -100131,7 +99878,6 @@ self: { ]; description = "SQL DDL support and migrations support library for Beam"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -100208,91 +99954,6 @@ self: { ) { }; beam-postgres = callPackage ( - { - mkDerivation, - aeson, - attoparsec, - base, - beam-core, - beam-migrate, - bytestring, - case-insensitive, - conduit, - free, - hashable, - haskell-src-exts, - hedgehog, - lifted-base, - monad-control, - mtl, - network-uri, - postgresql-libpq, - postgresql-simple, - scientific, - tagged, - tasty, - tasty-hunit, - testcontainers, - text, - time, - transformers-base, - unordered-containers, - uuid, - uuid-types, - vector, - }: - mkDerivation { - pname = "beam-postgres"; - version = "0.5.4.2"; - sha256 = "0fczf2aqz3fasbjsz8hl0mnjhx9zq7fx68wqfgsnlpp3ycbsf7d9"; - libraryHaskellDepends = [ - aeson - attoparsec - base - beam-core - beam-migrate - bytestring - case-insensitive - conduit - free - hashable - haskell-src-exts - lifted-base - monad-control - mtl - network-uri - postgresql-libpq - postgresql-simple - scientific - tagged - text - time - transformers-base - unordered-containers - uuid-types - vector - ]; - testHaskellDepends = [ - aeson - base - beam-core - beam-migrate - bytestring - hedgehog - postgresql-simple - tasty - tasty-hunit - testcontainers - text - uuid - vector - ]; - description = "Connection layer between beam and postgres"; - license = lib.licenses.mit; - } - ) { }; - - beam-postgres_0_5_4_3 = callPackage ( { mkDerivation, aeson, @@ -100327,8 +99988,8 @@ self: { }: mkDerivation { pname = "beam-postgres"; - version = "0.5.4.3"; - sha256 = "0v2m4cyq5cnxzwrr93m2v04zkh7fwvy1nwg7dajnpqc09kp70yzr"; + version = "0.5.4.4"; + sha256 = "03llbfl1rlpghl0adf9ynd4wx4jbl707ll7cn3bcq16za2sc20fd"; libraryHaskellDepends = [ aeson attoparsec @@ -100372,74 +100033,10 @@ self: { ]; description = "Connection layer between beam and postgres"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; beam-sqlite = callPackage ( - { - mkDerivation, - aeson, - attoparsec, - base, - beam-core, - beam-migrate, - bytestring, - dlist, - free, - hashable, - monad-control, - mtl, - network-uri, - scientific, - sqlite-simple, - tasty, - tasty-expected-failure, - tasty-hunit, - text, - time, - transformers-base, - }: - mkDerivation { - pname = "beam-sqlite"; - version = "0.5.4.0"; - sha256 = "14yhbmq07768w8wa5ffwjnb315ln4ynkfz49z255l4pdwrpix406"; - libraryHaskellDepends = [ - aeson - attoparsec - base - beam-core - beam-migrate - bytestring - dlist - free - hashable - monad-control - mtl - network-uri - scientific - sqlite-simple - text - time - transformers-base - ]; - testHaskellDepends = [ - base - beam-core - beam-migrate - sqlite-simple - tasty - tasty-expected-failure - tasty-hunit - text - time - ]; - description = "Beam driver for SQLite"; - license = lib.licenses.mit; - } - ) { }; - - beam-sqlite_0_5_4_1 = callPackage ( { mkDerivation, aeson, @@ -100468,6 +100065,8 @@ self: { pname = "beam-sqlite"; version = "0.5.4.1"; sha256 = "1f5yjsx7zfbfbxs3xd64rwn2m3vjffrbdn5xadhm1axhghi6srki"; + revision = "1"; + editedCabalFile = "0igd6nzypnnpswpybn87j7vzgy2cbgb4l19phimjdacgdjsvb4nf"; libraryHaskellDepends = [ aeson attoparsec @@ -100501,7 +100100,6 @@ self: { ]; description = "Beam driver for SQLite"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -101323,8 +100921,8 @@ self: { }: mkDerivation { pname = "benchpress"; - version = "0.2.2.25"; - sha256 = "10h5jgj87z4aca0k39qg5frvd3syffj4g1f3sd2yl6yc9s33yr3b"; + version = "0.2.3.0"; + sha256 = "0cpv5bvfs7i0kn6vy3xw23hxj41jamvjhrfzpn99c3a5hcgg6qrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101900,6 +101498,8 @@ self: { ]; description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code)."; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -103442,8 +103042,8 @@ self: { }: mkDerivation { pname = "binary-generic-combinators"; - version = "0.4.4.0"; - sha256 = "0kdgfhkfxsz7315jbf0a5vm15nwmd5gpgwk9hw2kwkfzl1k6iv7x"; + version = "0.4.4.1"; + sha256 = "1awm4v3y0wjc35kcqrkjx5vjc3jj4fpbhf09fl920l686vg5l712"; libraryHaskellDepends = [ base binary @@ -104157,6 +103757,7 @@ self: { ]; description = "Tagged binary serialisation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -106071,8 +105672,6 @@ self: { ]; description = "Orphan instances for binrep"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -106939,6 +106538,7 @@ self: { ]; description = "A small tool that clears cookies (and more)"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "bisc"; } ) { }; @@ -108633,6 +108233,7 @@ self: { ]; description = "Useful bitwise operations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -108861,8 +108462,8 @@ self: { }: mkDerivation { pname = "bitstring"; - version = "0.0.0"; - sha256 = "1ix2x4v76wq5148k1aax69cf8sk14cd0z362dz1d2qmj9qxsnsw8"; + version = "0.0.1"; + sha256 = "0v4qrcw4h4lz1fq58vlbvsv5wcj7540yv5mv3mdqrnbk99hb05xs"; libraryHaskellDepends = [ base bytestring @@ -110095,8 +109696,6 @@ self: { mkDerivation, base, bytestring, - deepseq, - ghc-prim, HUnit, QuickCheck, test-framework, @@ -110107,13 +109706,11 @@ self: { }: mkDerivation { pname = "blaze-builder"; - version = "0.4.3"; - sha256 = "1vkzpi48dycxvwxv0rcpzcgn12dqlngmivsszxrmlfixdyznlr02"; + version = "0.4.4.1"; + sha256 = "04six8rkyrhfa96ykmp51kfcxxj96v1g5r2m9sdaz5xc5023c7cp"; libraryHaskellDepends = [ base bytestring - deepseq - ghc-prim text ]; testHaskellDepends = [ @@ -111258,6 +110855,64 @@ self: { } ) { }; + blockio = callPackage ( + { + mkDerivation, + async, + base, + blockio-uring, + bytestring, + deepseq, + fs-api, + fs-sim, + io-classes, + primitive, + QuickCheck, + tasty, + tasty-hunit, + tasty-quickcheck, + temporary, + unix, + vector, + }: + mkDerivation { + pname = "blockio"; + version = "0.1.0.1"; + sha256 = "1cmffkkx938f2kbdfjgqqmhqdpvln2iwqm3pdpvjlm40isdpqj5c"; + libraryHaskellDepends = [ + base + blockio-uring + bytestring + deepseq + fs-api + fs-sim + io-classes + primitive + unix + vector + ]; + testHaskellDepends = [ + async + base + bytestring + fs-api + fs-sim + io-classes + primitive + QuickCheck + tasty + tasty-hunit + tasty-quickcheck + temporary + vector + ]; + doHaddock = false; + description = "Perform batches of disk I/O operations"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + blockio-uring = callPackage ( { mkDerivation, @@ -111277,8 +110932,8 @@ self: { }: mkDerivation { pname = "blockio-uring"; - version = "0.1.0.0"; - sha256 = "1g4sd7wqxf86i1c5iqiar6mpdszk99v7p71jcrx3dm8pap69r1x7"; + version = "0.1.0.1"; + sha256 = "1vhzi5ad162vdnn13444rf729302zqb2ikfmlb4i6k27pp0z1w58"; libraryHaskellDepends = [ base primitive @@ -111464,6 +111119,102 @@ self: { } ) { }; + bloodhound_0_24_0_0 = callPackage ( + { + mkDerivation, + aeson, + aeson-optics, + base, + blaze-builder, + bytestring, + containers, + doctest, + errors, + exceptions, + generic-random, + hashable, + hspec, + hspec-discover, + http-client, + http-types, + microlens, + mtl, + network-uri, + optics, + optics-core, + pretty-simple, + QuickCheck, + quickcheck-properties, + scientific, + template-haskell, + temporary, + text, + time, + unix-compat, + unordered-containers, + vector, + versions, + }: + mkDerivation { + pname = "bloodhound"; + version = "0.24.0.0"; + sha256 = "0zzpf3y6ccc5bwlxbcw2lc2qlcrllqs5ymd8kd19mmhgjkab8ycz"; + libraryHaskellDepends = [ + aeson + base + blaze-builder + bytestring + containers + exceptions + hashable + http-client + http-types + microlens + mtl + network-uri + optics-core + scientific + template-haskell + text + time + unordered-containers + vector + versions + ]; + testHaskellDepends = [ + aeson + aeson-optics + base + bytestring + containers + doctest + errors + exceptions + generic-random + hspec + hspec-discover + http-client + http-types + microlens + mtl + optics + pretty-simple + QuickCheck + quickcheck-properties + temporary + text + time + unix-compat + vector + versions + ]; + testToolDepends = [ hspec-discover ]; + description = "Elasticsearch client library for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + bloodhound-amazonka-auth = callPackage ( { mkDerivation, @@ -111600,6 +111351,59 @@ self: { } ) { }; + bloomfilter-blocked = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + criterion, + deepseq, + directory, + parallel, + primitive, + quickcheck-instances, + random, + regression-simple, + tasty, + tasty-hunit, + tasty-quickcheck, + }: + mkDerivation { + pname = "bloomfilter-blocked"; + version = "0.1.0.0"; + sha256 = "13p8dvh4gy4pw7ii5qj274f1dcmmlisxg5kqz3276kdjq93s4dd8"; + libraryHaskellDepends = [ + base + bytestring + deepseq + primitive + ]; + testHaskellDepends = [ + base + bytestring + containers + directory + parallel + primitive + quickcheck-instances + random + regression-simple + tasty + tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base + criterion + random + ]; + doHaddock = false; + description = "Classic and block-style bloom filters"; + license = lib.licenses.asl20; + } + ) { }; + bloomfilter-redis = callPackage ( { mkDerivation, @@ -111979,6 +111783,22 @@ self: { } ) { }; + bluefin_0_0_17_0 = callPackage ( + { mkDerivation, bluefin-internal }: + mkDerivation { + pname = "bluefin"; + version = "0.0.17.0"; + sha256 = "145yws2r4as5rvbxdsv31qkhjn2a7gbz3bx9y46fms291l7fi2c7"; + revision = "1"; + editedCabalFile = "0qrq7rhw5g855x2hnxd8hs0bffmdrbcyin9ig60pbs3bnx2liiia"; + libraryHaskellDepends = [ bluefin-internal ]; + description = "The Bluefin effect system"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + } + ) { }; + bluefin-algae = callPackage ( { mkDerivation, @@ -112007,6 +111827,27 @@ self: { ]; description = "Algebraic effects and named handlers in Bluefin"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + bluefin-contrib = callPackage ( + { + mkDerivation, + base, + bluefin, + }: + mkDerivation { + pname = "bluefin-contrib"; + version = "0.0.16.0"; + sha256 = "0pk7zqn9b6ka90l3n1xf9b84p4567gp2dv1ks6kcamzr3g4i4ww7"; + libraryHaskellDepends = [ + base + bluefin + ]; + description = "The Bluefin effect system, user contributions"; + license = lib.licenses.mit; } ) { }; @@ -112022,8 +111863,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.15.0"; - sha256 = "1cq1v2cva1vkda1dfwv1c6z8xxxq4qlwwjx3096snsawl8jhnlnj"; + version = "0.1.0.0"; + sha256 = "1106fij37sq7xnmb1zrvls94frqs9ard2nggiphmc2lpkcg71whz"; libraryHaskellDepends = [ async base @@ -112038,7 +111879,7 @@ self: { } ) { }; - bluefin-internal_0_1_0_0 = callPackage ( + bluefin-internal_0_1_1_0 = callPackage ( { mkDerivation, async, @@ -112050,8 +111891,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.1.0.0"; - sha256 = "1106fij37sq7xnmb1zrvls94frqs9ard2nggiphmc2lpkcg71whz"; + version = "0.1.1.0"; + sha256 = "1s29a48hijimz919qlg3cmdzcs83jdnvzy77s6v15gsqjrwsvm0q"; libraryHaskellDepends = [ async base @@ -112067,6 +111908,29 @@ self: { } ) { }; + bluefin-random = callPackage ( + { + mkDerivation, + base, + bluefin, + random, + }: + mkDerivation { + pname = "bluefin-random"; + version = "0.0.16.1"; + sha256 = "1kh5xgrwxqx4z0psk0wx8n5b7f3qq80jhzvifs5vry1l1irdj24a"; + libraryHaskellDepends = [ + base + bluefin + random + ]; + description = "The Bluefin effect system, random generators"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + bluemix-sdk = callPackage ( { mkDerivation, @@ -112102,6 +111966,7 @@ self: { aeson, async, base, + bytestring, containers, dns, http-api-data, @@ -112113,12 +111978,13 @@ self: { }: mkDerivation { pname = "bluesky-tools"; - version = "0.6.0.2"; - sha256 = "0qshnig4f791swn2rf1ssgxi9l04fvf8s0jadbn95nqzxqyyyjv2"; + version = "0.6.0.4"; + sha256 = "0q0q945xqxwq2mv1nd31cyfxb207rws1rhvnmqvg3p96354ahd12"; libraryHaskellDepends = [ aeson async base + bytestring containers dns http-api-data @@ -112571,7 +112437,9 @@ self: { testHaskellDepends = [ base ]; description = "Modeling boardgames"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "boardgame"; + broken = true; } ) { }; @@ -112776,8 +112644,8 @@ self: { }: mkDerivation { pname = "bolt"; - version = "0.3.1.0"; - sha256 = "0r3pyl170h3xyq4400j40ijp2j3nzh1sqlh0qd0fb140qcwvr35h"; + version = "0.3.2.0"; + sha256 = "0faml4lf320wspc43ccs8xdr0cs5ngbvaf8lwrzcqk2x0alw6v22"; libraryHaskellDepends = [ base bifunctors @@ -113176,6 +113044,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Simple Parser Combinators"; license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -113621,8 +113491,8 @@ self: { }: mkDerivation { pname = "boomerang"; - version = "1.4.9.3"; - sha256 = "1ilai1svi9j10wjll1r082v76299jnd7nznk7bxqgnvn59n43xik"; + version = "1.4.9.4"; + sha256 = "1km6lp7mrw3nw1ddy7lb1nfi35f0rn28fg8k32rinx5c8gwx9lnd"; libraryHaskellDepends = [ base mtl @@ -113695,8 +113565,8 @@ self: { pname = "boomwhacker"; version = "0.0.2"; sha256 = "0q5cq5j7dy1qm5jqpcl1imwiqqm0h21yvqwnvabsjnfrvfvryqg2"; - revision = "2"; - editedCabalFile = "0jqys322j818dc24fyb37a59qs66m3b46j05y4vswipakwm1kgmk"; + revision = "3"; + editedCabalFile = "0hvx832kd293jp4j91kw0dbh4x7bcbszb8pvjx6sdg36a8ynpnan"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -114854,8 +114724,8 @@ self: { }: mkDerivation { pname = "box"; - version = "0.9.3.2"; - sha256 = "0x2h5d6jgmv4nwsl955xb89q0f1fclsg5hjn7fyyja3z8w9qnf39"; + version = "0.9.3.3"; + sha256 = "1gn8hrq6f32jp91ckbz1bizhbpbm2a2wkh1id6ngdhdfxs7zx3di"; libraryHaskellDepends = [ async base @@ -114924,8 +114794,8 @@ self: { }: mkDerivation { pname = "box-socket"; - version = "0.5.2.0"; - sha256 = "13a8dclvf7m5j0a9gvmla8pr78qqrqnbqz8nc8js2yzp215p5qip"; + version = "0.5.2.1"; + sha256 = "0g2mw17s88z84268rdnv8jxpdrn9ix4bjk1bwc4w0krf7q750i75"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115401,8 +115271,8 @@ self: { }: mkDerivation { pname = "breakpoint"; - version = "0.1.4.0"; - sha256 = "04fgivxwddm8r5hpj8a1v6r4c59yj618cq14rszrd1qrm9sn1qf6"; + version = "0.1.5.0"; + sha256 = "1x70c0m111557r947zcdgcrfsbnm0j4dzw3b885pxvfz7i58pysc"; libraryHaskellDepends = [ ansi-terminal base @@ -115521,79 +115391,6 @@ self: { ) { }; brick = callPackage ( - { - mkDerivation, - base, - bimap, - bytestring, - config-ini, - containers, - data-clist, - deepseq, - directory, - exceptions, - filepath, - microlens, - microlens-mtl, - microlens-th, - mtl, - QuickCheck, - stm, - template-haskell, - text, - text-zipper, - unix-compat, - vector, - vty, - vty-crossplatform, - word-wrap, - }: - mkDerivation { - pname = "brick"; - version = "2.4"; - sha256 = "124l7yay5q5dxmpf48a4m8b7fnkwpv0shsy78qjpw5fdvqf9xkvz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bimap - bytestring - config-ini - containers - data-clist - deepseq - directory - exceptions - filepath - microlens - microlens-mtl - microlens-th - mtl - stm - template-haskell - text - text-zipper - unix-compat - vector - vty - vty-crossplatform - word-wrap - ]; - testHaskellDepends = [ - base - containers - microlens - QuickCheck - vector - vty - vty-crossplatform - ]; - description = "A declarative terminal user interface library"; - license = lib.licenses.bsd3; - } - ) { }; - - brick_2_9 = callPackage ( { mkDerivation, base, @@ -115669,7 +115466,6 @@ self: { ]; description = "A declarative terminal user interface library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -116314,6 +116110,8 @@ self: { ]; description = "Data structures and algorithms for working with 2D graphics"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -116353,6 +116151,7 @@ self: { ]; description = "Examples using the Brillo library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -116924,8 +116723,6 @@ self: { base, brotli, bytestring, - HUnit, - QuickCheck, tasty, tasty-hunit, tasty-quickcheck, @@ -116933,10 +116730,8 @@ self: { }: mkDerivation { pname = "brotli"; - version = "0.0.0.2"; - sha256 = "09y460adrq6cp9d8qlf8522yb0qc1vgjxv4d56kq2rdf9khqic6z"; - revision = "1"; - editedCabalFile = "1a0lbghilwpa6hb5msivb7hjqnnxi2bxlfgiawv0mjpc7gidhbz7"; + version = "0.0.0.3"; + sha256 = "1mgb27whk4iw0s0m86rx5dvc3gkykxyawnkayafkr4hlqzxg69n1"; libraryHaskellDepends = [ base bytestring @@ -116946,8 +116741,6 @@ self: { testHaskellDepends = [ base bytestring - HUnit - QuickCheck tasty tasty-hunit tasty-quickcheck @@ -118214,64 +118007,8 @@ self: { }: mkDerivation { pname = "bugsnag"; - version = "1.1.0.2"; - sha256 = "1f0jsad9z9zsj8sbirq6h1x0s7245rxv5gpciz4p8wv9ryi8d3m3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - annotated-exception - base - bugsnag-hs - bytestring - containers - Glob - http-client - http-client-tls - parsec - template-haskell - text - th-lift-instances - ua-parser - unliftio - unordered-containers - ]; - testHaskellDepends = [ - annotated-exception - base - hspec - unliftio - ]; - description = "Bugsnag error reporter for Haskell"; - license = lib.licenses.mit; - } - ) { }; - - bugsnag_1_2_0_0 = callPackage ( - { - mkDerivation, - aeson, - annotated-exception, - base, - bugsnag-hs, - bytestring, - containers, - Glob, - hspec, - http-client, - http-client-tls, - parsec, - template-haskell, - text, - th-lift-instances, - ua-parser, - unliftio, - unordered-containers, - }: - mkDerivation { - pname = "bugsnag"; - version = "1.2.0.0"; - sha256 = "0hhr4z1jdsbg8jx2416dgpad0lirzdjiv79s4ykhfimn2pqk9liq"; + version = "1.2.0.1"; + sha256 = "0n78jl3spg4i3g3n5z0cz6xniizpz1l45mkvxm599510gkdqk028"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118300,7 +118037,6 @@ self: { ]; description = "Bugsnag error reporter for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -118564,8 +118300,8 @@ self: { pname = "bugzilla-redhat"; version = "1.0.1.1"; sha256 = "0ka3dh5gqimwny7s3qalkynlyarkmnwd5pcy92b4g4vaqk7k3pvr"; - revision = "3"; - editedCabalFile = "1a50ffp5dahwc82ps78j7mpvi3xbd1by3xpkybxz8bz7i3fsazfg"; + revision = "5"; + editedCabalFile = "0b3ha32s6965swgyy07q0ga1i95qykimhf73wwd1lscn2bx8xk4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118629,6 +118365,8 @@ self: { ]; description = "Build Systems à la Carte"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -119960,6 +119698,7 @@ self: { doHaddock = false; description = "Efficient little-endian bit vector library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -120182,6 +119921,8 @@ self: { ]; description = "Sets and maps with 8-bit words for keys"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -120814,8 +120555,8 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.11.1"; - sha256 = "1vl14ndc9ys5480g0zsrsrdg0r84r2if9wrvjsyx0vxlj4phg3vp"; + version = "0.3.13.0"; + sha256 = "0gbpqz1r8xcqii9kj6nd1yjcdrpj49rr107v2ldylvilvqw6yh52"; libraryHaskellDepends = [ base byteslice @@ -121320,6 +121061,8 @@ self: { pname = "bytestring-mmap"; version = "0.2.2"; sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v"; + revision = "1"; + editedCabalFile = "0511x1hp70zmiz2b7w6dvnrav2zks4d65vz5n4wnvhwzimzmjlrf"; libraryHaskellDepends = [ base bytestring @@ -121352,6 +121095,8 @@ self: { ]; description = "Parse numeric literals from ByteStrings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -122775,8 +122520,8 @@ self: { }: mkDerivation { pname = "cab"; - version = "0.2.21"; - sha256 = "06hpsqanj0c3wy8jmk29gg3ma189fw8l41jx4k53zdjgx9x9wqmv"; + version = "0.2.22"; + sha256 = "1if9qqbgx4vkby765gz8fr498b8bscxzkfzw7001a3nn0sn38822"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122834,7 +122579,7 @@ self: { } ) { youProbablyWantCapitalCabal = null; }; - cabal-add = callPackage ( + cabal-add_0_1 = callPackage ( { mkDerivation, base, @@ -122890,11 +122635,12 @@ self: { ]; description = "Extend Cabal build-depends from the command line"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "cabal-add"; } ) { }; - cabal-add_0_2 = callPackage ( + cabal-add = callPackage ( { mkDerivation, base, @@ -122917,6 +122663,8 @@ self: { pname = "cabal-add"; version = "0.2"; sha256 = "0fd098gkfmxrhq0k4j1ll5g4xwwzgmhdx0mj9hnp5xanj7z1laxg"; + revision = "1"; + editedCabalFile = "03z75dp7mf471mm40mfb157ng2fgp66nkyhaa6fsb3j2qfwg5wz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122950,7 +122698,6 @@ self: { ]; description = "Extend Cabal build-depends from the command line"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-add"; } ) { }; @@ -123921,7 +123668,9 @@ self: { ]; description = "Fix for cabal files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "cabal-fix"; + broken = true; } ) { }; @@ -123952,8 +123701,8 @@ self: { pname = "cabal-flatpak"; version = "0.1.2"; sha256 = "05ig175b2glxppn5wr05pnncqkp8yhhy1m7ymmc1jk5pmiy3zvzi"; - revision = "2"; - editedCabalFile = "01iqpfj5nvl19580ckl4b0aljl86svplxzpkavp5r0jbwaqi0ll3"; + revision = "3"; + editedCabalFile = "00yisb404gr82zns01326h0ppw5jraqsxnanzd3ff2h9x7805fd7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124115,63 +123864,6 @@ self: { ) { }; cabal-gild = callPackage ( - { - mkDerivation, - base, - bytestring, - Cabal-syntax, - containers, - directory, - exceptions, - filepath, - filepattern, - hspec, - parsec, - pretty, - temporary, - text, - transformers, - }: - mkDerivation { - pname = "cabal-gild"; - version = "1.5.0.3"; - sha256 = "0lv3w9l865nys341z3r20psvmnjm79np7898d5v9ccr8l58h1vp4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bytestring - Cabal-syntax - containers - exceptions - filepath - filepattern - parsec - pretty - text - transformers - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base - bytestring - containers - directory - exceptions - filepath - filepattern - hspec - temporary - transformers - ]; - description = "Formats package descriptions"; - license = lib.licenses.mit; - mainProgram = "cabal-gild"; - maintainers = [ lib.maintainers.turion ]; - } - ) { }; - - cabal-gild_1_6_0_2 = callPackage ( { mkDerivation, base, @@ -124223,7 +123915,6 @@ self: { ]; description = "Formats package descriptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-gild"; maintainers = [ lib.maintainers.turion ]; } @@ -124491,7 +124182,6 @@ self: { filepath, hackage-security, HTTP, - lukko, mtl, network-uri, open-browser, @@ -124506,6 +124196,7 @@ self: { resolv, safe-exceptions, semaphore-compat, + silently, stm, tagged, tar, @@ -124522,8 +124213,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "3.14.2.0"; - sha256 = "1nvv3h9kq92ifyqqma88538579v7898pd9b52hras2h489skv8g8"; + version = "3.16.0.0"; + sha256 = "06jndk7xcm837rsy4y9nhy8a0162ckravh8dlnif1vmywfgljai8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124545,7 +124236,6 @@ self: { filepath hackage-security HTTP - lukko mtl network-uri open-browser @@ -124586,6 +124276,7 @@ self: { process QuickCheck random + silently tagged tar tasty @@ -124795,8 +124486,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.6.1.1"; - sha256 = "1w4kbc7435qbkflb8rkmfgyqw3fynyfqgvy4mxay1r1zfknqvq0b"; + version = "0.6.2"; + sha256 = "1362p021irm0kaz7n8gdjy1ppjk914zza114cmpm87ris0i1a9jn"; libraryHaskellDepends = [ aeson base @@ -124959,8 +124650,8 @@ self: { }: mkDerivation { pname = "cabal-install-solver"; - version = "3.14.2.0"; - sha256 = "0551cvrkbnjfqjd3byq7pczlwjdb0n1jrfsrb0j8axagylbif7g1"; + version = "3.16.0.0"; + sha256 = "0jp4iipc7j05hwvxpw4xiiv1rjaadc8c5a1jhqggr9q8l9pkvaw1"; libraryHaskellDepends = [ array base @@ -125084,7 +124775,9 @@ self: { ]; description = "Cabal support for creating Mac OSX application bundles"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "macosx-app"; + broken = true; } ) { }; @@ -125253,8 +124946,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.7.6.0"; - sha256 = "0n6q56gyyiflagka0bhmp077py71xdc9j921yyl7818q6b6ha3hs"; + version = "0.7.6.1"; + sha256 = "03b71qxcw97qnkjvrj9x6x4963d4kvwq0bwvmjkay9znsds938v7"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -125394,60 +125087,6 @@ self: { ) { }; cabal-rpm = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - Cabal, - cached-json-file, - directory, - extra, - filepath, - http-client, - http-client-tls, - http-query, - simple-cabal, - simple-cmd, - simple-cmd-args, - text, - time, - unix, - }: - mkDerivation { - pname = "cabal-rpm"; - version = "2.2.1"; - sha256 = "0dsbnnvzss0flknf1c2fq85y9a4d26nbrlnrh2xcyfwh2mz20c9d"; - revision = "1"; - editedCabalFile = "1ad0j7qykd5wbn1gdfrkbc50s707h3p0ll8nfqv0if8q1bck3w8l"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson - base - bytestring - Cabal - cached-json-file - directory - extra - filepath - http-client - http-client-tls - http-query - simple-cabal - simple-cmd - simple-cmd-args - text - time - unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = lib.licenses.gpl3Only; - mainProgram = "cabal-rpm"; - } - ) { }; - - cabal-rpm_2_3_0 = callPackage ( { mkDerivation, aeson, @@ -125499,7 +125138,6 @@ self: { ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-rpm"; } ) { }; @@ -126385,6 +126023,50 @@ self: { } ) { }; + cabal2spec_2_8_0 = callPackage ( + { + mkDerivation, + base, + Cabal, + filepath, + optparse-applicative, + tasty, + tasty-golden, + time, + }: + mkDerivation { + pname = "cabal2spec"; + version = "2.8.0"; + sha256 = "15pgbrsjykwq30fvw70rvbsvkrabqv43qf1v4l8bi229406vflb9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + Cabal + filepath + time + ]; + executableHaskellDepends = [ + base + Cabal + filepath + optparse-applicative + ]; + testHaskellDepends = [ + base + Cabal + filepath + tasty + tasty-golden + ]; + description = "Convert Cabal files into rpm spec files"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal2spec"; + maintainers = [ lib.maintainers.peti ]; + } + ) { }; + cabalQuery = callPackage ( { mkDerivation, @@ -127062,8 +126744,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "1.7.9"; - sha256 = "02q0z2f668y826f9rspwwn1kw3ma1igwsh2fp291g4sz8x6z66fv"; + version = "1.8.0"; + sha256 = "0axi9g6v8h29fi4lvxjxqrk4215c41zzp860hl5avdka1l0cvv5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127223,8 +126905,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.7.9"; - sha256 = "1jp55yvih27xkpky4i6pl37ajwyql84cniz2nhgwdb67qac5nmgi"; + version = "1.8.0"; + sha256 = "02cj18aghnl8w4pr2azpgg52aha6z59lcxy6nqd6yvrzgg0lv97v"; libraryHaskellDepends = [ aeson async @@ -127266,76 +126948,6 @@ self: { ) { }; cacophony = callPackage ( - { - mkDerivation, - aeson, - async, - attoparsec, - base, - base16-bytestring, - bytestring, - criterion, - cryptonite, - deepseq, - directory, - exceptions, - free, - hlint, - lens, - memory, - monad-coroutine, - mtl, - safe-exceptions, - text, - transformers, - }: - mkDerivation { - pname = "cacophony"; - version = "0.10.1"; - sha256 = "1w9v04mdyzvwndqfb8my9a82b51avgwfnl6g7w89xj37ax9ariaj"; - revision = "1"; - editedCabalFile = "0462qjh4qirgkr9v4fhjy28gc8pgnig1kmnrazfm2if2pqgbj0n7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bytestring - cryptonite - exceptions - free - lens - memory - monad-coroutine - mtl - safe-exceptions - transformers - ]; - testHaskellDepends = [ - aeson - attoparsec - base - base16-bytestring - bytestring - directory - hlint - text - ]; - benchmarkHaskellDepends = [ - async - base - base16-bytestring - bytestring - criterion - deepseq - ]; - description = "A library implementing the Noise protocol"; - license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; - } - ) { }; - - cacophony_0_11_0 = callPackage ( { mkDerivation, aeson, @@ -127398,8 +127010,6 @@ self: { ]; description = "A library implementing the Noise protocol"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -128376,73 +127986,6 @@ self: { ) { }; call-alloy = callPackage ( - { - mkDerivation, - async, - base, - bytestring, - containers, - directory, - exceptions, - extra, - file-embed, - filepath, - hspec, - process, - split, - string-interpolate, - transformers, - trifecta, - unix, - }: - mkDerivation { - pname = "call-alloy"; - version = "0.5.0.1"; - sha256 = "0c34yd6l0650qk760mmgsfgmwvhqhs43nzm7nhzkps5z1p966wmc"; - revision = "2"; - editedCabalFile = "0hgy6daai4i0y5rz4350dzwz4wrwlyrr5d2c7k8d6hc4d8dlhqvm"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - async - base - bytestring - containers - directory - exceptions - extra - filepath - process - split - transformers - trifecta - unix - ]; - testHaskellDepends = [ - async - base - bytestring - containers - directory - exceptions - extra - file-embed - filepath - hspec - process - split - string-interpolate - transformers - trifecta - unix - ]; - description = "A simple library to call Alloy given a specification"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - } - ) { }; - - call-alloy_0_6_0_2 = callPackage ( { mkDerivation, async, @@ -129113,9 +128656,7 @@ self: { ]; description = "Candid integration"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "hcandid"; - broken = true; } ) { }; @@ -129491,8 +129032,8 @@ self: { pname = "cantor-pairing"; version = "0.2.0.2"; sha256 = "1h95xbc1lhwd40qk64qw2cmr7prwygli1q2wy5hscny7jyah95c2"; - revision = "1"; - editedCabalFile = "10dsxgdpxa5hxz5zrij8h2whwsz0l1fvkkwdmidqpv09is55wmz5"; + revision = "2"; + editedCabalFile = "023yj598gz8dmpc00fybj02gsdsj45aw8pdi5g20zyv98ps6hyk5"; libraryHaskellDepends = [ base containers @@ -132041,16 +131582,13 @@ self: { test-framework-quickcheck2, text, text-short, - transformers, unordered-containers, vector, }: mkDerivation { pname = "cassava"; - version = "0.5.4.0"; - sha256 = "0vdbmvb36sg08glig1dqc8kb1s07l5fcn2n0c58iglkv5djsbpnr"; - revision = "1"; - editedCabalFile = "1w7mih2wpbgv0bn2cg2ip0ffsn2y7aywqixi1lig30yarsyc873x"; + version = "0.5.4.1"; + sha256 = "0ps9b8lgc1ah186rlxsy8hdnwkfh60i351105309jykk63skc1nl"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array @@ -132064,15 +131602,12 @@ self: { scientific text text-short - transformers unordered-containers vector ]; testHaskellDepends = [ - attoparsec base bytestring - hashable HUnit QuickCheck quickcheck-instances @@ -132194,6 +131729,8 @@ self: { ]; description = "Cassave instances for functor-like datatypes like `Either String a`"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -133035,8 +132572,8 @@ self: { }: mkDerivation { pname = "cauldron"; - version = "0.8.0.0"; - sha256 = "1vkvxkr3lr99xvd4vqga18idcpw3p1mv8hr94qagvfqdxrd68wcl"; + version = "0.9.0.1"; + sha256 = "1wcym2d37qpva1gfjwqh0zw9vfp9x1aqql19mdgvlc2hpf7m02y4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133054,9 +132591,7 @@ self: { doHaddock = false; description = "Dependency injection library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cauldron-example-wiring"; - broken = true; } ) { }; @@ -135021,6 +134556,8 @@ self: { ]; description = "A Future type that is easy to represent and handle in C/C++"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -135886,8 +135423,8 @@ self: { }: mkDerivation { pname = "changeset"; - version = "0.1.0.2"; - sha256 = "1r5lis34i2zkvma19n323cdfnxq0vlc1rx338hmb4icxrlpnlby9"; + version = "0.1.0.3"; + sha256 = "1fzaflmfl4p2s9yjl11ifls2jhrp1ia334jb2l2nxnrlkgax5l1d"; libraryHaskellDepends = [ base containers @@ -135925,8 +135462,8 @@ self: { }: mkDerivation { pname = "changeset-containers"; - version = "0.1.0.2"; - sha256 = "0wc9k3ygij388p5bxh3iv8hpn68il46jky6rmj01zirz3q86vdh2"; + version = "0.1.0.3"; + sha256 = "0a7k269qkv7x4d16q17h0wqixgv0aj0cs27fms8i79lcx804m4jz"; libraryHaskellDepends = [ base changeset @@ -135965,8 +135502,8 @@ self: { }: mkDerivation { pname = "changeset-lens"; - version = "0.1.0.2"; - sha256 = "1vgrjq98pj66yqbfd029vnwix02g5wmjk55dma6jwmh2sqb6sdx5"; + version = "0.1.0.3"; + sha256 = "020vzb7pg208s5kdvmf88z9xj0lxg1safxh8scfzpwx58bnvq68q"; libraryHaskellDepends = [ base changeset @@ -136007,8 +135544,8 @@ self: { }: mkDerivation { pname = "changeset-reflex"; - version = "0.1.0.2"; - sha256 = "1ka71qz1b5rkdjcxzcp9qyfznbwl3r9xi5ihrkn08x2xafhc20f0"; + version = "0.1.0.3"; + sha256 = "1gcz5gamx2dxwy0v1wb578fjrc1wqhlh5asvhffrh8lvxzcdnjcw"; libraryHaskellDepends = [ base changeset @@ -136390,6 +135927,7 @@ self: { flatparse, formatn, harpie, + lens, markup-parse, mtl, numhask, @@ -136402,62 +135940,8 @@ self: { }: mkDerivation { pname = "chart-svg"; - version = "0.7.0.0"; - sha256 = "1v1dhvn4rgv191byvr5dvaxifd48hskpqvv3kzpsq40ii7hqyj4m"; - libraryHaskellDepends = [ - base - bytestring - Color - containers - cubicbezier - flatparse - formatn - harpie - markup-parse - mtl - numhask - numhask-space - optics-core - random - string-interpolate - text - time - ]; - testHaskellDepends = [ - base - doctest-parallel - ]; - description = "Charting library targetting SVGs"; - license = lib.licenses.bsd3; - } - ) { }; - - chart-svg_0_8_1_0 = callPackage ( - { - mkDerivation, - base, - bytestring, - Color, - containers, - cubicbezier, - doctest-parallel, - flatparse, - formatn, - harpie, - markup-parse, - mtl, - numhask, - numhask-space, - optics-core, - random, - string-interpolate, - text, - time, - }: - mkDerivation { - pname = "chart-svg"; - version = "0.8.1.0"; - sha256 = "1rsix6qdxhsgjg4zp7rh5di6y5mjxjv0mzv9g82ryl3vlcryyaj4"; + version = "0.8.2.1"; + sha256 = "0nxg8ggd7nslr585sag2zzgal6scs66sf5v42hrpjdslkqks85sl"; libraryHaskellDepends = [ base bytestring @@ -136467,6 +135951,7 @@ self: { flatparse formatn harpie + lens markup-parse mtl numhask @@ -136483,7 +135968,6 @@ self: { ]; description = "Charting library targetting SVGs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -137372,8 +136856,6 @@ self: { ]; description = "mtl-style checked exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -137582,6 +137064,8 @@ self: { ]; description = "QuickCheck support for Chell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -137810,6 +137294,7 @@ self: { ]; description = "Basic chess library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -137854,6 +137339,8 @@ self: { ]; description = "A Library for Chess Game Logic"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -138139,6 +137626,8 @@ self: { pname = "chimera"; version = "0.4.1.0"; sha256 = "1wxw0d9dq7q3a9rn3h69yjiyi94xhyip1ssii982rm35jsywak49"; + revision = "1"; + editedCabalFile = "1rpm93iq6kapgcd1c0711sgsav0zpxnn0b88zga35pizq9j9vrm9"; libraryHaskellDepends = [ adjunctions base @@ -138904,10 +138393,10 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.1.6.2"; - sha256 = "08y8s9mwb69kisi0yhng6plvasy6jnj25i4ar8k2cq3vsf6bgx73"; + version = "1.1.7.0"; + sha256 = "0gcyv9gg8a37xcylkvq2r7pqwblvfvchvqjih8ylp4420fl66mri"; revision = "1"; - editedCabalFile = "04991mhi13b95iy665s59r4z9qsh68wykkgch5dqlnlm1dd6fzdw"; + editedCabalFile = "0l1gns3cr7rqqyh175wlx5r1yrja7kyb7b6cr652czby8hzyj677"; libraryHaskellDepends = [ aeson attoparsec @@ -139008,10 +138497,10 @@ self: { }: mkDerivation { pname = "chs-cabal"; - version = "0.1.1.1"; - sha256 = "0fvf26394rpn9g4f3rp13bq8rrhzs9d95k7nbcpayzml2j9rsv3l"; - revision = "2"; - editedCabalFile = "1vv61klw11fhnn5ki0z2x0k6d7vvj622bjj05mdlx8sdjqijlbgd"; + version = "0.1.1.2"; + sha256 = "1qh234dx3d3l3nxb67alv0ggwqipp1502krq11fgq3hp0jhcm8b8"; + revision = "1"; + editedCabalFile = "08p3vj0v1i546m1allza5wl7q038qgqvb4b4p3p501v097yrvh6z"; libraryHaskellDepends = [ base Cabal @@ -139022,7 +138511,7 @@ self: { } ) { }; - chs-cabal_0_1_1_4 = callPackage ( + chs-cabal_1_0_0_0 = callPackage ( { mkDerivation, base, @@ -139031,8 +138520,8 @@ self: { }: mkDerivation { pname = "chs-cabal"; - version = "0.1.1.4"; - sha256 = "1y9z3ymvsldl4kjjdzagx0p3i7s5lyrsipd29bx2nqv05ldgrkip"; + version = "1.0.0.0"; + sha256 = "0n8ybcs7l8llh7641nkw5bd7pwhx563ip9srdy5vpqijnijsfxkq"; libraryHaskellDepends = [ base Cabal @@ -139529,6 +139018,7 @@ self: { filepath, groom, happy, + hashable, hspec, hspec-discover, monad-parallel, @@ -139542,8 +139032,8 @@ self: { }: mkDerivation { pname = "cimple"; - version = "0.0.22"; - sha256 = "0dp62wqcrdf16mrs10ij59y2ncrbm3nplp3h8qszmq4csiq8scfi"; + version = "0.0.26"; + sha256 = "0fv7kdwl8jd1v3wl85djn3njwdhp06vlmfq59h7gbvnf4d5mvxiv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139555,6 +139045,7 @@ self: { data-fix file-embed filepath + hashable monad-parallel mtl prettyprinter @@ -140530,10 +140021,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.8.1.1"; - sha256 = "0hgkxgd1wmyrryv2ahavia6r5z9331i9557mnblq922lkdi0bs2g"; - revision = "1"; - editedCabalFile = "091gm0cbjsqvad3fhd2fx4bgsylv3gfakq3fhki3z40aywri8992"; + version = "0.9.0.1"; + sha256 = "1s1gdd7piwssp5b6bwbfyp9sfna052v3rayav7di44yapm5dazmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140576,7 +140065,7 @@ self: { } ) { }; - citeproc_0_9_0_1 = callPackage ( + citeproc_0_10 = callPackage ( { mkDerivation, aeson, @@ -140605,8 +140094,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.9.0.1"; - sha256 = "1s1gdd7piwssp5b6bwbfyp9sfna052v3rayav7di44yapm5dazmr"; + version = "0.10"; + sha256 = "0snza31cf2agnpr80dl691insw6f8v1ii7f52q6dyl2cx56cawsh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142798,41 +142287,8 @@ self: { }: mkDerivation { pname = "clay"; - version = "0.15.0"; - sha256 = "1gp7x76cw15jmd3ahqf1q0bc2p6ix182x6s2pzyh8yr4b29b9r3v"; - revision = "2"; - editedCabalFile = "174jkyq4yjk022msd2rq0wlp4myy9fa92w28d4nwd7jrwghw5qki"; - libraryHaskellDepends = [ - base - mtl - text - ]; - testHaskellDepends = [ - base - hspec - hspec-discover - mtl - text - ]; - testToolDepends = [ hspec-discover ]; - description = "CSS preprocessor as embedded Haskell"; - license = lib.licenses.bsd3; - } - ) { }; - - clay_0_16_0 = callPackage ( - { - mkDerivation, - base, - hspec, - hspec-discover, - mtl, - text, - }: - mkDerivation { - pname = "clay"; - version = "0.16.0"; - sha256 = "0746w54gcpck0sj493bh2wlfdgknxbpwgr7q3b6l9m8djs7j8q41"; + version = "0.16.1"; + sha256 = "1zfbicn8mh48a3j4ms97v0ah7gmph0nb927ilcb37ghr1qzm054b"; libraryHaskellDepends = [ base mtl @@ -142848,7 +142304,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -144132,8 +143587,8 @@ self: { }: mkDerivation { pname = "cli-extras"; - version = "0.2.1.1"; - sha256 = "1lj45gzn9dm0mmsigab9mv5z1zvbvvh043z5il7i5086la11l3n6"; + version = "0.2.1.2"; + sha256 = "0fwjfd29hmzxkvmi142di175q465wk1m92xhifq9rh4mg9qrx68h"; libraryHaskellDepends = [ aeson ansi-terminal @@ -144179,8 +143634,8 @@ self: { }: mkDerivation { pname = "cli-git"; - version = "0.2.0.2"; - sha256 = "00m955anry37ag6h7pxnsihp9kr6v4bhq19gy4iyhk96lp8vidfl"; + version = "0.2.0.3"; + sha256 = "0cnn8dfp887p6y0xjlqj7qjih55a979k9cxq7blrr8fv0wgxnddj"; libraryHaskellDepends = [ base cli-extras @@ -144215,8 +143670,8 @@ self: { }: mkDerivation { pname = "cli-nix"; - version = "0.2.0.1"; - sha256 = "0s79rm6sa7fn59jmqzmc44wjqvb8bafxjshijxpv60yyz24c3mdh"; + version = "0.2.0.2"; + sha256 = "0gsx2rxwpn0np2c132bz32m7gv2s502h61q4bs8b7nvaf0wn4msa"; libraryHaskellDepends = [ base cli-extras @@ -145134,7 +144589,6 @@ self: { ]; description = "Project file manager for Claude AI integrations"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -145225,13 +144679,14 @@ self: { markdown-unlit, persistent, QuickCheck, + random, text, vector, }: mkDerivation { pname = "closed"; - version = "0.2.0.2"; - sha256 = "0dh73bayq78a0idbh2lprmb8hazj03g4ma5gcmad06bq01nl9yxh"; + version = "0.2.1.0"; + sha256 = "157y53hh43bj2inzvfr5hq538003jif25dy3329xkihq720ddxgv"; libraryHaskellDepends = [ aeson base @@ -145240,6 +144695,7 @@ self: { hashable persistent QuickCheck + random text ]; testHaskellDepends = [ @@ -145499,7 +144955,6 @@ self: { ]; description = "Unofficial Haskell SDK for the CloudEvents specification"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -147231,73 +146686,6 @@ self: { ) { }; co-log = callPackage ( - { - mkDerivation, - ansi-terminal, - base, - bytestring, - chronos, - co-log-core, - containers, - contravariant, - dependent-map, - dependent-sum, - directory, - doctest, - exceptions, - filepath, - Glob, - hedgehog, - mtl, - text, - transformers, - unliftio-core, - vector, - }: - mkDerivation { - pname = "co-log"; - version = "0.6.1.2"; - sha256 = "0qq3zad2pq6y37ll0hdz3481grng6ms0rb9vkf66663p2qbkngqh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal - base - bytestring - chronos - co-log-core - containers - contravariant - dependent-map - dependent-sum - directory - exceptions - filepath - mtl - text - transformers - unliftio-core - vector - ]; - executableHaskellDepends = [ - base - bytestring - dependent-map - mtl - ]; - testHaskellDepends = [ - base - co-log-core - doctest - Glob - hedgehog - ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = lib.licenses.mpl20; - } - ) { }; - - co-log_0_7_0_0 = callPackage ( { mkDerivation, ansi-terminal, @@ -147361,7 +146749,6 @@ self: { ]; description = "Composable Contravariant Comonadic Logging Library"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -147459,6 +146846,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "effectful log effect using co-log-core"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -147488,6 +146877,8 @@ self: { ]; description = "Structured messages support in co-log ecosystem"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -147568,6 +146959,42 @@ self: { } ) { }; + co-log-simple = callPackage ( + { + mkDerivation, + ansi-terminal, + base, + co-log, + co-log-core, + mtl, + text, + time, + }: + mkDerivation { + pname = "co-log-simple"; + version = "1.2.1"; + sha256 = "193ns8z1gs3rzvrnja2cww05dxdf2097glw9qjzz235wiihg7r8h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal + base + co-log + co-log-core + mtl + text + time + ]; + executableHaskellDepends = [ + base + co-log + ]; + description = "Simple enhancements for logging with co-log"; + license = lib.licenses.isc; + mainProgram = "co-log-simple"; + } + ) { }; + co-log-sys = callPackage ( { mkDerivation, @@ -147915,39 +147342,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.5.16"; - sha256 = "1payg71xcb6p6vzdn4cr2b8lm6xd8fwln55kq0w0kmf77252xxla"; - libraryHaskellDepends = [ - base - express - leancheck - speculate - template-haskell - ]; - testHaskellDepends = [ - base - express - leancheck - speculate - ]; - description = "synthesize Haskell functions out of partial definitions"; - license = lib.licenses.bsd3; - } - ) { }; - - code-conjure_0_7_4 = callPackage ( - { - mkDerivation, - base, - express, - leancheck, - speculate, - template-haskell, - }: - mkDerivation { - pname = "code-conjure"; - version = "0.7.4"; - sha256 = "19ynxnzwfyspr22dgnrs3h6zb7a64lig59xhfir4m055y1wp6qvx"; + version = "0.7.8"; + sha256 = "02fnp1l3mvf8fs84fm2zp0lsm8bd1kmhb3qdnc1qxr5nbkrx74bf"; libraryHaskellDepends = [ base express @@ -147963,7 +147359,6 @@ self: { ]; description = "synthesize Haskell functions out of partial definitions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -148424,6 +147819,8 @@ self: { pname = "codet"; version = "0.1.0.1"; sha256 = "0jv3z28sxdgmbpkxics2c8s4r576fz4r8dv7ai4yy1h4fqsli5vw"; + revision = "1"; + editedCabalFile = "134ah1y9shw15v5ls7xg4rzw0yqdjkrkljbn7wa60k2mx6l7861z"; libraryHaskellDepends = [ base bytestring @@ -148465,6 +147862,8 @@ self: { pname = "codet-plugin"; version = "0.1.0.1"; sha256 = "11ddf0h01qw00q3dd7gk12j31b98ff0yv5jd04wwngkhpcbshgb6"; + revision = "1"; + editedCabalFile = "0qjrxr49ak3cg00pg405sbalh0xb3q0f6v7azgxsjzcr8cd6k881"; libraryHaskellDepends = [ base codet @@ -148483,6 +147882,8 @@ self: { ]; description = "GHC type-checker plugin for solving LiftT instances from codet"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -148706,6 +148107,18 @@ self: { } ) { }; + coerce-with-substitution = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "coerce-with-substitution"; + version = "0.0.0.0"; + sha256 = "1g2a723xlbj2blpyfgcr6jg6a2yyca7pa5dgw9jnpip98hssmhsa"; + libraryHaskellDepends = [ base ]; + description = "Coercions with improved type inference"; + license = lib.licenses.bsd3; + } + ) { }; + coercible-subtypes = callPackage ( { mkDerivation, base }: mkDerivation { @@ -150087,8 +149500,8 @@ self: { }: mkDerivation { pname = "colorhash"; - version = "0.2.0.0"; - sha256 = "0w0f8dr2lzbna2k26ar6zx9bxih6hm9rj60mbcizyv695vhrdvgn"; + version = "0.2.1.0"; + sha256 = "1sv5f9fmalxwm8dm2fgrnhb1llah3jwsk3qlgy53v7y67lf47w2h"; libraryHaskellDepends = [ base colour @@ -150319,6 +149732,7 @@ self: { ]; description = "Working with colours in Accelerate"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -150588,8 +150002,6 @@ self: { doHaddock = false; description = "Haskell COM support library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -151455,6 +150867,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Join text together with commas, and \"and\""; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -151833,29 +151247,39 @@ self: { } ) { }; - commonmark-pandoc_0_2_2_3 = callPackage ( + commonmark-initial = callPackage ( { mkDerivation, base, commonmark, commonmark-extensions, - pandoc-types, + deriving-compat, + dwergaz, + free, + parsec, text, }: mkDerivation { - pname = "commonmark-pandoc"; - version = "0.2.2.3"; - sha256 = "1jjsagf4gcbvzn89abwrczr8xprqnp0mn7bjw3m5lf34nbnd2dza"; + pname = "commonmark-initial"; + version = "0.1.0.0"; + sha256 = "1vgi2yhcs8g5bylmwfkib3b83cq7vw6hacxf1xn0mmyzrdjgmg7c"; libraryHaskellDepends = [ + base + commonmark + deriving-compat + free + text + ]; + testHaskellDepends = [ base commonmark commonmark-extensions - pandoc-types + dwergaz + parsec text ]; - description = "Bridge between commonmark and pandoc AST"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + description = "An initial encoding of the CommonMark language"; + license = lib.licenses.isc; } ) { }; @@ -151902,8 +151326,8 @@ self: { }: mkDerivation { pname = "commonmark-simple"; - version = "0.1.0.0"; - sha256 = "0fvpykqvqi12nsc95pv3xwd67sdamxc79r24w5xf30f87p0f9kna"; + version = "0.2.0.0"; + sha256 = "16j4zs8c95ma77171jhiyfg5h4vmlkqf34rsn52ycaqx75193f7j"; libraryHaskellDepends = [ aeson base @@ -151918,7 +151342,7 @@ self: { relude yaml ]; - description = "Simple interface to commonmark-hs"; + description = "Simple interface to commonmark-hs for parsing real-world Markdown"; license = lib.licenses.mit; } ) { }; @@ -151930,6 +151354,8 @@ self: { base, commonmark, commonmark-pandoc, + commonmark-simple, + hspec, megaparsec, network-uri, pandoc-types, @@ -151940,8 +151366,8 @@ self: { }: mkDerivation { pname = "commonmark-wikilink"; - version = "0.1.0.0"; - sha256 = "1varv4zihai08wvgpsf9pp3qaa1wniii21qhgy39cpcz9n9s2hv2"; + version = "0.2.0.0"; + sha256 = "0nq7992iyvw303z1fvhrnzbm4fb10n1h24jrvshv4q2ynbksmny9"; libraryHaskellDepends = [ aeson base @@ -151955,6 +151381,21 @@ self: { uri-encode url-slug ]; + testHaskellDepends = [ + aeson + base + commonmark + commonmark-pandoc + commonmark-simple + hspec + megaparsec + network-uri + pandoc-types + parsec + relude + uri-encode + url-slug + ]; description = "Obsidian-friendly commonmark wikilink parser"; license = lib.licenses.mit; } @@ -152626,6 +152067,8 @@ self: { ]; description = "Small vectors of small integers stored very compactly"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -152862,6 +152305,8 @@ self: { ]; description = "Compositional Data Types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -152893,6 +152338,7 @@ self: { ]; description = "Tree automata on Compositional Data Types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -155701,6 +155147,8 @@ self: { ]; description = "Concurrent networked stream transducers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -155898,6 +155346,8 @@ self: { libraryHaskellDepends = [ base ]; description = "More utilities and broad-used datastructures for concurrency"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -157541,6 +156991,8 @@ self: { ]; description = "Configuration management library"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -157588,6 +157040,7 @@ self: { ]; description = "conferer's source for reading json files"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -157633,6 +157086,7 @@ self: { ]; description = "Configuration for reading dhall files"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -157666,6 +157120,7 @@ self: { ]; description = "conferer's FromConfig instances for hedis settings"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -158057,6 +157512,7 @@ self: { ]; description = "Configuration for reading yaml files"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -158757,8 +158213,8 @@ self: { pname = "configurator-pg"; version = "0.2.10"; sha256 = "12a67pz6d2vpsa5qdaxm8lwl3jjg8f0idd5r3bjnqw22ji39cysj"; - revision = "1"; - editedCabalFile = "1v5zqpyyqrsh078glwlk5k8w0k64j6is41hpaz7fd000bdyk1810"; + revision = "3"; + editedCabalFile = "156p0hr14ggf2sfiivgndzrsayxfrmr22pr9hs6jban7m5r627ng"; libraryHaskellDepends = [ base containers @@ -160587,8 +160043,8 @@ self: { }: mkDerivation { pname = "context"; - version = "0.2.1.0"; - sha256 = "1z10rhy9l2rssvh65bdb4bg4qfsgxa5mkjyhx86l8dksp8kd6cjm"; + version = "0.2.1.1"; + sha256 = "1q9hgfchss0aqc0lhdfvy8jsgcch6p3c61b605jjg7h74vzrwsgl"; libraryHaskellDepends = [ base containers @@ -160865,52 +160321,6 @@ self: { ) { }; contiguous = callPackage ( - { - mkDerivation, - base, - deepseq, - primitive, - primitive-unlifted, - QuickCheck, - quickcheck-classes, - quickcheck-instances, - random, - random-shuffle, - run-st, - vector, - weigh, - }: - mkDerivation { - pname = "contiguous"; - version = "0.6.4.2"; - sha256 = "0ay0hrdi2gj3b2z81cswmcaphkyy57w532svyc5mm3mncd0ddsm8"; - libraryHaskellDepends = [ - base - deepseq - primitive - primitive-unlifted - run-st - ]; - testHaskellDepends = [ - base - primitive - QuickCheck - quickcheck-classes - quickcheck-instances - vector - ]; - benchmarkHaskellDepends = [ - base - random - random-shuffle - weigh - ]; - description = "Unified interface for primitive arrays"; - license = lib.licenses.bsd3; - } - ) { }; - - contiguous_0_6_5_0 = callPackage ( { mkDerivation, base, @@ -160953,7 +160363,6 @@ self: { ]; description = "Unified interface for primitive arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -161121,6 +160530,7 @@ self: { ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -161150,6 +160560,7 @@ self: { ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -161990,11 +161401,45 @@ self: { ]; description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "convert-annotation"; } ) { }; + convert-units = callPackage ( + { + mkDerivation, + base, + criterion, + hspec, + linear, + QuickCheck, + template-haskell, + }: + mkDerivation { + pname = "convert-units"; + version = "0"; + sha256 = "1bwivxq8farqzr2wmmnknnnrr8mv46i6kz1akackqvpl4d0n7cnm"; + libraryHaskellDepends = [ + base + template-haskell + ]; + testHaskellDepends = [ + base + hspec + linear + QuickCheck + template-haskell + ]; + benchmarkHaskellDepends = [ + base + criterion + template-haskell + ]; + description = "Arithmetic and type checked conversions between units"; + license = lib.licenses.bsd3; + } + ) { }; + convertible = callPackage ( { mkDerivation, @@ -162121,8 +161566,8 @@ self: { }: mkDerivation { pname = "convex-schema-parser"; - version = "0.1.3.0"; - sha256 = "01z32fdxzwqbn8i7izh4amqa3jv4zfkxjn2zcy3fmyc7js72az68"; + version = "0.1.8.0"; + sha256 = "15czjgcva7h6c73z863ywpk2gb3l3c2kj8vhhcx95rxzgfzrc1mv"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -162192,6 +161637,8 @@ self: { ]; description = "Convex hull"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -162405,8 +161852,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "4.1"; - sha256 = "04zhqkkp66alvk6b2mhgdvdg2d9yjyyzmv7vp7caj13cyqrifflz"; + version = "4.5.1"; + sha256 = "1izskzqahviqa7gn5nqhq7i4lplzgz40xnj7fr8mab6b7rl83j6f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162426,44 +161873,6 @@ self: { } ) { }; - copilot_4_4 = callPackage ( - { - mkDerivation, - base, - copilot-c99, - copilot-core, - copilot-language, - copilot-libraries, - copilot-prettyprinter, - copilot-theorem, - directory, - filepath, - optparse-applicative, - }: - mkDerivation { - pname = "copilot"; - version = "4.4"; - sha256 = "1fazwy4wnbf7jvs793kwhpc6hjnxf0ak9fhpnlvmdcwryz35nfbw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - copilot-c99 - copilot-core - copilot-language - copilot-libraries - copilot-prettyprinter - copilot-theorem - directory - filepath - optparse-applicative - ]; - description = "A stream DSL for writing embedded C programs"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - copilot-bluespec = callPackage ( { mkDerivation, @@ -162486,8 +161895,8 @@ self: { }: mkDerivation { pname = "copilot-bluespec"; - version = "4.4"; - sha256 = "1iw53mmq7hn8a1zy1i8zhjapfdaccvg1l0xwgpkr53b761srbpni"; + version = "4.5.1"; + sha256 = "0lznkmyy8mgp5mlrazp57qqa7xld3f4w4cngy5379s0ipfw1h6bc"; libraryHaskellDepends = [ base copilot-core @@ -162541,8 +161950,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "4.1"; - sha256 = "0lqjqji6v7bxavqlg367837n7qvdlba11y0x24pkl6djdwq4rx5p"; + version = "4.5.1"; + sha256 = "1kw8fz4alxa7l0bpg5zyr440mkm2rd0rr56yq2bj4hddh8280imv"; libraryHaskellDepends = [ base copilot-core @@ -162572,60 +161981,6 @@ self: { } ) { }; - copilot-c99_4_4 = callPackage ( - { - mkDerivation, - base, - copilot-core, - directory, - filepath, - HUnit, - language-c99, - language-c99-simple, - mtl, - pretty, - process, - QuickCheck, - random, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - unix, - }: - mkDerivation { - pname = "copilot-c99"; - version = "4.4"; - sha256 = "0wk3b1m9har25iwd0fg9pzcffk23gz0bf7xmfljr4fxlf16gqz0s"; - libraryHaskellDepends = [ - base - copilot-core - directory - filepath - language-c99 - language-c99-simple - mtl - pretty - ]; - testHaskellDepends = [ - base - copilot-core - directory - HUnit - pretty - process - QuickCheck - random - test-framework - test-framework-hunit - test-framework-quickcheck2 - unix - ]; - description = "A compiler for Copilot targeting C99"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - copilot-cbmc = callPackage ( { mkDerivation, @@ -162670,36 +162025,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "4.1"; - sha256 = "0w1bpf2sqmwjsk5pbf5wglmmgi26xa9ns497cs0dqz4v278v98yj"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base - HUnit - QuickCheck - test-framework - test-framework-hunit - test-framework-quickcheck2 - ]; - description = "An intermediate representation for Copilot"; - license = lib.licenses.bsd3; - } - ) { }; - - copilot-core_4_4 = callPackage ( - { - mkDerivation, - base, - HUnit, - QuickCheck, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - }: - mkDerivation { - pname = "copilot-core"; - version = "4.4"; - sha256 = "0rdfz1q1g91jxack93lcl2bj1az53m1k8fs25xi6bqbrbb3w77f0"; + version = "4.5.1"; + sha256 = "1ga075ng7mgkvfn0mx18x10igwdadkv9x18sg1sms9xlby99ppxf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -162711,7 +162038,6 @@ self: { ]; description = "An intermediate representation for Copilot"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -162765,8 +162091,8 @@ self: { }: mkDerivation { pname = "copilot-interpreter"; - version = "4.1"; - sha256 = "016qvssn4hp3nllv9xxsx2d6z4z5m4kq8js5k10dcnhxbkr2bngz"; + version = "4.5.1"; + sha256 = "0idhrr446ihmsa7wnlmk6mh33bjgwxq9fvg8kqhyzva3x93k2h6i"; libraryHaskellDepends = [ base copilot-core @@ -162786,41 +162112,6 @@ self: { } ) { }; - copilot-interpreter_4_4 = callPackage ( - { - mkDerivation, - base, - copilot-core, - copilot-prettyprinter, - pretty, - QuickCheck, - test-framework, - test-framework-quickcheck2, - }: - mkDerivation { - pname = "copilot-interpreter"; - version = "4.4"; - sha256 = "02l48zpj8c51h3hs50j1q1fwglgsn8xdipdz5gha9kghvrkbl7p5"; - libraryHaskellDepends = [ - base - copilot-core - pretty - ]; - testHaskellDepends = [ - base - copilot-core - copilot-prettyprinter - pretty - QuickCheck - test-framework - test-framework-quickcheck2 - ]; - description = "Interpreter for Copilot"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - copilot-language = callPackage ( { mkDerivation, @@ -162841,56 +162132,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "4.1"; - sha256 = "04qa8i4gyvvv3la5qhdqbam0g8kxny6miv4z65g6crwdp9x7bdyv"; - libraryHaskellDepends = [ - array - base - containers - copilot-core - copilot-interpreter - copilot-theorem - data-reify - mtl - ]; - testHaskellDepends = [ - base - copilot-core - copilot-interpreter - HUnit - pretty - QuickCheck - test-framework - test-framework-hunit - test-framework-quickcheck2 - ]; - description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; - license = lib.licenses.bsd3; - } - ) { }; - - copilot-language_4_4 = callPackage ( - { - mkDerivation, - array, - base, - containers, - copilot-core, - copilot-interpreter, - copilot-theorem, - data-reify, - HUnit, - mtl, - pretty, - QuickCheck, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - }: - mkDerivation { - pname = "copilot-language"; - version = "4.4"; - sha256 = "12jzx9sfzpvrbahha3mydpa5bzg2d5biar4cnn9rwxpw4i7vpnzy"; + version = "4.5.1"; + sha256 = "1yvyhldvgwlw0xx3lbcb57668iwf8c2b0856mhqf29vmkp2v4lsg"; libraryHaskellDepends = [ array base @@ -162914,7 +162157,6 @@ self: { ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -162934,47 +162176,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "4.1"; - sha256 = "04vgskgq20q62ybd1lm19bqgqabhfbb6v5vqj92gv9dk4861lahd"; - libraryHaskellDepends = [ - base - containers - copilot-language - mtl - parsec - ]; - testHaskellDepends = [ - base - copilot-interpreter - copilot-language - copilot-theorem - QuickCheck - test-framework - test-framework-quickcheck2 - ]; - description = "Libraries for the Copilot language"; - license = lib.licenses.bsd3; - } - ) { }; - - copilot-libraries_4_4 = callPackage ( - { - mkDerivation, - base, - containers, - copilot-interpreter, - copilot-language, - copilot-theorem, - mtl, - parsec, - QuickCheck, - test-framework, - test-framework-quickcheck2, - }: - mkDerivation { - pname = "copilot-libraries"; - version = "4.4"; - sha256 = "0q1znmgjk4hbd6z25avw23la6ckn7117vv9q4kkn4gyjy7q2kpjc"; + version = "4.5.1"; + sha256 = "1xk0wb6pfs54lj5i5zww55llyxyfsav1jphgcmhfbfx7lfqz6lwr"; libraryHaskellDepends = [ base containers @@ -162993,7 +162196,6 @@ self: { ]; description = "Libraries for the Copilot language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -163006,29 +162208,8 @@ self: { }: mkDerivation { pname = "copilot-prettyprinter"; - version = "4.1"; - sha256 = "0hd3dghc62wi1rj0ilwdgjw60kvbrqhcwdc502r0xny9ha9b6ws5"; - libraryHaskellDepends = [ - base - copilot-core - pretty - ]; - description = "A prettyprinter of Copilot Specifications"; - license = lib.licenses.bsd3; - } - ) { }; - - copilot-prettyprinter_4_4 = callPackage ( - { - mkDerivation, - base, - copilot-core, - pretty, - }: - mkDerivation { - pname = "copilot-prettyprinter"; - version = "4.4"; - sha256 = "06134bgb2386mfcgqyka2ldwiwxskv6d2lmqqyvdwg21108kn59f"; + version = "4.5.1"; + sha256 = "0ih84a3nwjvk801f9xxlf40scvlihh58wmqw9gz7xp2sdsgvnr4q"; libraryHaskellDepends = [ base copilot-core @@ -163036,7 +162217,6 @@ self: { ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -163071,69 +162251,6 @@ self: { ) { }; copilot-theorem = callPackage ( - { - mkDerivation, - base, - bimap, - bv-sized, - containers, - copilot-core, - copilot-prettyprinter, - data-default, - directory, - libBF, - mtl, - panic, - parameterized-utils, - parsec, - pretty, - process, - QuickCheck, - random, - test-framework, - test-framework-quickcheck2, - transformers, - what4, - xml, - }: - mkDerivation { - pname = "copilot-theorem"; - version = "4.1"; - sha256 = "0jki4295p9z3a2n81pvzi1bs7i75ya9jf324cw4wiqk9r1zajdb2"; - libraryHaskellDepends = [ - base - bimap - bv-sized - containers - copilot-core - copilot-prettyprinter - data-default - directory - libBF - mtl - panic - parameterized-utils - parsec - pretty - process - random - transformers - what4 - xml - ]; - testHaskellDepends = [ - base - copilot-core - QuickCheck - test-framework - test-framework-quickcheck2 - ]; - description = "k-induction for Copilot"; - license = lib.licenses.bsd3; - } - ) { }; - - copilot-theorem_4_4 = callPackage ( { mkDerivation, base, @@ -163149,7 +162266,6 @@ self: { mtl, panic, parameterized-utils, - parsec, pretty, process, QuickCheck, @@ -163162,8 +162278,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "4.4"; - sha256 = "0v1b9nn783w9xc4mqq7ns0wn09rkfzl5vhy6x0icsidyp1h9kcdh"; + version = "4.5.1"; + sha256 = "13gg0xmabf31jd9k6hb6s7pd72p18y9k0pi3h2ga4c3fkpr6dzrw"; libraryHaskellDepends = [ base bimap @@ -163177,7 +162293,6 @@ self: { mtl panic parameterized-utils - parsec pretty process random @@ -163195,7 +162310,6 @@ self: { ]; description = "k-induction for Copilot"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -163238,8 +162352,8 @@ self: { }: mkDerivation { pname = "copilot-verifier"; - version = "4.4"; - sha256 = "02kwvq3h04xq988zgvkhghfz4g00fj3s3bjfsp9962mw4dir3mbf"; + version = "4.5.1"; + sha256 = "1a98h8pfxj2sz7dgq6a95ih9pgxkxbg7dzliczyd885s5hbfdb4k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163338,6 +162452,48 @@ self: { } ) { }; + copilot-visualizer = callPackage ( + { + mkDerivation, + aeson, + base, + copilot, + copilot-core, + copilot-interpreter, + copilot-language, + filepath, + hint, + ogma-extra, + pretty, + text, + websockets, + }: + mkDerivation { + pname = "copilot-visualizer"; + version = "4.5.1"; + sha256 = "0bpy73c1gflj3q03kary0pqr083hncwnhvzbyy0293vxk2p6izxf"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + base + copilot + copilot-core + copilot-interpreter + copilot-language + filepath + hint + ogma-extra + pretty + text + websockets + ]; + description = "Visualizer for Copilot"; + license = lib.licenses.bsd3; + } + ) { }; + copr = callPackage ( { mkDerivation, @@ -163472,7 +162628,9 @@ self: { ]; description = "Yet another shell monad"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "readme"; + broken = true; } ) { }; @@ -165009,6 +164167,78 @@ self: { } ) { }; + covenant = callPackage ( + { + mkDerivation, + acc, + base, + bimap, + bytestring, + containers, + enummapset, + mtl, + nonempty-vector, + optics-core, + optics-extra, + optics-th, + prettyprinter, + QuickCheck, + quickcheck-instances, + quickcheck-transformer, + tasty, + tasty-expected-failure, + tasty-hunit, + tasty-quickcheck, + text, + transformers, + vector, + }: + mkDerivation { + pname = "covenant"; + version = "1.1.0"; + sha256 = "0cgf0l1xsm6l1gqn4mdvlz7j4rh1nx5pkimp6y18x8lp5498bbkj"; + libraryHaskellDepends = [ + acc + base + bimap + bytestring + containers + enummapset + mtl + nonempty-vector + optics-core + optics-extra + optics-th + prettyprinter + QuickCheck + quickcheck-instances + quickcheck-transformer + tasty-hunit + text + transformers + vector + ]; + testHaskellDepends = [ + base + containers + mtl + nonempty-vector + optics-core + prettyprinter + QuickCheck + tasty + tasty-expected-failure + tasty-hunit + tasty-quickcheck + vector + ]; + description = "Standalone IR for Cardano scripts"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + coverage = callPackage ( { mkDerivation, @@ -165338,6 +164568,81 @@ self: { } ) { }; + cpmonad = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + data-default, + deepseq, + directory, + hspec, + hspec-contrib, + HUnit, + microlens, + microlens-th, + mtl, + optparse-applicative, + process, + QuickCheck, + random, + temporary, + transformers, + vector, + vector-algorithms, + }: + mkDerivation { + pname = "cpmonad"; + version = "0.1.0.0"; + sha256 = "1cdm4npf1x1c6lqw3s7rq1kgs733m0aflc8b8vs2j9mniw60s5sg"; + libraryHaskellDepends = [ + base + bytestring + containers + data-default + deepseq + directory + microlens + microlens-th + mtl + optparse-applicative + process + random + temporary + transformers + vector + vector-algorithms + ]; + testHaskellDepends = [ + base + bytestring + containers + data-default + deepseq + directory + hspec + hspec-contrib + HUnit + microlens + microlens-th + mtl + optparse-applicative + process + QuickCheck + random + temporary + transformers + vector + vector-algorithms + ]; + description = "Competitive programming problemsetting toolchain"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + cppfilt = callPackage ( { mkDerivation, @@ -165403,6 +164708,39 @@ self: { } ) { }; + cpphs_1_20_10 = callPackage ( + { + mkDerivation, + base, + directory, + polyparse, + time, + }: + mkDerivation { + pname = "cpphs"; + version = "1.20.10"; + sha256 = "06acgidypq7jkd43lxkb97k6plha6i4qi3i3g68wdld1lblqm9vz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + directory + polyparse + time + ]; + executableHaskellDepends = [ + base + directory + polyparse + time + ]; + description = "A liberalised re-implementation of cpp, the C pre-processor"; + license = "LGPL"; + hydraPlatforms = lib.platforms.none; + mainProgram = "cpphs"; + } + ) { }; + cprng-aes = callPackage ( { mkDerivation, @@ -166663,8 +166001,8 @@ self: { }: mkDerivation { pname = "crc"; - version = "0.1.1.1"; - sha256 = "1c3xqjwji5czl58bnlchj0sazziwd6pzacg66kfzda0v22g69l28"; + version = "0.1.2.0"; + sha256 = "106vd9i47l99bd1spg3sx42ab3gpva0xarpcb3k8yvrrxir74g0i"; libraryHaskellDepends = [ base bytestring @@ -167111,6 +166449,46 @@ self: { } ) { }; + creditmonad = callPackage ( + { + mkDerivation, + base, + containers, + mtl, + prettyprinter, + QuickCheck, + STMonadTrans, + unliftio, + }: + mkDerivation { + pname = "creditmonad"; + version = "1.1.0"; + sha256 = "0zyq1h3k7z2q5s4ihm28j365i8inz7b4svjbqxxxkza6ph0kq86g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + mtl + prettyprinter + QuickCheck + STMonadTrans + ]; + executableHaskellDepends = [ + base + containers + mtl + prettyprinter + QuickCheck + STMonadTrans + unliftio + ]; + description = "Reasoning about amortized time complexity"; + license = lib.licenses.bsd3; + mainProgram = "creditmonad"; + } + ) { }; + crem = callPackage ( { mkDerivation, @@ -167504,6 +166882,113 @@ self: { } ) { }; + criterion_1_6_4_1 = callPackage ( + { + mkDerivation, + aeson, + base, + base-compat, + base-compat-batteries, + binary, + binary-orphans, + bytestring, + cassava, + code-page, + containers, + criterion-measurement, + deepseq, + directory, + exceptions, + filepath, + Glob, + HUnit, + js-chart, + microstache, + mtl, + mwc-random, + optparse-applicative, + parsec, + prettyprinter, + prettyprinter-ansi-terminal, + QuickCheck, + statistics, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + time, + transformers, + transformers-compat, + vector, + vector-algorithms, + }: + mkDerivation { + pname = "criterion"; + version = "1.6.4.1"; + sha256 = "03danwzqimrnw39s91pxmya3jrb4wxvx0ijm3qr5mik8axn6z9af"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + base + base-compat-batteries + binary + binary-orphans + bytestring + cassava + code-page + containers + criterion-measurement + deepseq + directory + exceptions + filepath + Glob + js-chart + microstache + mtl + mwc-random + optparse-applicative + parsec + prettyprinter + prettyprinter-ansi-terminal + statistics + text + time + transformers + transformers-compat + vector + vector-algorithms + ]; + executableHaskellDepends = [ + base + base-compat-batteries + optparse-applicative + ]; + testHaskellDepends = [ + aeson + base + base-compat + base-compat-batteries + bytestring + deepseq + directory + HUnit + QuickCheck + statistics + tasty + tasty-hunit + tasty-quickcheck + vector + ]; + description = "Robust, reliable performance measurement and analysis"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "criterion-report"; + } + ) { }; + criterion-cmp = callPackage ( { mkDerivation, @@ -167588,7 +167073,9 @@ self: { ]; description = "A simple tool for visualising differences in Criterion benchmark results"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "criterion-compare"; + broken = true; } ) { }; @@ -168078,6 +167565,46 @@ self: { } ) { }; + croque-mort = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + directory, + filepath, + html-entities, + optparse-applicative, + poolboy, + scalpel, + text, + }: + mkDerivation { + pname = "croque-mort"; + version = "0.1.0.0"; + sha256 = "0bax55lbn422693pl1allhii64vqarwx8jx7qdsyghqp5c123ljq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson + base + bytestring + containers + directory + filepath + html-entities + optparse-applicative + poolboy + scalpel + text + ]; + description = "Dead simple broken links checker on local HTML folders"; + license = lib.licenses.isc; + mainProgram = "croque-mort"; + } + ) { }; + crucible = callPackage ( { mkDerivation, @@ -168220,7 +167747,9 @@ self: { ]; description = "An interactive debugger for Crucible programs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "crucible-debug"; + broken = true; } ) { }; @@ -168307,6 +167836,7 @@ self: { ]; description = "Support for translating and executing LLVM code in Crucible"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -168373,6 +167903,8 @@ self: { ]; description = "An implementation of symbolic I/O primitives for Crucible"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -168590,6 +168122,7 @@ self: { ]; description = "Simple top-level library for Crucible Simulation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -168714,6 +168247,7 @@ self: { ]; description = "A verification tool for C programs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -168753,6 +168287,8 @@ self: { testSystemDepends = [ libxcrypt ]; description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { inherit (pkgs) libxcrypt; }; @@ -170064,10 +169600,8 @@ self: { }: mkDerivation { pname = "cryptoids"; - version = "0.5.1.0"; - sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466"; - revision = "5"; - editedCabalFile = "1g2p5519rrbiizry5izdmqn47sayv7v7kqmj0w7abdn6b68di73j"; + version = "0.5.1.1"; + sha256 = "1n2za35fkazg6510mg2g3pqg56hshy5yvi21g1ixn030d4jc5020"; libraryHaskellDepends = [ base binary @@ -170095,10 +169629,8 @@ self: { }: mkDerivation { pname = "cryptoids-class"; - version = "0.0.0"; - sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy"; - revision = "4"; - editedCabalFile = "0c3cq648sh5cpj0isknhayamzgzv8avixxfpzr4riags70jr28ld"; + version = "0.0.0.1"; + sha256 = "0l33wc3ki93i7ckj8y0haidxvg66mq2jas138ikagw3qgb91dv71"; libraryHaskellDepends = [ base cryptoids-types @@ -170123,10 +169655,8 @@ self: { }: mkDerivation { pname = "cryptoids-types"; - version = "1.0.0"; - sha256 = "0dhv92hdydhhgwgdihl3wpiyxl10szrgfnb68ygn07xxhmmfc3hf"; - revision = "2"; - editedCabalFile = "0nszxjdf9zd7dh4ar2vbnjs8a5awbqh2m3p0pvsypgiflcrlp9wn"; + version = "1.0.0.1"; + sha256 = "05qfmbh4bdx69m925p9818n7fj8rxyr2knkkx9lkwq5ikjmv3q8p"; libraryHaskellDepends = [ aeson base @@ -170358,6 +169888,83 @@ self: { } ) { }; + crypton-asn1-encoding = callPackage ( + { + mkDerivation, + base, + bytestring, + crypton-asn1-types, + tasty, + tasty-quickcheck, + time-hourglass, + }: + mkDerivation { + pname = "crypton-asn1-encoding"; + version = "0.10.0"; + sha256 = "1li6577cpw6dsxacawqc94pba2anj1bnip82h75jixjkw873m0a9"; + libraryHaskellDepends = [ + base + bytestring + crypton-asn1-types + time-hourglass + ]; + testHaskellDepends = [ + base + bytestring + crypton-asn1-types + tasty + tasty-quickcheck + time-hourglass + ]; + description = "ASN.1 data (raw, BER or DER) readers and writers"; + license = lib.licenses.bsd3; + } + ) { }; + + crypton-asn1-parse = callPackage ( + { + mkDerivation, + base, + bytestring, + crypton-asn1-types, + }: + mkDerivation { + pname = "crypton-asn1-parse"; + version = "0.10.0"; + sha256 = "1n98fzzc1hx4jfsax83iky5hkyzpavraghl9mns21dzwv1wg5h1m"; + libraryHaskellDepends = [ + base + bytestring + crypton-asn1-types + ]; + description = "A monadic parser combinator for a ASN.1 stream."; + license = lib.licenses.bsd3; + } + ) { }; + + crypton-asn1-types = callPackage ( + { + mkDerivation, + base, + base16, + bytestring, + time-hourglass, + }: + mkDerivation { + pname = "crypton-asn1-types"; + version = "0.4.1"; + sha256 = "0b9h9qzgs1afq1iiyvjs15z5kh97jjfq74x7jawxvlx0fwwcdvv1"; + libraryHaskellDepends = [ + base + base16 + bytestring + time-hourglass + ]; + description = "ASN.1 types"; + license = lib.licenses.bsd3; + } + ) { }; + crypton-box = callPackage ( { mkDerivation, @@ -170447,26 +170054,26 @@ self: { base, bytestring, containers, + crypton-socks, crypton-x509-store, crypton-x509-system, data-default, network, - socks, tls, }: mkDerivation { pname = "crypton-connection"; - version = "0.4.4"; - sha256 = "14d47klwmmf7zdm66161rbrbwy58qjzrkmd8mmkfrzm54b16hw14"; + version = "0.4.5"; + sha256 = "1pi56aw3yr4zjfvdrcp6q4vwggml040c5m6bdd916zzbjpqbkpdw"; libraryHaskellDepends = [ base bytestring containers + crypton-socks crypton-x509-store crypton-x509-system data-default network - socks tls ]; description = "Simple and easy network connection API"; @@ -170474,6 +170081,70 @@ self: { } ) { }; + crypton-pem = callPackage ( + { + mkDerivation, + base, + base64, + bytestring, + deepseq, + HUnit, + QuickCheck, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + text, + }: + mkDerivation { + pname = "crypton-pem"; + version = "0.3.0"; + sha256 = "0h05hg2hxsvvg8hjad5l2r5wi9x2nhan9w3k93bsriklpa6apb8z"; + libraryHaskellDepends = [ + base + base64 + bytestring + deepseq + text + ]; + testHaskellDepends = [ + base + bytestring + HUnit + QuickCheck + test-framework + test-framework-hunit + test-framework-quickcheck2 + ]; + description = "Privacy Enhanced Mail (PEM) file format reader and writer"; + license = lib.licenses.bsd3; + } + ) { }; + + crypton-socks = callPackage ( + { + mkDerivation, + base, + bytestring, + cereal, + network, + }: + mkDerivation { + pname = "crypton-socks"; + version = "0.6.2"; + sha256 = "0fwzlvndyxjwhxambxdjzzm63yvb6jzsg53dkv3i6x17biz0hdm8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + bytestring + cereal + network + ]; + description = "SOCKS Protocol Version 5"; + license = lib.licenses.bsd3; + } + ) { }; + crypton-x509 = callPackage ( { mkDerivation, @@ -170543,8 +170214,8 @@ self: { }: mkDerivation { pname = "crypton-x509-store"; - version = "1.6.10"; - sha256 = "1c1q8bz42vcwxlij42zx9cgrmpp763q404g5hhws975d1lf67w6f"; + version = "1.6.11"; + sha256 = "07vq7f883cm5krqz2kc0qkh9ks54jknrwdqvfqsk91s12b693a83"; libraryHaskellDepends = [ asn1-encoding asn1-types @@ -172419,6 +172090,7 @@ self: { bytestring, c2hs, Cabal, + containers, directory, filepath, pretty, @@ -172427,8 +172099,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.11.0.1"; - sha256 = "0zfxzmixla3cmzkxrb0amndhhfllsw532ys96r9vc00lfrqlsqqb"; + version = "0.12.8.0"; + sha256 = "06sc7jkg24742frz7q8jimw8szvsva20zy4jn35dj585mibnljcr"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -172440,6 +172112,7 @@ self: { libraryHaskellDepends = [ base bytestring + containers filepath template-haskell uuid-types @@ -172520,8 +172193,8 @@ self: { }: mkDerivation { pname = "cuddle"; - version = "0.5.0.0"; - sha256 = "1vjm6v5wf1hbj7ikwmfxf4ah62g4j33nhqqc1xjb9dll5jlvadyn"; + version = "1.0.0.0"; + sha256 = "04x8n5m1rmm8byd3nvh6pzkvgpy568dhvhq5yydcqcam2nj6nncd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172890,6 +172563,8 @@ self: { ]; description = "Curly braces (brackets) expanding"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -173166,6 +172841,7 @@ self: { { mkDerivation, base, + file-embed, filepath, hspec, hspec-core, @@ -173179,12 +172855,14 @@ self: { }: mkDerivation { pname = "currycarbon"; - version = "0.3.0.1"; - sha256 = "0bgak5yamhqprrjqjslr0w7acmzgz65scm67nnqmga1yf6klz5jk"; + version = "0.4.0.1"; + sha256 = "1qjgm413qxvr99zikd6jvc9znm163x2jr1spp32ig892hqbzcpdw"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base + file-embed filepath math-functions MonadRandom @@ -173209,7 +172887,7 @@ self: { } ) { }; - currycarbon_0_4_0_1 = callPackage ( + currycarbon_0_5_0_0 = callPackage ( { mkDerivation, base, @@ -173227,8 +172905,8 @@ self: { }: mkDerivation { pname = "currycarbon"; - version = "0.4.0.1"; - sha256 = "1qjgm413qxvr99zikd6jvc9znm163x2jr1spp32ig892hqbzcpdw"; + version = "0.5.0.0"; + sha256 = "0d5rc0qj8j92abphfrxgcd2011f7mgxb2b5qsrqds0pmy3abkh94"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -173673,10 +173351,8 @@ self: { }: mkDerivation { pname = "curve25519"; - version = "0.2.8"; - sha256 = "1v621hk9lkz7p8p521jvsa9hi7ssynj9fy1x16lhfnr18gzi789i"; - revision = "1"; - editedCabalFile = "1z9wl41rrwyf45jyb8640d3rs65s919vianyk6hmf1r6wxv0v8zn"; + version = "0.2.8.1"; + sha256 = "0p2rxad477cxbpxryvp78v8nrrf5gm35106jbqrj5cjgksappkdj"; libraryHaskellDepends = [ base bytestring @@ -174072,8 +173748,8 @@ self: { }: mkDerivation { pname = "cvss"; - version = "0.1"; - sha256 = "02ldb650d053hisyb7fdd19x77k8sxvz4y939hj649pjl75b7qdr"; + version = "0.2.0.1"; + sha256 = "174f32cll6r8ks5qpaivgiid0diypj9pckbjvxd575m7kxs60v66"; libraryHaskellDepends = [ base text @@ -176557,8 +176233,8 @@ self: { pname = "data-array-byte"; version = "0.1.0.1"; sha256 = "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv"; - revision = "4"; - editedCabalFile = "1yr2pa9ghmlhy28dfbch7snsmab6y8vvml7ch7pvx44gil0l0h1s"; + revision = "5"; + editedCabalFile = "06xfi70zgpv77nqrrnk649vdzji6cgp40a69i41kw05p7xaa1whc"; libraryHaskellDepends = [ base deepseq @@ -177053,40 +176729,6 @@ self: { ) { }; data-default = callPackage ( - { - mkDerivation, - base, - containers, - data-default-class, - data-default-instances-containers, - data-default-instances-dlist, - data-default-instances-old-locale, - mtl, - old-locale, - }: - mkDerivation { - pname = "data-default"; - version = "0.7.1.3"; - sha256 = "0456mjxg803fzmsy5gm6nc2l1gygkw4rdwg304kn7m710110f13n"; - libraryHaskellDepends = [ - base - data-default-class - data-default-instances-containers - data-default-instances-dlist - data-default-instances-old-locale - ]; - testHaskellDepends = [ - base - containers - mtl - old-locale - ]; - description = "A class for types with a default value"; - license = lib.licenses.bsd3; - } - ) { }; - - data-default_0_8_0_1 = callPackage ( { mkDerivation, base, @@ -177108,23 +176750,10 @@ self: { ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; data-default-class = callPackage ( - { mkDerivation, base }: - mkDerivation { - pname = "data-default-class"; - version = "0.1.2.2"; - sha256 = "1qxfyxdddl0rzigp81p36i1dgddw2yhqskyz8ngkcy6zbq0w407l"; - libraryHaskellDepends = [ base ]; - description = "A class for types with a default value"; - license = lib.licenses.bsd3; - } - ) { }; - - data-default-class_0_2_0_0 = callPackage ( { mkDerivation, data-default }: mkDerivation { pname = "data-default-class"; @@ -177133,7 +176762,6 @@ self: { libraryHaskellDepends = [ data-default ]; description = "A class for types with a default value (compatibility shim)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -177240,6 +176868,8 @@ self: { ]; description = "Default instances for types in base"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -177263,6 +176893,8 @@ self: { ]; description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -177284,6 +176916,8 @@ self: { ]; description = "Default instance for CI type from case-insensitive package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -177305,6 +176939,8 @@ self: { ]; description = "Default instances for types in containers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -177326,6 +176962,8 @@ self: { ]; description = "Default instances for types in dlist"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -177368,6 +177006,8 @@ self: { ]; description = "Default instances for types in old-locale"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -177414,6 +177054,8 @@ self: { ]; description = "Default instances for unordered-containers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -177435,6 +177077,8 @@ self: { ]; description = "Default instances for types defined in vector package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -177649,48 +177293,6 @@ self: { ) { }; data-effects = callPackage ( - { - mkDerivation, - base, - data-default, - data-effects-core, - data-effects-th, - infinite-list, - lens, - tasty, - tasty-discover, - tasty-hunit, - text, - these, - time, - }: - mkDerivation { - pname = "data-effects"; - version = "0.3.0.1"; - sha256 = "0xglskzbh7hfl48hx4674ci4p0k8wk9kj2gcw2skpi39pqy2qiwm"; - libraryHaskellDepends = [ - base - data-default - data-effects-core - data-effects-th - infinite-list - lens - text - these - time - ]; - testHaskellDepends = [ - base - tasty - tasty-hunit - ]; - testToolDepends = [ tasty-discover ]; - description = "A basic framework for effect systems based on effects represented by GADTs"; - license = lib.licenses.mpl20; - } - ) { }; - - data-effects_0_4_2_0 = callPackage ( { mkDerivation, base, @@ -177737,41 +177339,10 @@ self: { testToolDepends = [ tasty-discover ]; description = "A basic framework for effect systems based on effects represented by GADTs"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; } ) { }; data-effects-core = callPackage ( - { - mkDerivation, - base, - compdata, - mtl, - tasty, - tasty-discover, - tasty-hunit, - }: - mkDerivation { - pname = "data-effects-core"; - version = "0.2.0.0"; - sha256 = "1cxagw2h0987k3s1h3wbhqsydjk0yvz4nda5d6yvz2w3jlm1fnqg"; - libraryHaskellDepends = [ - base - compdata - mtl - ]; - testHaskellDepends = [ - base - tasty - tasty-hunit - ]; - testToolDepends = [ tasty-discover ]; - description = "A basic framework for effect systems based on effects represented by GADTs"; - license = lib.licenses.mpl20; - } - ) { }; - - data-effects-core_0_4_3_0 = callPackage ( { mkDerivation, base, @@ -177806,66 +177377,10 @@ self: { testToolDepends = [ tasty-discover ]; description = "A basic framework for effect systems based on effects represented by GADTs"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; } ) { }; data-effects-th = callPackage ( - { - mkDerivation, - base, - containers, - data-default, - data-effects-core, - either, - extra, - formatting, - infinite-list, - lens, - mtl, - tasty, - tasty-discover, - tasty-hunit, - template-haskell, - text, - th-abstraction, - }: - mkDerivation { - pname = "data-effects-th"; - version = "0.2.0.0"; - sha256 = "0b6hwhh7hc7b81xsm1khrjda737gjwg0q48c8v9ai48q5nsnb646"; - revision = "2"; - editedCabalFile = "1zrl8m2w1hlpdhagbhrmq2slf22yfn1am3kw8v68nh2lqp2v9b0x"; - libraryHaskellDepends = [ - base - containers - data-default - data-effects-core - either - extra - formatting - infinite-list - lens - mtl - template-haskell - text - th-abstraction - ]; - testHaskellDepends = [ - base - data-default - data-effects-core - infinite-list - tasty - tasty-hunit - ]; - testToolDepends = [ tasty-discover ]; - description = "Template Haskell utilities for the data-effects library"; - license = "MPL-2.0 AND BSD-3-Clause"; - } - ) { }; - - data-effects-th_0_4_2_1 = callPackage ( { mkDerivation, base, @@ -177913,7 +177428,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Template Haskell utilities for the data-effects library"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -178385,6 +177899,8 @@ self: { ]; description = "Specify that lifted values were forced to WHNF or NF"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -178405,6 +177921,8 @@ self: { ]; description = "A simple multi-way tree data structure"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -180512,8 +180030,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Encryption library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -180946,20 +180462,23 @@ self: { containers, criterion, directory, + filepath, hashable, HUnit, random, random-shuffle, + snappy, statistics, text, time, vector, vector-algorithms, + zstd, }: mkDerivation { pname = "dataframe"; - version = "0.2.0.1"; - sha256 = "1qgdlmyz4mlvqb1qicspv7yiddyla8kxczx7018myryws9861f52"; + version = "0.2.0.2"; + sha256 = "0h4p5lbcka15zn5iqzvjsq2bwc3c1ivia5jf6p2gns8d0di9swbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180969,12 +180488,15 @@ self: { bytestring containers directory + filepath hashable + snappy statistics text time vector vector-algorithms + zstd ]; executableHaskellDepends = [ array @@ -180984,11 +180506,13 @@ self: { containers directory hashable + snappy statistics text time vector vector-algorithms + zstd ]; testHaskellDepends = [ base @@ -181012,6 +180536,117 @@ self: { } ) { }; + dataframe_0_3_0_4 = callPackage ( + { + mkDerivation, + array, + attoparsec, + base, + bytestring, + bytestring-lexing, + containers, + criterion, + directory, + filepath, + granite, + hashable, + HUnit, + process, + random, + random-shuffle, + snappy-hs, + statistics, + template-haskell, + text, + time, + vector, + vector-algorithms, + zstd, + }: + mkDerivation { + pname = "dataframe"; + version = "0.3.0.4"; + sha256 = "1s18jscs5x4m274v18zgbv0cx4m5x4jda1imacjd56jg7h0vd6sk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array + attoparsec + base + bytestring + bytestring-lexing + containers + directory + filepath + granite + hashable + snappy-hs + statistics + template-haskell + text + time + vector + vector-algorithms + zstd + ]; + executableHaskellDepends = [ + array + attoparsec + base + bytestring + bytestring-lexing + containers + directory + granite + hashable + random + snappy-hs + statistics + template-haskell + text + time + vector + vector-algorithms + zstd + ]; + testHaskellDepends = [ + array + attoparsec + base + bytestring + bytestring-lexing + containers + directory + granite + hashable + HUnit + random + random-shuffle + snappy-hs + statistics + template-haskell + text + time + vector + vector-algorithms + zstd + ]; + benchmarkHaskellDepends = [ + base + criterion + process + random + text + time + vector + ]; + description = "A fast, safe, and intuitive DataFrame library"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "dataframe"; + } + ) { }; + datalog = callPackage ( { mkDerivation, @@ -181579,6 +181214,57 @@ self: { } ) { }; + dawgdic = callPackage ( + { + mkDerivation, + base, + binary, + bitvec, + criterion, + deepseq, + hashable, + hspec, + hspec-discover, + primitive, + text, + vector, + vector-binary, + vector-hashtables, + }: + mkDerivation { + pname = "dawgdic"; + version = "0.1.0"; + sha256 = "0jjzaw7na10d8y4nniiv13d15pv17h7nfb44v3nz3h76q7hqzysf"; + libraryHaskellDepends = [ + base + binary + bitvec + deepseq + hashable + primitive + vector + vector-binary + vector-hashtables + ]; + testHaskellDepends = [ + base + hashable + hspec + text + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base + criterion + ]; + description = "Generation and traversal of compressed directed acyclic dawg graphs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + day-comonoid = callPackage ( { mkDerivation, @@ -182060,96 +181746,6 @@ self: { ) { }; dbus = callPackage ( - { - mkDerivation, - base, - bytestring, - cereal, - conduit, - containers, - deepseq, - directory, - exceptions, - extra, - filepath, - lens, - network, - parsec, - process, - QuickCheck, - random, - resourcet, - split, - tasty, - tasty-hunit, - tasty-quickcheck, - template-haskell, - temporary, - text, - th-lift, - transformers, - unix, - vector, - xml-conduit, - xml-types, - }: - mkDerivation { - pname = "dbus"; - version = "1.3.11"; - sha256 = "19py6nx9461vhf6dd5q1j4zvraqyd5060vic5hnv2g6sf7c2s0kj"; - libraryHaskellDepends = [ - base - bytestring - cereal - conduit - containers - deepseq - exceptions - filepath - lens - network - parsec - random - split - template-haskell - text - th-lift - transformers - unix - vector - xml-conduit - xml-types - ]; - testHaskellDepends = [ - base - bytestring - cereal - containers - directory - extra - filepath - network - parsec - process - QuickCheck - random - resourcet - tasty - tasty-hunit - tasty-quickcheck - temporary - text - transformers - unix - vector - ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = lib.licenses.asl20; - } - ) { }; - - dbus_1_4_1 = callPackage ( { mkDerivation, base, @@ -182236,7 +181832,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -182268,7 +181863,9 @@ self: { ]; description = "Simple app launcher for D-Bus"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "dbus-app-launcher"; + broken = true; } ) { }; @@ -183628,8 +183225,6 @@ self: { ]; description = "de Bruijn indices and levels"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -184780,26 +184375,21 @@ self: { mkDerivation, base, deepseq, - ghc-prim, HUnit, test-framework, test-framework-hunit, }: mkDerivation { pname = "deepseq-generics"; - version = "0.2.0.0"; - sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "10"; - editedCabalFile = "1pms44620yw0i08zbaf1v9wi36ai43sd3s762jcx5cap1shjl4qv"; + version = "0.2.0.1"; + sha256 = "1ygfppvlxhm2zl3jvnalinl7cp790m7p31408lzgsw2jah63k6ai"; libraryHaskellDepends = [ base deepseq - ghc-prim ]; testHaskellDepends = [ base deepseq - ghc-prim HUnit test-framework test-framework-hunit @@ -185285,6 +184875,7 @@ self: { ]; description = "Defunctionalization helpers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -185306,6 +184897,8 @@ self: { ]; description = "Defunctionalization helpers: booleans"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -185543,6 +185136,8 @@ self: { ]; description = "Delaunay tessellation"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -187241,8 +186836,8 @@ self: { }: mkDerivation { pname = "derive-has-field"; - version = "0.1.1.0"; - sha256 = "17jvz6w3d806zh80dpgiq7lpxa9qjdj06c1h2x4la1cq0gixj9km"; + version = "0.1.2.0"; + sha256 = "1ccsg6x0isnqgnxdl53y18jciwlv4nvbjb7g4vpdw60s9p0z86xw"; libraryHaskellDepends = [ base template-haskell @@ -187363,6 +186958,8 @@ self: { ]; description = "Derive Prim and PrimUnaligned"; license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -188094,8 +187691,8 @@ self: { }: mkDerivation { pname = "desktop-portal"; - version = "0.8.0.1"; - sha256 = "09rr3ffkg5960dy909x30qlayzcm0ifzy0w64gvsnz3ybkq4c5j9"; + version = "0.8.0.2"; + sha256 = "18rkg11iyar02knk0jljp3kmvk6zhcbilhy5p9hilfsadkd25s0y"; libraryHaskellDepends = [ base binary @@ -188886,8 +188483,9 @@ self: { http-client-tls, http-types, indexed-traversable, - lens-family-core, megaparsec, + microlens, + microlens-mtl, mmorph, mockery, mtl, @@ -188898,7 +188496,6 @@ self: { pretty-simple, prettyprinter, prettyprinter-ansi-terminal, - profunctors, QuickCheck, quickcheck-instances, repline, @@ -188928,8 +188525,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.42.2"; - sha256 = "0fvvqvh6diqi55dmncfs06rvcw8k0a1hs2gq228yxvsfbzcpv44s"; + version = "1.42.3"; + sha256 = "003s0qxrnjhnkybjjgr8adpmm1s5chpbfwxb0zxb7famkhnn3dfb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -188962,8 +188559,9 @@ self: { http-client-tls http-types indexed-traversable - lens-family-core megaparsec + microlens + microlens-mtl mmorph mtl network-uri @@ -188973,7 +188571,6 @@ self: { pretty-simple prettyprinter prettyprinter-ansi-terminal - profunctors repline scientific serialise @@ -189014,8 +188611,9 @@ self: { hashable haskeline indexed-traversable - lens-family-core megaparsec + microlens + microlens-mtl mmorph mtl network-uri @@ -189025,7 +188623,6 @@ self: { pretty-simple prettyprinter prettyprinter-ansi-terminal - profunctors repline scientific serialise @@ -189071,8 +188668,9 @@ self: { http-client http-client-tls indexed-traversable - lens-family-core megaparsec + microlens + microlens-mtl mmorph mockery mtl @@ -189083,7 +188681,6 @@ self: { pretty-simple prettyprinter prettyprinter-ansi-terminal - profunctors QuickCheck quickcheck-instances repline @@ -189135,8 +188732,9 @@ self: { hashable haskeline indexed-traversable - lens-family-core megaparsec + microlens + microlens-mtl mmorph mtl network-uri @@ -189146,7 +188744,6 @@ self: { pretty-simple prettyprinter prettyprinter-ansi-terminal - profunctors repline scientific serialise @@ -189276,8 +188873,8 @@ self: { pname = "dhall-csv"; version = "1.0.4"; sha256 = "1kmrkjc2r5l1q2hc2xq83c25zrfm7w4av0jc06ilxklf4i1kvy4b"; - revision = "1"; - editedCabalFile = "10kmbhaly9z95614x3jfmqkswa249dlmr302wng0dpmw1mxqzz2a"; + revision = "2"; + editedCabalFile = "0xd6v9zdwnbxq065sar6nw8zazbzfag0xllcnjip7vb1bdibawbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189363,6 +188960,8 @@ self: { pname = "dhall-docs"; version = "1.0.12"; sha256 = "0gg0rsm36nrwx7p1fp296y8i5jbldrc0y76n16w7dpqpjpadqviv"; + revision = "1"; + editedCabalFile = "1m7h6y1fkam8kbgdpcgqjg87i820v6z96nqchvamdxnbvwlz4bq2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -189525,8 +189124,8 @@ self: { pname = "dhall-json"; version = "1.7.12"; sha256 = "1ynm347ccqgh2jmnq9mwj3mc3zd81pwqja5ivdwxkjw08d1wsj6a"; - revision = "3"; - editedCabalFile = "1v21yb69aa6hzg6rhwhi6x61nrk35bbhl8pw1dikbw73s95c9f0j"; + revision = "4"; + editedCabalFile = "0wxwkymjg47bwdys9mzp8c96hj4a267x00sqwby8s8m5p0yz6qlk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189657,6 +189256,8 @@ self: { pname = "dhall-lsp-server"; version = "1.1.4"; sha256 = "0vcsik8jwwdmfkj6af82s1i5f8pksfkv09jdn7ni3y0lhin0azsc"; + revision = "1"; + editedCabalFile = "0rvs8qsdmh45sdg626vx559hjm1xfjsrpmfhcw6vx064kshkhd27"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189727,6 +189328,8 @@ self: { pname = "dhall-nix"; version = "1.1.27"; sha256 = "1dqfk8vbb08li3snahml89af7hpqp7w7f0mpl62gh6kcn98sx9k8"; + revision = "1"; + editedCabalFile = "1kb9xh50lqr1ibq5jwd6zbr0kxzbg61lfxgm3lqc6w5gidlswy81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189780,8 +189383,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.10"; sha256 = "09p1zfssqab3p3x3ngidfkf31kk5kvcx8krjiyf18vmq9fn75mm5"; - revision = "2"; - editedCabalFile = "0hk6ndmaf8fcmvi9m414a8pl6q6ykqd1mng8pcmak5b184b61961"; + revision = "3"; + editedCabalFile = "1kj470q34rmrh3hmwy557b21msnjgznl71bb5jw3rxn6dqhmrq6h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189834,6 +189437,8 @@ self: { pname = "dhall-openapi"; version = "1.0.7"; sha256 = "0ykjg64lp46clcrjhy28yg6gc3r9akdfnvai1dc1bm7n0b0b3fv2"; + revision = "1"; + editedCabalFile = "0bvyzviwsi7gwb7j729rdap0ijdims761s8s5hv3388jlhvwya22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190163,6 +189768,8 @@ self: { pname = "dhall-toml"; version = "1.0.4"; sha256 = "1p1jdyl3pm4zd944a4hyysrwbcs9m5n18clzhas2i5wkm7iiz9z2"; + revision = "1"; + editedCabalFile = "1xhilvifblnyn0yf0dg2x8l0rg7v0dydlf13wnblh41n3hnbvz6g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190218,8 +189825,8 @@ self: { pname = "dhall-yaml"; version = "1.2.12"; sha256 = "1sh802maai9vxfrjd0w4k9cv4pklhkxid1s5xdbagywcaqdhk272"; - revision = "4"; - editedCabalFile = "0l874s5q86dzy4q7pwjsdms53lckjamiq1wgll8sg6qifsjspmll"; + revision = "5"; + editedCabalFile = "1m7axqalsikr70kjvm9lcgnwhzzg5wia5avqs6mk1sxabanryzg2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190412,8 +190019,8 @@ self: { }: mkDerivation { pname = "dhscanner-ast"; - version = "1.0.10"; - sha256 = "0k4nligcx6k6nbf3jgslhll1vikbzvb8733m812b1yb9j4y2zk2m"; + version = "1.1.1"; + sha256 = "1bg93w9897ijh28gb13y41slwq5fxr6s9p3q13m8hzv9rva7zzhm"; libraryHaskellDepends = [ aeson base @@ -190443,8 +190050,8 @@ self: { }: mkDerivation { pname = "dhscanner-bitcode"; - version = "1.0.5"; - sha256 = "0ik90c1kxbxrv99psrbyyc740qmi3yv6h8hs4pvfdqf45jmjn3hj"; + version = "1.0.7"; + sha256 = "0z0hqn3f3p5wyk1l93rc14992snbxm2jsda624ix9p2jqj4b104j"; libraryHaskellDepends = [ aeson base @@ -190465,6 +190072,32 @@ self: { } ) { }; + dhscanner-kbgen = callPackage ( + { + mkDerivation, + aeson, + base, + containers, + dhscanner-ast, + dhscanner-bitcode, + }: + mkDerivation { + pname = "dhscanner-kbgen"; + version = "1.0.1"; + sha256 = "19iadc90zg2239h7kffkfgpy3kwdqac75f1r77adn5f9igyaj0pk"; + libraryHaskellDepends = [ + aeson + base + containers + dhscanner-ast + dhscanner-bitcode + ]; + description = "knowledge base predicates for static code analysis"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + } + ) { }; + di = callPackage ( { mkDerivation, @@ -190994,65 +190627,6 @@ self: { ) { }; diagrams-cairo = callPackage ( - { - mkDerivation, - array, - base, - bytestring, - cairo, - colour, - containers, - data-default-class, - diagrams-core, - diagrams-lib, - filepath, - hashable, - JuicyPixels, - lens, - mtl, - optparse-applicative, - pango, - split, - statestack, - transformers, - unix, - vector, - }: - mkDerivation { - pname = "diagrams-cairo"; - version = "1.4.2.1"; - sha256 = "0fqma8m4xrqha079aqqynk23y252x47xfzvb0gss4bvgdmwa0lzc"; - revision = "3"; - editedCabalFile = "1qdx7k5z6bw70y6rmjs5pkwdypsmrl0gmp7qdjmsbkjv2sah7hq4"; - libraryHaskellDepends = [ - array - base - bytestring - cairo - colour - containers - data-default-class - diagrams-core - diagrams-lib - filepath - hashable - JuicyPixels - lens - mtl - optparse-applicative - pango - split - statestack - transformers - unix - vector - ]; - description = "Cairo backend for diagrams drawing EDSL"; - license = lib.licenses.bsd3; - } - ) { }; - - diagrams-cairo_1_5 = callPackage ( { mkDerivation, array, @@ -191108,54 +190682,10 @@ self: { ]; description = "Cairo backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; diagrams-canvas = callPackage ( - { - mkDerivation, - base, - blank-canvas, - cmdargs, - containers, - data-default-class, - diagrams-core, - diagrams-lib, - lens, - mtl, - NumInstances, - optparse-applicative, - statestack, - text, - }: - mkDerivation { - pname = "diagrams-canvas"; - version = "1.4.1.2"; - sha256 = "165iwjvx17ym5qsrxsj7va4kmmifg8nay1qq7mbyp3crvfvkfgv2"; - revision = "2"; - editedCabalFile = "1hmbcr20pwdfd26xr9dx6gdcmzsw1p7k8avgjcvqa4n9p8ykcrqp"; - libraryHaskellDepends = [ - base - blank-canvas - cmdargs - containers - data-default-class - diagrams-core - diagrams-lib - lens - mtl - NumInstances - optparse-applicative - statestack - text - ]; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = lib.licenses.bsd3; - } - ) { }; - - diagrams-canvas_1_4_2 = callPackage ( { mkDerivation, base, @@ -191195,91 +190725,10 @@ self: { ]; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; diagrams-contrib = callPackage ( - { - mkDerivation, - base, - circle-packing, - colour, - containers, - cubicbezier, - data-default, - data-default-class, - diagrams-core, - diagrams-lib, - diagrams-solve, - force-layout, - hashable, - HUnit, - lens, - linear, - mfsolve, - MonadRandom, - monoid-extras, - mtl, - mtl-compat, - parsec, - QuickCheck, - random, - semigroups, - split, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - text, - }: - mkDerivation { - pname = "diagrams-contrib"; - version = "1.4.5.1"; - sha256 = "0whp2p9m7pcb2sgyr8rvhf518f18w5i0vxziganw7qj6ijn9kdyb"; - revision = "2"; - editedCabalFile = "000ybzwi9cj7p6j21xhkby1sg13ph55qmc6j05cw8j5n1a6c1mv5"; - libraryHaskellDepends = [ - base - circle-packing - colour - containers - cubicbezier - data-default - data-default-class - diagrams-core - diagrams-lib - diagrams-solve - force-layout - hashable - lens - linear - mfsolve - MonadRandom - monoid-extras - mtl - mtl-compat - parsec - random - semigroups - split - text - ]; - testHaskellDepends = [ - base - containers - diagrams-lib - HUnit - QuickCheck - test-framework - test-framework-hunit - test-framework-quickcheck2 - ]; - description = "Collection of user contributions to diagrams EDSL"; - license = lib.licenses.bsd3; - } - ) { }; - - diagrams-contrib_1_4_6 = callPackage ( { mkDerivation, base, @@ -191354,7 +190803,6 @@ self: { ]; description = "Collection of user contributions to diagrams EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -191684,77 +191132,6 @@ self: { ) { }; diagrams-input = callPackage ( - { - mkDerivation, - attoparsec, - base, - base64-bytestring, - blaze-builder, - blaze-markup, - bytestring, - colour, - conduit, - conduit-extra, - containers, - css-text, - data-default, - diagrams-core, - diagrams-lib, - digits, - either, - JuicyPixels, - linear, - resourcet, - semigroups, - split, - system-filepath, - text, - transformers, - unordered-containers, - vector, - xml-conduit, - xml-types, - }: - mkDerivation { - pname = "diagrams-input"; - version = "0.1.3.1"; - sha256 = "1xnpgw1dkfa28l03g5cp24khzmb96vv6ws985sxi472ig76ygfwd"; - libraryHaskellDepends = [ - attoparsec - base - base64-bytestring - blaze-builder - blaze-markup - bytestring - colour - conduit - conduit-extra - containers - css-text - data-default - diagrams-core - diagrams-lib - digits - either - JuicyPixels - linear - resourcet - semigroups - split - system-filepath - text - transformers - unordered-containers - vector - xml-conduit - xml-types - ]; - description = "Parse raster and SVG files for diagrams"; - license = lib.licenses.bsd3; - } - ) { }; - - diagrams-input_0_1_5 = callPackage ( { mkDerivation, attoparsec, @@ -191822,120 +191199,10 @@ self: { ]; description = "Parse raster and SVG files for diagrams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; diagrams-lib = callPackage ( - { - mkDerivation, - active, - adjunctions, - array, - base, - bytestring, - cereal, - colour, - containers, - criterion, - data-default-class, - deepseq, - diagrams-core, - diagrams-solve, - directory, - distributive, - dual-tree, - exceptions, - fail, - filepath, - fingertree, - fsnotify, - hashable, - intervals, - JuicyPixels, - lens, - linear, - monoid-extras, - mtl, - numeric-extras, - optparse-applicative, - process, - profunctors, - QuickCheck, - semigroups, - tagged, - tasty, - tasty-hunit, - tasty-quickcheck, - text, - transformers, - unordered-containers, - }: - mkDerivation { - pname = "diagrams-lib"; - version = "1.4.6.2"; - sha256 = "0qz5yrrg4k4f72fg20b1rq5mk7n7q531qmj0irpg9lmrr596bdh9"; - revision = "3"; - editedCabalFile = "0sffvdkbxm1lsl2b7sd6psrrnc4lcc1c5ipvc2hhpmzzmfyc49fc"; - libraryHaskellDepends = [ - active - adjunctions - array - base - bytestring - cereal - colour - containers - data-default-class - diagrams-core - diagrams-solve - directory - distributive - dual-tree - exceptions - fail - filepath - fingertree - fsnotify - hashable - intervals - JuicyPixels - lens - linear - monoid-extras - mtl - optparse-applicative - process - profunctors - semigroups - tagged - text - transformers - unordered-containers - ]; - testHaskellDepends = [ - base - deepseq - diagrams-solve - distributive - lens - numeric-extras - QuickCheck - tasty - tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base - criterion - diagrams-core - ]; - description = "Embedded domain-specific language for declarative graphics"; - license = lib.licenses.bsd3; - } - ) { }; - - diagrams-lib_1_5 = callPackage ( { mkDerivation, active, @@ -191981,10 +191248,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.5"; - sha256 = "0gp9k6cfc62j6rlfiziig6j5shf05d0vbcvss40rzjk8qi012i11"; - revision = "2"; - editedCabalFile = "0499yz41prmsixfq2h9virqr9fkn9akllxxf0yc2kqkv7ran2ij9"; + version = "1.5.0.1"; + sha256 = "0s09qkhlp0w7ga20i482icw48y0l8rgqb38818ny64h3ivh8s5hm"; libraryHaskellDepends = [ active adjunctions @@ -192039,7 +191304,6 @@ self: { ]; description = "Embedded domain-specific language for declarative graphics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -192217,49 +191481,6 @@ self: { ) { }; diagrams-postscript = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - data-default-class, - diagrams-core, - diagrams-lib, - hashable, - lens, - monoid-extras, - mtl, - semigroups, - split, - statestack, - }: - mkDerivation { - pname = "diagrams-postscript"; - version = "1.5.1.1"; - sha256 = "1kwb100k3qif9gc8kgvglya5by61522128cxsjrxk5a8dzpgwal4"; - revision = "4"; - editedCabalFile = "1wm9y3dj5bg6k2jm1ycy8sdg54pzgy2lrhdv9wm2n8jhhk3884qy"; - libraryHaskellDepends = [ - base - bytestring - containers - data-default-class - diagrams-core - diagrams-lib - hashable - lens - monoid-extras - mtl - semigroups - split - statestack - ]; - description = "Postscript backend for diagrams drawing EDSL"; - license = lib.licenses.bsd3; - } - ) { }; - - diagrams-postscript_1_5_2 = callPackage ( { mkDerivation, base, @@ -192278,10 +191499,8 @@ self: { }: mkDerivation { pname = "diagrams-postscript"; - version = "1.5.2"; - sha256 = "08kqhnd5r60kisjraypwjfcri1v4f32rf14js413871pgic4rhy5"; - revision = "2"; - editedCabalFile = "060zkv836i1df97nqkna8fnqkyxv4wgmk7yn74whyf1fii4rf86g"; + version = "1.5.3"; + sha256 = "06jlh6chaba79n2yp10ky0naqki3mw0xysrxi76wsgrrv0qisj8n"; libraryHaskellDepends = [ base bytestring @@ -192299,7 +191518,6 @@ self: { ]; description = "Postscript backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -192331,58 +191549,6 @@ self: { ) { }; diagrams-rasterific = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - data-default-class, - diagrams-core, - diagrams-lib, - file-embed, - filepath, - FontyFruity, - hashable, - JuicyPixels, - lens, - mtl, - optparse-applicative, - Rasterific, - }: - mkDerivation { - pname = "diagrams-rasterific"; - version = "1.4.2.3"; - sha256 = "0n46scybjs8mnhrnh5z3nkrah6f8v1rv4cca8k8mqzsf8ss30q5l"; - revision = "3"; - editedCabalFile = "0yz8vkxp8vi3di8wli6m8090vs56mngv3wr9riam896n1z0xqzg7"; - libraryHaskellDepends = [ - base - bytestring - containers - data-default-class - diagrams-core - diagrams-lib - file-embed - filepath - FontyFruity - hashable - JuicyPixels - lens - mtl - optparse-applicative - Rasterific - ]; - testHaskellDepends = [ - base - diagrams-core - diagrams-lib - ]; - description = "Rasterific backend for diagrams"; - license = lib.licenses.bsd3; - } - ) { }; - - diagrams-rasterific_1_5 = callPackage ( { mkDerivation, base, @@ -192431,7 +191597,6 @@ self: { ]; description = "Rasterific backend for diagrams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -192528,57 +191693,6 @@ self: { ) { }; diagrams-svg = callPackage ( - { - mkDerivation, - base, - base64-bytestring, - bytestring, - colour, - containers, - diagrams-core, - diagrams-lib, - filepath, - hashable, - JuicyPixels, - lens, - monoid-extras, - mtl, - optparse-applicative, - semigroups, - split, - svg-builder, - text, - }: - mkDerivation { - pname = "diagrams-svg"; - version = "1.4.4"; - sha256 = "1h55yvpbrdjfn9512m8sbsyz2zjw6ssi3mh0f3w8dw34f8vlz5b1"; - libraryHaskellDepends = [ - base - base64-bytestring - bytestring - colour - containers - diagrams-core - diagrams-lib - filepath - hashable - JuicyPixels - lens - monoid-extras - mtl - optparse-applicative - semigroups - split - svg-builder - text - ]; - description = "SVG backend for diagrams drawing EDSL"; - license = lib.licenses.bsd3; - } - ) { }; - - diagrams-svg_1_5 = callPackage ( { mkDerivation, base, @@ -192628,7 +191742,6 @@ self: { ]; description = "SVG backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -195105,8 +194218,8 @@ self: { pname = "directory"; version = "1.3.9.0"; sha256 = "1k34iqdkh9d5vjd7wihhjjc6388hfbh7sjwp3msziibz2534i8i0"; - revision = "1"; - editedCabalFile = "05xr3df321hb7rnsbad8bgm1jqi7bzpmi54mja9xg2vknxxi7414"; + revision = "2"; + editedCabalFile = "0sw1gfa9374z4gy03hya4lpswcyg42gvrvs03r60v03a3ih88rzd"; libraryHaskellDepends = [ base file-io @@ -195271,43 +194384,6 @@ self: { ) { }; directory-ospath-streaming = callPackage ( - { - mkDerivation, - base, - directory, - filepath, - os-string, - random, - tasty, - tasty-hunit, - unix, - }: - mkDerivation { - pname = "directory-ospath-streaming"; - version = "0.1.0.3"; - sha256 = "0zj49n8w5130pwnc799may0ps9dmda3dcg0hpcsj3ac08jhy79bg"; - libraryHaskellDepends = [ - base - filepath - os-string - unix - ]; - testHaskellDepends = [ - base - directory - filepath - os-string - random - tasty - tasty-hunit - unix - ]; - description = "Stream directory entries in constant memory in vanilla IO"; - license = lib.licenses.asl20; - } - ) { }; - - directory-ospath-streaming_0_2_2 = callPackage ( { mkDerivation, atomic-counter, @@ -195345,7 +194421,6 @@ self: { ]; description = "Stream directory entries in constant memory in vanilla IO"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -195946,6 +195021,8 @@ self: { pname = "discord-haskell-voice"; version = "3.0.0"; sha256 = "0nac7m0szs0lajgg27h8hpx4q1m6v1nl6y3mzmz9aqhb1zwi0162"; + revision = "1"; + editedCabalFile = "0fj2lvpdaz7mgqz3nk2cvwlx6ddwzpsm7dilaj6r25fy7ljb2f0p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196432,6 +195509,8 @@ self: { ]; description = "Disjoint containers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -198239,14 +197318,16 @@ self: { mtl, profunctors, tagged, + template-haskell, text, + th-abstraction, vector, witherable, }: mkDerivation { pname = "distributors"; - version = "0.1.0.3"; - sha256 = "1xisl64gmzmbgqqv3dnk1jdymq67zcxd4v7lx1fzxvxwr2z8ky5w"; + version = "0.2.0.1"; + sha256 = "11qdcaj1fa5zvxdy85bqc1qm6pnlv4cwym1i8zi1mxcvcmc38fci"; libraryHaskellDepends = [ adjunctions base @@ -198259,7 +197340,9 @@ self: { mtl profunctors tagged + template-haskell text + th-abstraction vector witherable ]; @@ -198276,7 +197359,9 @@ self: { mtl profunctors tagged + template-haskell text + th-abstraction vector witherable ]; @@ -198714,12 +197799,14 @@ self: { bytestring, directory, extra, + fedora-releases, filepath, http-client, http-client-tls, http-directory, http-types, optparse-applicative, + pretty-terminal, regex-posix, simple-cmd, simple-cmd-args, @@ -198731,8 +197818,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "1.2.1"; - sha256 = "1pd6wzr9nsvplb200c2bk8gyhv89lcgc2df86rfzklb6z68dqy7z"; + version = "2.0.1"; + sha256 = "18ga0lq0rhdr7g5v6svfhln3g0a2lrwp2fbzaa2mgl8h9rc2n57f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -198741,12 +197828,14 @@ self: { bytestring directory extra + fedora-releases filepath http-client http-client-tls http-directory http-types optparse-applicative + pretty-terminal regex-posix simple-cmd simple-cmd-args @@ -198758,6 +197847,7 @@ self: { ]; testHaskellDepends = [ base + fedora-releases simple-cmd ]; description = "Fedora image download tool"; @@ -198767,10 +197857,9 @@ self: { } ) { }; - dl-fedora_2_0_1 = callPackage ( + dl-fedora_2_1 = callPackage ( { mkDerivation, - ansi-wl-pprint, base, bytestring, directory, @@ -198794,12 +197883,11 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "2.0.1"; - sha256 = "18ga0lq0rhdr7g5v6svfhln3g0a2lrwp2fbzaa2mgl8h9rc2n57f"; + version = "2.1"; + sha256 = "1j0p9nz5nk7bgmsrzw1asaangcwchld9sy9v1wdbswxv31cja2n3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-wl-pprint base bytestring directory @@ -198921,6 +198009,8 @@ self: { ]; description = "Non-empty difference lists"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -199311,6 +198401,8 @@ self: { ]; description = "DNS name parsing and pattern matching utilities"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -200385,8 +199477,8 @@ self: { }: mkDerivation { pname = "doclayout"; - version = "0.5"; - sha256 = "15i4mz93lvli2hwny1jrw7pq00xwjldm2xdxwlhsgpnr8l142c5h"; + version = "0.5.0.1"; + sha256 = "01vh5j9w0xprh2p9njnrmfj2lpivbfg4r1rksshgaj8b9fqdh8b5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -200608,79 +199700,6 @@ self: { ) { }; doctest = callPackage ( - { - mkDerivation, - base, - code-page, - containers, - deepseq, - directory, - exceptions, - filepath, - ghc, - ghc-paths, - hspec, - hspec-core, - hspec-discover, - HUnit, - mockery, - process, - QuickCheck, - silently, - stringbuilder, - syb, - transformers, - }: - mkDerivation { - pname = "doctest"; - version = "0.22.6"; - sha256 = "02g4iy57xcqs3p5w6hw1rzcbszh3b8c132a4zdfi4qf65pml6b0a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - code-page - containers - deepseq - directory - exceptions - filepath - ghc - ghc-paths - process - syb - transformers - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base - code-page - containers - deepseq - directory - exceptions - filepath - ghc - ghc-paths - hspec - hspec-core - HUnit - mockery - process - QuickCheck - silently - stringbuilder - syb - transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Test interactive Haskell examples"; - license = lib.licenses.mit; - mainProgram = "doctest"; - } - ) { }; - - doctest_0_24_2 = callPackage ( { mkDerivation, base, @@ -200752,7 +199771,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "doctest"; } ) { }; @@ -200948,91 +199966,6 @@ self: { ) { }; doctest-parallel = callPackage ( - { - mkDerivation, - base, - base-compat, - Cabal, - code-page, - containers, - deepseq, - directory, - exceptions, - filepath, - ghc, - ghc-paths, - Glob, - hspec, - hspec-core, - HUnit, - mockery, - process, - QuickCheck, - random, - setenv, - silently, - stringbuilder, - syb, - template-haskell, - transformers, - unordered-containers, - }: - mkDerivation { - pname = "doctest-parallel"; - version = "0.3.1.1"; - sha256 = "1xpk020024vsqh27sp225hx50i1hn5fkhxiyww6wqnhrkxypjkwa"; - revision = "2"; - editedCabalFile = "1s9dibzwnl281ggp507gj1d0h26jczr537wlcr5ks5axwfb0262c"; - libraryHaskellDepends = [ - base - base-compat - Cabal - code-page - containers - deepseq - directory - exceptions - filepath - ghc - ghc-paths - Glob - process - random - syb - template-haskell - transformers - unordered-containers - ]; - testHaskellDepends = [ - base - base-compat - code-page - containers - deepseq - directory - exceptions - filepath - ghc - ghc-paths - hspec - hspec-core - HUnit - mockery - process - QuickCheck - setenv - silently - stringbuilder - syb - transformers - ]; - doHaddock = false; - description = "Test interactive Haskell examples"; - license = lib.licenses.mit; - } - ) { }; - - doctest-parallel_0_4 = callPackage ( { mkDerivation, base, @@ -201114,7 +200047,6 @@ self: { doHaddock = false; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -201742,6 +200674,7 @@ self: { ]; description = "Simple monadic DOM parser"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -202745,8 +201678,8 @@ self: { }: mkDerivation { pname = "dotparse"; - version = "0.1.2.2"; - sha256 = "0zn8vhq76jihraq8brq1h4klx99wsp4qd3ylzr0dzrv1rsiby6vx"; + version = "0.1.2.3"; + sha256 = "0r5dzf30shd2piisn8a1z0i8y31h0xlr55is4dyj7zg7l87i16g4"; libraryHaskellDepends = [ algebraic-graphs base @@ -203972,6 +202905,8 @@ self: { ]; description = "A port of asciimoo's drawille to haskell"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -205093,8 +204028,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "9"; - editedCabalFile = "140svi4r35rji7br3bcrcb7rgwkbzvrsc2nx1xml17sf8d3clj4r"; + revision = "10"; + editedCabalFile = "089qwh3xvpgmgnsw16gwzjsfy2jsk6nr4riyr0mj17pda5sifras"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -205147,28 +204082,36 @@ self: { { mkDerivation, base, - bifunctors, - comonad, + Cabal, + cabal-doctest, containers, + doctest, lens, template-haskell, transformers, }: mkDerivation { pname = "dualizer"; - version = "0.1.0.1"; - sha256 = "022wiqvy2lxfc9zqibrd3av994r6hi9pkqi3b3m53h6zaphpnwl7"; + version = "0.2.0.0"; + sha256 = "0ahfrn988gddfsdyi6sib338ln1ji4lmhvgr6m20j4z0i3q88f7n"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + ]; libraryHaskellDepends = [ base - bifunctors - comonad containers lens template-haskell transformers ]; + testHaskellDepends = [ + base + doctest + ]; description = "Automatically generate dual constructions"; - license = "AGPL"; + license = lib.licenses.agpl3Plus; hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sellout ]; broken = true; @@ -205642,8 +204585,8 @@ self: { pname = "dupIO"; version = "0.1.0"; sha256 = "1j2xi1hskmgkknmg01fbkfa3ry2a1f7mzkvjhkqlsz27v3f3q4lm"; - revision = "1"; - editedCabalFile = "0hpph3a26q0jj0bhvxkngj02m5s3amibjgbazd7aq91phrhykz6z"; + revision = "2"; + editedCabalFile = "0r19v7zfz18z68xhpajajjzmz4kfnz4pjj788ld3yhbnggb6y0gi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206063,6 +205006,8 @@ self: { ]; description = "Dvorak encoding for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -207893,6 +206838,8 @@ self: { ]; description = "Logging made easy"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -208135,6 +207082,8 @@ self: { ]; description = "A Haskell description of the eBird API"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -209656,6 +208605,8 @@ self: { ]; description = "Reducing the pain of transformer stacks with duplicated effects"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -209685,74 +208636,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "2.5.1.0"; - sha256 = "040figskafk9b8gwvphhq1s5mdq2p6fmrwd5yipl36vpdmc350fy"; - libraryHaskellDepends = [ - async - base - bytestring - directory - effectful-core - process - stm - strict-mutable-base - time - unliftio - ]; - testHaskellDepends = [ - base - containers - effectful-core - exceptions - lifted-base - primitive - safe-exceptions - strict-mutable-base - tasty - tasty-hunit - unliftio - ]; - benchmarkHaskellDepends = [ - async - base - tasty-bench - text - unix - unliftio - ]; - description = "An easy to use, performant extensible effects library"; - license = lib.licenses.bsd3; - } - ) { }; - - effectful_2_6_0_0 = callPackage ( - { - mkDerivation, - async, - base, - bytestring, - containers, - directory, - effectful-core, - exceptions, - lifted-base, - primitive, - process, - safe-exceptions, - stm, - strict-mutable-base, - tasty, - tasty-bench, - tasty-hunit, - text, - time, - unix, - unliftio, - }: - mkDerivation { - pname = "effectful"; - version = "2.6.0.0"; - sha256 = "1k850pgslnfdhfwqcwr4hv2ymab4cszklrh4rxmwhwixrbb7m3l8"; + version = "2.6.1.0"; + sha256 = "1khfh55p5brgc7d5hdainsfgij9qpfx744h12gkrrzs9mbl2qxaq"; libraryHaskellDepends = [ async base @@ -209788,7 +208673,6 @@ self: { ]; description = "An easy to use, performant extensible effects library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -209800,6 +208684,7 @@ self: { deepseq, exceptions, monad-control, + mtl, primitive, strict-mutable-base, transformers-base, @@ -209807,14 +208692,15 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "2.5.1.0"; - sha256 = "1mn2f6kv8vnccsdq20fhb4q7xiqh5w0v9bp72ianpyyjyvljbi3a"; + version = "2.6.1.0"; + sha256 = "1wk9p0yr60b6ksh1pgzxqklvdgi4khwdv91h0qi05yyscvv9lrww"; libraryHaskellDepends = [ base containers deepseq exceptions monad-control + mtl primitive strict-mutable-base transformers-base @@ -209825,37 +208711,38 @@ self: { } ) { }; - effectful-core_2_6_0_0 = callPackage ( + effectful-opaleye = callPackage ( { mkDerivation, base, containers, - deepseq, - exceptions, - monad-control, - primitive, - strict-mutable-base, - transformers-base, - unliftio-core, + effectful-core, + effectful-postgresql, + effectful-th, + opaleye, + postgresql-simple, + pretty, + product-profunctors, + text, }: mkDerivation { - pname = "effectful-core"; - version = "2.6.0.0"; - sha256 = "1zi1cgnyfzz5csml8saf9zxixrc7q074ywgh0cjd5k2v3zj79rw1"; + pname = "effectful-opaleye"; + version = "0.1.1.0"; + sha256 = "0lb58a8g1ckzc8q6394z1sdxfr31wwz5czwxbdnmn9440v6qha0d"; libraryHaskellDepends = [ base containers - deepseq - exceptions - monad-control - primitive - strict-mutable-base - transformers-base - unliftio-core + effectful-core + effectful-postgresql + effectful-th + opaleye + postgresql-simple + pretty + product-profunctors + text ]; - description = "An easy to use, performant extensible effects library"; + description = "effectful support for high-level PostgreSQL operations via Opaleye"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -209869,14 +208756,11 @@ self: { }: mkDerivation { pname = "effectful-plugin"; - version = "1.1.0.4"; - sha256 = "0c401ni8ajig5da4dgkk2xbajbkzghrjll8ccfh7pbbiknf7si7j"; - revision = "1"; - editedCabalFile = "1d1ih6q1fapizqw2gzm0jvyhlwgni1sffvghhmcw2dhdbbagmr4g"; + version = "2.0.0.1"; + sha256 = "0k0p9ynpgp2wdq3v5949kl3i8pidkfgzw33h7nrag45jhnszrync"; libraryHaskellDepends = [ base containers - effectful-core ghc ]; testHaskellDepends = [ @@ -209888,31 +208772,28 @@ self: { } ) { }; - effectful-plugin_2_0_0_0 = callPackage ( + effectful-postgresql = callPackage ( { mkDerivation, base, - containers, effectful-core, - ghc, + effectful-th, + postgresql-simple, + unliftio-pool, }: mkDerivation { - pname = "effectful-plugin"; - version = "2.0.0.0"; - sha256 = "11xy98k20r9bw2436digcn3mjdk5qlf12i0h7d0xizsqsdazyvy6"; + pname = "effectful-postgresql"; + version = "0.1.0.1"; + sha256 = "0mmiwcb3mppdrifvxjwsqcnlkbwswaq3n8jgl18ibqciwc78m70b"; libraryHaskellDepends = [ - base - containers - effectful-core - ghc - ]; - testHaskellDepends = [ base effectful-core + effectful-th + postgresql-simple + unliftio-pool ]; - description = "A GHC plugin for improving disambiguation of effects"; + description = "effectful support for mid-level PostgreSQL operations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -210186,6 +209067,8 @@ self: { ]; description = "Computational Effects"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -210205,6 +209088,7 @@ self: { ]; description = "Parser Effect for the Control.Effects Library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -210919,6 +209803,8 @@ self: { ]; description = "Functions involving lists of Either"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -210935,10 +209821,8 @@ self: { }: mkDerivation { pname = "either-result"; - version = "0.3.1.0"; - sha256 = "1l4539j0ynn5jl0rh9bhjxlgvr0sn3bf8ws1zrlbfk15524znqhm"; - revision = "1"; - editedCabalFile = "1bmcvhjw53nhkzm99dzjq1mvj8s7b27ji2h8av5zy2wsniknrzbm"; + version = "0.3.2.0"; + sha256 = "066zvmp9ngcak23ag8w72acbyyq0lr56nm6dxnsnrd212ydkiwgy"; libraryHaskellDepends = [ base mtl @@ -211904,10 +210788,10 @@ self: { }: mkDerivation { pname = "eliminators"; - version = "0.9.4"; - sha256 = "1qr02xlmb6nfd505z0iw7bj7kpha8wyvcr31rm92r1a78pwvysaf"; + version = "0.9.5"; + sha256 = "17pl2mg9bpagzkw50mydls883bj4mm7glmgnm59r57prky9h55gs"; revision = "1"; - editedCabalFile = "1rd0qixjgsm5dk9r8dmdk31i0dvsd57mg212k2c0pxh553lggq1q"; + editedCabalFile = "0dzyskd0av2rdq9bk0y0d2605a65p9xailbbchvmaqjvqf4cqvpm"; libraryHaskellDepends = [ base extra @@ -212886,6 +211770,8 @@ self: { doHaddock = false; description = "Crossing the road between Haskell and Elm"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -213086,6 +211972,57 @@ self: { } ) { }; + elm2nix_0_5_0 = callPackage ( + { + mkDerivation, + aeson, + async, + base, + binary, + bytestring, + containers, + here, + optparse-applicative, + prettyprinter, + process, + text, + transformers, + unordered-containers, + }: + mkDerivation { + pname = "elm2nix"; + version = "0.5.0"; + sha256 = "057rv6mb3a9jsg5sjpcqcdz7w9jckd1fwbi54mymdsdr8yrk78ry"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + async + base + binary + bytestring + containers + here + prettyprinter + process + text + transformers + unordered-containers + ]; + executableHaskellDepends = [ + base + here + optparse-applicative + prettyprinter + ]; + testHaskellDepends = [ base ]; + description = "Turn your Elm project into buildable Nix project"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "elm2nix"; + } + ) { }; + elmental = callPackage ( { mkDerivation, @@ -213332,6 +212269,40 @@ self: { } ) { }; + elynx_0_9_0_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + elynx-tools, + optparse-applicative, + slynx, + tlynx, + }: + mkDerivation { + pname = "elynx"; + version = "0.9.0.0"; + sha256 = "084xfy0lwzqy4sc4ha2lhl79lfp8dxy6b8xj9zy68l78vd7rcq47"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson + base + bytestring + elynx-tools + optparse-applicative + slynx + tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "elynx"; + maintainers = [ lib.maintainers.dschrempf ]; + } + ) { }; + elynx-markov = callPackage ( { mkDerivation, @@ -213386,6 +212357,61 @@ self: { } ) { }; + elynx-markov_0_9_0_0 = callPackage ( + { + mkDerivation, + async, + attoparsec, + base, + bytestring, + containers, + elynx-seq, + elynx-tools, + hmatrix, + hspec, + integration, + math-functions, + mwc-random, + random, + statistics, + vector, + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.9.0.0"; + sha256 = "1xxa8z4m6jngrpib4lfd0a5b52b8pfhqkg1ll3lnda770b03ksyw"; + libraryHaskellDepends = [ + async + attoparsec + base + bytestring + containers + elynx-seq + hmatrix + integration + math-functions + mwc-random + random + statistics + vector + ]; + testHaskellDepends = [ + base + containers + elynx-tools + hmatrix + hspec + random + vector + ]; + benchmarkHaskellDepends = [ base ]; + description = "Simulate molecular sequences along trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + } + ) { }; + elynx-nexus = callPackage ( { mkDerivation, @@ -213413,6 +212439,34 @@ self: { } ) { }; + elynx-nexus_0_9_0_0 = callPackage ( + { + mkDerivation, + attoparsec, + base, + bytestring, + hspec, + }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.9.0.0"; + sha256 = "0490m5wiak1vx2lqmlngnc7783k01v2nqfb2p67jw8gas2vd2d23"; + libraryHaskellDepends = [ + attoparsec + base + bytestring + ]; + testHaskellDepends = [ + base + hspec + ]; + description = "Import and export Nexus files"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + } + ) { }; + elynx-seq = callPackage ( { mkDerivation, @@ -213463,6 +212517,57 @@ self: { } ) { }; + elynx-seq_0_9_0_0 = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + base, + bytestring, + containers, + elynx-tools, + hspec, + matrices, + parallel, + primitive, + random, + vector, + vector-th-unbox, + word8, + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.9.0.0"; + sha256 = "1xmficdc55w4r0gwwrbx8a3226wi4b05xjj8j1nmgrbpx5xwi6vv"; + libraryHaskellDepends = [ + aeson + attoparsec + base + bytestring + containers + matrices + parallel + primitive + random + vector + vector-th-unbox + word8 + ]; + testHaskellDepends = [ + base + bytestring + elynx-tools + hspec + matrices + vector + ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + } + ) { }; + elynx-tools = callPackage ( { mkDerivation, @@ -213507,6 +212612,51 @@ self: { } ) { }; + elynx-tools_0_9_0_0 = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + base, + base16-bytestring, + bytestring, + cryptohash-sha256, + directory, + hmatrix, + optparse-applicative, + random, + template-haskell, + time, + transformers, + zlib, + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.9.0.0"; + sha256 = "1vzbv83nn2g70s8s2dhjh57wmwfrlbafq3bqq0q44ma5dm1dvfnv"; + libraryHaskellDepends = [ + aeson + attoparsec + base + base16-bytestring + bytestring + cryptohash-sha256 + directory + hmatrix + optparse-applicative + random + template-haskell + time + transformers + zlib + ]; + description = "Tools for ELynx"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + } + ) { }; + elynx-tree = callPackage ( { mkDerivation, @@ -213575,16 +212725,81 @@ self: { } ) { }; + elynx-tree_0_9_0_0 = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + base, + bytestring, + comonad, + containers, + criterion, + data-default, + deepseq, + elynx-nexus, + elynx-tools, + hspec, + math-functions, + microlens, + parallel, + QuickCheck, + quickcheck-classes, + random, + statistics, + }: + mkDerivation { + pname = "elynx-tree"; + version = "0.9.0.0"; + sha256 = "06ai953q78hh6szcd01paxf88bg4c1zzw402h0bbfc2vvk3ai0zs"; + libraryHaskellDepends = [ + aeson + attoparsec + base + bytestring + comonad + containers + data-default + deepseq + elynx-nexus + math-functions + parallel + random + statistics + ]; + testHaskellDepends = [ + attoparsec + base + bytestring + containers + data-default + elynx-tools + hspec + QuickCheck + quickcheck-classes + ]; + benchmarkHaskellDepends = [ + base + criterion + elynx-tools + microlens + parallel + random + ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + } + ) { }; + ema = callPackage ( { mkDerivation, aeson, async, base, - constraints-extras, data-default, - dependent-sum, - dependent-sum-template, directory, file-embed, filepath, @@ -213610,17 +212825,14 @@ self: { }: mkDerivation { pname = "ema"; - version = "0.10.2.0"; - sha256 = "197rdjsxmwxairp09jviy0h51j89n3da291bgfh8wg3xfs618vqh"; + version = "0.12.0.0"; + sha256 = "1mv149j0b77y9z89a1izs686ijjg8yl8v4ghj63rpay5yzqkbvwf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base - constraints-extras data-default - dependent-sum - dependent-sum-template directory file-embed filepath @@ -213785,57 +212997,6 @@ self: { ) { }; emacs-module = callPackage ( - { - mkDerivation, - base, - bytestring, - deepseq, - exceptions, - filepath, - monad-control, - monad-interleave, - mtl, - prettyprinter, - prettyprinter-combinators, - primitive, - template-haskell, - text, - transformers-base, - tuples-homogenous-h98, - vector, - void, - }: - mkDerivation { - pname = "emacs-module"; - version = "0.2.1"; - sha256 = "0xmydwd9b78943cqxwx3pk71lp9chr879rpkf2fhfl2g6xvhrf86"; - revision = "1"; - editedCabalFile = "0m616p4mli1785yqr5qq52bi6cwgsqkapam75xq27d1dni0nc7h9"; - libraryHaskellDepends = [ - base - bytestring - deepseq - exceptions - filepath - monad-control - monad-interleave - mtl - prettyprinter - prettyprinter-combinators - primitive - template-haskell - text - transformers-base - tuples-homogenous-h98 - vector - void - ]; - description = "Utilities to write Emacs dynamic modules"; - license = lib.licenses.asl20; - } - ) { }; - - emacs-module_0_2_1_1 = callPackage ( { mkDerivation, base, @@ -213883,7 +213044,6 @@ self: { ]; description = "Utilities to write Emacs dynamic modules"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -214203,6 +213363,7 @@ self: { base, blaze-html, bytestring, + casing, commonmark, commonmark-extensions, commonmark-pandoc, @@ -214210,7 +213371,6 @@ self: { commonmark-wikilink, containers, data-default, - dependent-sum, deriving-aeson, directory, ema, @@ -214224,7 +213384,6 @@ self: { hspec, hspec-hedgehog, ixset-typed, - lvar, map-syntax, megaparsec, monad-logger, @@ -214239,12 +213398,10 @@ self: { pandoc-lua-engine, pandoc-types, parsec, - path-tree, process-extras, profunctors, relude, shower, - some, stm, tagged, tagtree, @@ -214265,8 +213422,8 @@ self: { }: mkDerivation { pname = "emanote"; - version = "1.2.0.0"; - sha256 = "1797n6s86dx64wpvng9zvzpww6qw70i4a2l06bzvvw8xsdr031qh"; + version = "1.4.0.0"; + sha256 = "04qc58lcgn0y7qkmzniiwrkad0gyw16m7rg45s2948yhqzj9nw3z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -214278,6 +213435,7 @@ self: { base blaze-html bytestring + casing commonmark commonmark-extensions commonmark-pandoc @@ -214285,7 +213443,6 @@ self: { commonmark-wikilink containers data-default - dependent-sum deriving-aeson directory ema @@ -214299,7 +213456,6 @@ self: { hspec hspec-hedgehog ixset-typed - lvar map-syntax megaparsec monad-logger @@ -214314,12 +213470,10 @@ self: { pandoc-lua-engine pandoc-types parsec - path-tree process-extras profunctors relude shower - some stm tagged tagtree @@ -214346,6 +213500,7 @@ self: { base blaze-html bytestring + casing commonmark commonmark-extensions commonmark-pandoc @@ -214353,7 +213508,6 @@ self: { commonmark-wikilink containers data-default - dependent-sum deriving-aeson directory ema @@ -214367,7 +213521,6 @@ self: { hspec hspec-hedgehog ixset-typed - lvar map-syntax megaparsec monad-logger @@ -214382,12 +213535,10 @@ self: { pandoc-lua-engine pandoc-types parsec - path-tree process-extras profunctors relude shower - some stm tagged tagtree @@ -214414,6 +213565,7 @@ self: { base blaze-html bytestring + casing commonmark commonmark-extensions commonmark-pandoc @@ -214421,7 +213573,6 @@ self: { commonmark-wikilink containers data-default - dependent-sum deriving-aeson directory ema @@ -214435,7 +213586,6 @@ self: { hspec hspec-hedgehog ixset-typed - lvar map-syntax megaparsec monad-logger @@ -214450,12 +213600,10 @@ self: { pandoc-lua-engine pandoc-types parsec - path-tree process-extras profunctors relude shower - some stm tagged tagtree @@ -214477,7 +213625,9 @@ self: { description = "Emanate a structured view of your plain-text notes"; license = lib.licenses.agpl3Only; badPlatforms = [ "x86_64-darwin" ]; + hydraPlatforms = lib.platforms.none; mainProgram = "emanote"; + broken = true; } ) { }; @@ -214968,58 +214118,6 @@ self: { ) { }; encoding = callPackage ( - { - mkDerivation, - array, - base, - binary, - bytestring, - Cabal, - containers, - extensible-exceptions, - filepath, - ghc-prim, - HaXml, - HUnit, - mtl, - QuickCheck, - regex-compat, - }: - mkDerivation { - pname = "encoding"; - version = "0.8.10"; - sha256 = "0ccysrrpdg97g6ihlk0dh57nja7y3lf4n6ygkz1rff5r2r0z6v80"; - setupHaskellDepends = [ - base - Cabal - containers - filepath - ghc-prim - HaXml - ]; - libraryHaskellDepends = [ - array - base - binary - bytestring - containers - extensible-exceptions - ghc-prim - mtl - regex-compat - ]; - testHaskellDepends = [ - base - bytestring - HUnit - QuickCheck - ]; - description = "A library for various character encodings"; - license = lib.licenses.bsd3; - } - ) { }; - - encoding_0_10_2 = callPackage ( { mkDerivation, array, @@ -215059,7 +214157,6 @@ self: { ]; description = "A library for various character encodings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -216227,22 +215324,12 @@ self: { ) { }; env-guard = callPackage ( - { - mkDerivation, - base, - doctest, - }: + { mkDerivation, base }: mkDerivation { pname = "env-guard"; - version = "0.2"; - sha256 = "0chgskm1893i17b7r704wh44b7wh0ig2jz7y43vznhnmchrc80al"; - revision = "6"; - editedCabalFile = "0ydizcy5mz73wc4835l5cn6c82lc7hllnzrhpmky4jbmvqxm0la2"; + version = "0.2.1"; + sha256 = "0xm9638nkikfy62abims10jmmr9y3rm2vb22aqh4qmjcj4r37ibq"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base - doctest - ]; description = "Conditionally running IO actions based on environment variables"; license = lib.licenses.mit; } @@ -216684,7 +215771,9 @@ self: { ]; description = "Command line normalizer of 𝜑-calculus expressions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "eo-phi-normalizer"; + broken = true; } ) { }; @@ -217247,21 +216336,18 @@ self: { mtl, QuickCheck, STMonadTrans, - template-haskell, transformers, - transformers-compat, }: mkDerivation { pname = "equivalence"; - version = "0.4.1"; - sha256 = "13q0lklm58n0l7bx0d4k1cw1i2il8hpdjp76lb79ix8lv7cxd2jr"; + version = "0.4.1.1"; + sha256 = "1wib20n367x3rjwgpr13jim535karbq155x6mwysqfhmr4fwcvcj"; libraryHaskellDepends = [ base containers mtl STMonadTrans transformers - transformers-compat ]; testHaskellDepends = [ base @@ -217269,9 +216355,7 @@ self: { mtl QuickCheck STMonadTrans - template-haskell transformers - transformers-compat ]; description = "Maintaining an equivalence relation implemented as union-find using STT"; license = lib.licenses.bsd3; @@ -217340,6 +216424,7 @@ self: { erebos = callPackage ( { mkDerivation, + ansi-terminal, async, base, binary, @@ -217354,7 +216439,6 @@ self: { fsnotify, hashable, hashtables, - haskeline, iproute, libpjproject, memory, @@ -217367,13 +216451,14 @@ self: { time, transformers, unix, - uuid, + uuid-types, + websockets, zlib, }: mkDerivation { pname = "erebos"; - version = "0.1.8.1"; - sha256 = "04lw5xr1nxra0i6m6882rhv06lm892rvhaczacbhynrhnblq96dm"; + version = "0.2.0"; + sha256 = "1mqkr4znvbv6wyr14ajzkamj7c5v3qfzfnsigznvz4jjq9hsp8qs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217398,25 +216483,27 @@ self: { text time unix - uuid + uuid-types zlib ]; libraryPkgconfigDepends = [ libpjproject ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ + ansi-terminal base bytestring crypton directory - haskeline mtl network process + stm template-haskell text time transformers - uuid + uuid-types + websockets ]; description = "Decentralized messaging and synchronization"; license = lib.licenses.bsd3; @@ -217743,6 +216830,8 @@ self: { ]; description = "Generic API client library for ERPNext"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -218291,80 +217380,6 @@ self: { ) { }; ersatz = callPackage ( - { - mkDerivation, - array, - attoparsec, - base, - bytestring, - containers, - data-default, - fail, - HUnit, - lens, - mtl, - parsec, - process, - semigroups, - streams, - temporary, - test-framework, - test-framework-hunit, - transformers, - unordered-containers, - }: - mkDerivation { - pname = "ersatz"; - version = "0.5"; - sha256 = "1fzaany3mzzmizfzdglwqni3q842ip5z86apgdla2ynhq0hlmh3m"; - revision = "3"; - editedCabalFile = "11sbymicw1npij9fzrzkn1h47si9bv9nknjvqwny074vnryxy4bq"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array - attoparsec - base - bytestring - containers - data-default - lens - mtl - process - semigroups - streams - temporary - transformers - unordered-containers - ]; - executableHaskellDepends = [ - array - base - containers - fail - lens - mtl - parsec - semigroups - ]; - testHaskellDepends = [ - array - base - containers - data-default - HUnit - test-framework - test-framework-hunit - ]; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - } - ) { }; - - ersatz_0_6 = callPackage ( { mkDerivation, array, @@ -218979,96 +217994,6 @@ self: { ) { }; esqueleto = callPackage ( - { - mkDerivation, - aeson, - attoparsec, - base, - blaze-html, - bytestring, - conduit, - containers, - exceptions, - hspec, - hspec-core, - monad-logger, - mtl, - mysql, - mysql-simple, - persistent, - persistent-mysql, - persistent-postgresql, - persistent-sqlite, - postgresql-simple, - QuickCheck, - resourcet, - tagged, - template-haskell, - text, - time, - transformers, - unliftio, - unordered-containers, - }: - mkDerivation { - pname = "esqueleto"; - version = "3.5.14.0"; - sha256 = "1k285dv55r2s222kpk398bync0s89p4j1r9z4ybl325mlix86x56"; - libraryHaskellDepends = [ - aeson - attoparsec - base - blaze-html - bytestring - conduit - containers - monad-logger - persistent - resourcet - tagged - template-haskell - text - time - transformers - unliftio - unordered-containers - ]; - testHaskellDepends = [ - aeson - attoparsec - base - blaze-html - bytestring - conduit - containers - exceptions - hspec - hspec-core - monad-logger - mtl - mysql - mysql-simple - persistent - persistent-mysql - persistent-postgresql - persistent-sqlite - postgresql-simple - QuickCheck - resourcet - tagged - template-haskell - text - time - transformers - unliftio - unordered-containers - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - } - ) { }; - - esqueleto_3_6_0_0 = callPackage ( { mkDerivation, aeson, @@ -219157,7 +218082,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -219408,8 +218332,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.2.8"; - sha256 = "04q3lkvingfjbkqb5jw79qzm3vd2rwnghnd4xyh31mliqnxphnfr"; + version = "0.2.9"; + sha256 = "0p1521r91ifp3nm0pdnpvp5a5hyxahyx27wq7knr872n8mna4mc2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219458,8 +218382,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-PortMidi"; - version = "0.2.8"; - sha256 = "1pwi44ykcshm3jf3sbm3x8w2idk3rkf5k6mfk9vkvhizbnk6rwhx"; + version = "0.2.9"; + sha256 = "14f0cvn79llac3x2l330s063sz6y00gfgbnz1amx9q6hz187my01"; libraryHaskellDepends = [ base essence-of-live-coding @@ -219484,8 +218408,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.2.8"; - sha256 = "1c14m2032lfc4apfynj815z74cp8f9wr9m3cfsbs554yxard7drh"; + version = "0.2.9"; + sha256 = "160vw5i1wmj2ygkh3m1jrfv5yzf12nfn57q233q899vmj3yqcl05"; libraryHaskellDepends = [ base essence-of-live-coding @@ -219543,8 +218467,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.2.8"; - sha256 = "1ybs72cbk35yqvjc26safab41hmmbza7ssxwqlqs0f070xn3w7p7"; + version = "0.2.9"; + sha256 = "0pkbq73mskdg01vnfkhnpvn969f66ryqy7pnjwya32w46bq8wg1d"; libraryHaskellDepends = [ base essence-of-live-coding @@ -219602,8 +218526,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.2.8"; - sha256 = "1k6va9srxp91dp2dbrav44nd3wlkpb34lb8hz6xjs0mcpynx7nr4"; + version = "0.2.9"; + sha256 = "05x0g5n0dc0k792i02p1rn5bybi29zlpz0vmfa3dq9rxw6zsyr5d"; libraryHaskellDepends = [ base boltzmann-samplers @@ -219627,8 +218551,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-vivid"; - version = "0.2.8"; - sha256 = "0rjfgfhr1wfy77asrqcnh6830wwl372kxwz5nxmk9v217gfc51w2"; + version = "0.2.9"; + sha256 = "1cg1nshv6n4i9d0m9cgjhd6hwdd476g6k5ipbaaq9hgxfnn2rj13"; libraryHaskellDepends = [ base essence-of-live-coding @@ -219652,8 +218576,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-warp"; - version = "0.2.8"; - sha256 = "1562vw03zqpzzn9v9yss6xs9vfly9glg7j2im9cllivfzngw5fas"; + version = "0.2.9"; + sha256 = "186va3094dyn1qb8phlhgdbnmqm3yxda9zn720amncflnbsbi3ps"; libraryHaskellDepends = [ base essence-of-live-coding @@ -223480,6 +222404,8 @@ self: { ]; description = "Haskell bindings to ExifTool"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -224105,8 +223031,8 @@ self: { }: mkDerivation { pname = "exotic-list-monads"; - version = "1.2.0"; - sha256 = "1wxdhh869v69schj88xz9anzmj4qly3wrh8jmkwga6h5krhvqkgh"; + version = "1.2.1"; + sha256 = "09sgmcp5njswa4kk33qzjs17h9fspwscaicxfpfjdfdnznr72hin"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -224117,8 +223043,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Non-standard monads on lists and non-empty lists"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -224274,7 +223198,6 @@ self: { ]; description = "Extensible Pandoc"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -224587,6 +223510,8 @@ self: { ]; description = "Predicates that can explain themselves"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -225185,6 +224110,28 @@ self: { } ) { }; + extended = callPackage ( + { + mkDerivation, + base, + HUnit, + }: + mkDerivation { + pname = "extended"; + version = "0.2.0.0"; + sha256 = "0w9np859i7vk2zg12rzikg3z2y6pqdr7mvbf2xkqxgn1nqcfswh5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + HUnit + ]; + description = "Support for an 80-bit extended float"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + extended-categories = callPackage ( { mkDerivation, @@ -225368,6 +224315,8 @@ self: { ]; description = "Extensible, efficient, optics-friendly data types and effects"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -225451,6 +224400,8 @@ self: { ]; description = "An Alternative to Monad Transformers"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -225664,7 +224615,7 @@ self: { } ) { }; - extensions = callPackage ( + extensions_0_1_0_1 = callPackage ( { mkDerivation, base, @@ -225722,11 +224673,12 @@ self: { ]; description = "Parse Haskell Language Extensions"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "extensions"; } ) { }; - extensions_0_1_0_2 = callPackage ( + extensions = callPackage ( { mkDerivation, base, @@ -225784,7 +224736,6 @@ self: { ]; description = "Parse Haskell Language Extensions"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "extensions"; } ) { }; @@ -225811,8 +224762,8 @@ self: { pname = "extensions"; version = "0.1.0.3"; sha256 = "1fks1yfdk0zjc1vccj3nr6li09j64cq6b6x9s5mi8qrsv5igbzlm"; - revision = "2"; - editedCabalFile = "0ph3qpvqdva8wjpxla4i188ib2pgx79hd3rrgrjzpp1ch5a1disv"; + revision = "3"; + editedCabalFile = "06a2yis43q7z4a7hakl8j0hm6wwrylf0f6k2lal4b5lh45dncl1p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225978,47 +224929,6 @@ self: { ) { }; extra = callPackage ( - { - mkDerivation, - base, - clock, - directory, - filepath, - process, - QuickCheck, - quickcheck-instances, - time, - unix, - }: - mkDerivation { - pname = "extra"; - version = "1.7.16"; - sha256 = "0w3wwwnf96ax70lrb0fkfich7b23kvk112j9rzr72b0bqd1ns315"; - revision = "1"; - editedCabalFile = "0xb2xd6qw664rz0d1pa7g4cd58ixqfhpxh7q6gz9lhc10afqw62g"; - libraryHaskellDepends = [ - base - clock - directory - filepath - process - time - unix - ]; - testHaskellDepends = [ - base - directory - filepath - QuickCheck - quickcheck-instances - unix - ]; - description = "Extra functions I use"; - license = lib.licenses.bsd3; - } - ) { }; - - extra_1_8 = callPackage ( { mkDerivation, base, @@ -226054,7 +224964,6 @@ self: { ]; description = "Extra functions I use"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -226622,6 +225531,7 @@ self: { ]; description = "Minimal library for music generation and notation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -226653,6 +225563,8 @@ self: { ]; description = "Braid representations in Haskell"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -226682,6 +225594,8 @@ self: { ]; description = "XML/XSD combinators/schemas/codegen"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -227076,6 +225990,8 @@ self: { ]; description = "Fake a -> Gen a"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -227688,6 +226604,8 @@ self: { pname = "fast-digits"; version = "0.3.2.0"; sha256 = "1kwgqxfsm4y7f8cr4zzbwyd9fk6v10hykgqc271k41zf0h6k0pq8"; + revision = "1"; + editedCabalFile = "1rp001n3i9i0xgvi1p0rzsinxmsj89x5xn541vfd0y09ihcl8yyc"; libraryHaskellDepends = [ base ghc-bignum @@ -227707,8 +226625,6 @@ self: { doHaddock = false; description = "Integer-to-digits conversion"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -228922,6 +227838,8 @@ self: { ]; description = "Stubs for dependencies of test code"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -228954,6 +227872,7 @@ self: { fb-stubs, filepath, fmt, + folly-clib, gflags, ghc, ghci, @@ -228995,8 +227914,8 @@ self: { }: mkDerivation { pname = "fb-util"; - version = "0.1.0.1"; - sha256 = "16n38c1vi99rhvzv61lah6krplf4sgfz74nwngmjn90vm5ah6r4h"; + version = "0.2.0.0"; + sha256 = "0618nh92kmsx4gfw37lspaiqsz4g8vcsfchax46bw172z8yg7mim"; libraryHaskellDepends = [ aeson aeson-pretty @@ -229019,6 +227938,7 @@ self: { exceptions extra filepath + folly-clib ghc ghci hashable @@ -229836,6 +228756,63 @@ self: { } ) { }; + fearOfView = callPackage ( + { + mkDerivation, + astar, + base, + bytestring, + containers, + directory, + filelock, + filepath, + hashable, + hscurses, + MonadRandom, + mtl, + ncurses, + random, + safe, + safe-exceptions, + serialise, + splitmix, + unordered-containers, + }: + mkDerivation { + pname = "fearOfView"; + version = "0.1.1.0"; + sha256 = "0bjn7zgl50sllw2pizmrfbinw80laxvsdvqy96wgv5iv24ady965"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + astar + base + bytestring + containers + directory + filelock + filepath + hashable + hscurses + MonadRandom + mtl + random + safe + safe-exceptions + serialise + splitmix + unordered-containers + ]; + executablePkgconfigDepends = [ ncurses ]; + description = "A terminal broughlike game about manipulating vision"; + license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "fearOfView"; + broken = true; + } + ) { inherit (pkgs) ncurses; }; + feather = callPackage ( { mkDerivation, @@ -230017,7 +228994,9 @@ self: { ]; description = "Forward error correction of ByteStrings"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; mainProgram = "benchmark-zfec"; + broken = true; } ) { }; @@ -230254,33 +229233,6 @@ self: { ) { }; fedora-releases = callPackage ( - { - mkDerivation, - aeson, - base, - bodhi, - cached-json-file, - extra, - safe, - }: - mkDerivation { - pname = "fedora-releases"; - version = "0.2.1"; - sha256 = "1dn5ngl6disgpc8vlfc2p4p9gxm318viwi78lalc5y0yrwyczxb1"; - libraryHaskellDepends = [ - aeson - base - bodhi - cached-json-file - extra - safe - ]; - description = "Library for Fedora release versions"; - license = lib.licenses.gpl3Only; - } - ) { }; - - fedora-releases_0_3_0 = callPackage ( { mkDerivation, aeson, @@ -230304,7 +229256,6 @@ self: { ]; description = "Library for Fedora release versions"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -230329,8 +229280,8 @@ self: { }: mkDerivation { pname = "fedora-repoquery"; - version = "0.7.3"; - sha256 = "1sdyvbvrh1z32y8hsbfwzyrffl57niri0rgpp580syh11l621sj1"; + version = "0.7.4"; + sha256 = "0iy8d37x1b1qhzp6jgrnajbvyn02pyyz78xv7mv4hrp87i2avpgp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -232205,6 +231156,8 @@ self: { pname = "fgl"; version = "5.8.3.0"; sha256 = "1hb3mgqqz67qwfw2893bslj4mkhs4g0y51c6zpc6r2h6caqibjm4"; + revision = "1"; + editedCabalFile = "13yn7h8rwmdjwscli9cpn44dp5pm2c0km7b3v1cmfq4na16pczsh"; libraryHaskellDepends = [ array base @@ -233081,8 +232034,8 @@ self: { }: mkDerivation { pname = "filelock"; - version = "0.1.1.7"; - sha256 = "1041fjqk4i97qxiymm4vlcl27vqajxd8hf12sal7l2sgvxf68dad"; + version = "0.1.1.8"; + sha256 = "0bmnj888w2srz2rywmh13dqwmqsqyzkgkz952h1gdd7ycvlj5avj"; libraryHaskellDepends = [ base unix @@ -233215,8 +232168,8 @@ self: { }: mkDerivation { pname = "filepath-bytestring"; - version = "1.5.2.0.2"; - sha256 = "1ry4zib0fj4jhk1qzg2yvp347wmbm314bvbsbbix83hax70pjk77"; + version = "1.5.2.0.3"; + sha256 = "0jz6mpr6fvxijvkib9500x25np7j836wrvy8jd23l16r4rhnhmxy"; libraryHaskellDepends = [ base bytestring @@ -233243,6 +232196,7 @@ self: { { mkDerivation, base, + base32, binary, bytestring, case-insensitive, @@ -233251,17 +232205,15 @@ self: { cryptoids-types, exceptions, filepath, - sandi, template-haskell, }: mkDerivation { pname = "filepath-crypto"; - version = "0.1.0.0"; - sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0"; - revision = "9"; - editedCabalFile = "09a1y0m7jgchi8bmly49amzjrs25insvaf4ag3wys1ngb1cc2az0"; + version = "0.1.0.1"; + sha256 = "1bbi3w5iziywf45p1y96k58hdv5y6fwlpnv2f6gj30jxqasj2x2v"; libraryHaskellDepends = [ base + base32 binary bytestring case-insensitive @@ -233270,7 +232222,6 @@ self: { cryptoids-types exceptions filepath - sandi template-haskell ]; description = "Reversable and secure encoding of object ids as filepaths"; @@ -233431,10 +232382,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.5"; - sha256 = "0z29273vdqjsrj4vby0gp7d12wg9nkzq9zgqg18db0p5948jw1dh"; - revision = "3"; - editedCabalFile = "003vfb6j47vihjba1py9ls9l269gkg89rf732gb5lwdximxg7wf0"; + version = "0.6.5.1"; + sha256 = "1m6rav1rcigckakw8ky27lbwh5a9q8xl7nvv358ljykmvyl1j2lc"; libraryHaskellDepends = [ base bytestring @@ -234106,8 +233055,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.6.1"; - sha256 = "0kx2nv9cddghcx4i413iq8078gqa20yrgpja6js4dl3wpsq47yzm"; + version = "0.1.6.2"; + sha256 = "1aww2c2alnkaaigh0xx2cvx6s8qddzlfy1xcwf0fddnf9p2psqgj"; libraryHaskellDepends = [ base deepseq @@ -234867,32 +233816,29 @@ self: { { mkDerivation, base, - Cabal, containers, - hspec, - hspec-discover, + tasty, + tasty-hunit, template-haskell, + transformers, }: mkDerivation { pname = "first-class-instances"; - version = "0.1.0.0"; - sha256 = "0d3pay7x31a5d9g4rkb0sflk97qcnpyg3fh81247b6r21gl5qbr3"; + version = "1.0.0.1"; + sha256 = "165h2kwn41pn9qw96dnx2kzyxanaysm8vhiwfy2l9hxagiqwz0x0"; libraryHaskellDepends = [ base - Cabal containers template-haskell + transformers ]; testHaskellDepends = [ base - Cabal - containers - hspec - hspec-discover + tasty + tasty-hunit template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "First class typeclass instances"; + description = "First-class typeclass instances"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -235379,7 +234325,6 @@ self: { ]; description = "Fixed-point number build on generic integral number"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -235566,11 +234511,14 @@ self: { doctest, filemanip, primitive, + tasty, + tasty-inspection-testing, + template-haskell, }: mkDerivation { pname = "fixed-vector"; - version = "1.2.3.0"; - sha256 = "0cbz734dccsy3jvhszszyrnls6bbys4gaq326dksaabwv6mn58vc"; + version = "2.0.0.0"; + sha256 = "1ymrnab5kcmwwjlshyryjdysfvig7ikglpc7fqid8g2pyzqsvz5h"; libraryHaskellDepends = [ base deepseq @@ -235581,36 +234529,74 @@ self: { doctest filemanip primitive + tasty + tasty-inspection-testing + template-haskell ]; description = "Generic vectors with statically known size"; license = lib.licenses.bsd3; } ) { }; - fixed-vector-binary = callPackage ( + fixed-vector-QC = callPackage ( { mkDerivation, base, - binary, fixed-vector, - tasty, - tasty-quickcheck, + QuickCheck, }: mkDerivation { - pname = "fixed-vector-binary"; - version = "1.0.0.2"; - sha256 = "1cqy2zrc8c4p6vpy5bl5cr51qi335lkwjhwwrmwam66frp5p5lrl"; + pname = "fixed-vector-QC"; + version = "2.0.0.0"; + sha256 = "0yv4r93i26ak98h6qmd7crllbz33ys63yp5kigb9745271pi5ip7"; libraryHaskellDepends = [ base - binary fixed-vector + QuickCheck ]; - testHaskellDepends = [ + description = "QuickCheck instances for fixed-vector"; + license = lib.licenses.bsd3; + } + ) { }; + + fixed-vector-aeson = callPackage ( + { + mkDerivation, + aeson, + base, + fixed-vector, + vector, + }: + mkDerivation { + pname = "fixed-vector-aeson"; + version = "2.0.0.0"; + sha256 = "0cdhdy0ay5044vxal8dhx9gqv07x8dd358n21vlas6s0kb6jxmvy"; + libraryHaskellDepends = [ + aeson + base + fixed-vector + vector + ]; + description = "Aeson instances for fixed-vector"; + license = lib.licenses.bsd3; + } + ) { }; + + fixed-vector-binary = callPackage ( + { + mkDerivation, + base, + binary, + fixed-vector, + }: + mkDerivation { + pname = "fixed-vector-binary"; + version = "2.0.0.0"; + sha256 = "04fxpi7x7psfwdfr398l3y7x17qkm5hfjr444p29b0wbg89ldwwm"; + libraryHaskellDepends = [ base binary fixed-vector - tasty - tasty-quickcheck ]; description = "Binary instances for fixed-vector"; license = lib.licenses.bsd3; @@ -235646,6 +234632,8 @@ self: { ]; description = "Binary instances for fixed-vector"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -235655,25 +234643,16 @@ self: { base, cereal, fixed-vector, - tasty, - tasty-quickcheck, }: mkDerivation { pname = "fixed-vector-cereal"; - version = "1.0.0.2"; - sha256 = "0ivfpnkh76dxjxcvdv1c4m9blp237g1h071217yj5gjk3vigyf54"; + version = "2.0.0.0"; + sha256 = "0pac616jkz2385yqzmrb71c4sqr4cvabw8rr9k316zygc89xy2jx"; libraryHaskellDepends = [ base cereal fixed-vector ]; - testHaskellDepends = [ - base - cereal - fixed-vector - tasty - tasty-quickcheck - ]; description = "Cereal instances for fixed-vector"; license = lib.licenses.bsd3; } @@ -235690,8 +234669,8 @@ self: { }: mkDerivation { pname = "fixed-vector-hetero"; - version = "0.6.2.0"; - sha256 = "1flqm18gcwc4f54y3b5axyfhdq9wn4069y64nbsmh064d23bln5s"; + version = "0.7.0.0"; + sha256 = "199ginhsll6b30kljxhbibdg97fjp0x1x5jx3bzxg1v8gvj2lwnm"; libraryHaskellDepends = [ base deepseq @@ -235705,6 +234684,8 @@ self: { ]; description = "Library for working with product types generically"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -236929,7 +235910,6 @@ self: { base, bytestring, containers, - gauge, hspec, HUnit, integer-gmp, @@ -236938,13 +235918,14 @@ self: { primitive, QuickCheck, quickcheck-instances, + tasty-bench, template-haskell, utf8-string, }: mkDerivation { pname = "flatparse"; - version = "0.5.2.1"; - sha256 = "0ig2m1lshaadyp8dxb129l0y1v722b1mfsp4fv7v879pdhlxgmgw"; + version = "0.5.3.0"; + sha256 = "0lgj4w77nkwblnswriq2wddy1c732wir5qd70gm3hz9slv35pnwx"; libraryHaskellDepends = [ base bytestring @@ -236966,11 +235947,11 @@ self: { attoparsec base bytestring - gauge integer-gmp megaparsec parsec primitive + tasty-bench utf8-string ]; description = "High-performance parsing from strict bytestrings"; @@ -237068,6 +236049,8 @@ self: { ]; description = "Flexible numeric parsers for real-world programming languages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -238813,13 +237796,11 @@ self: { { mkDerivation, base }: mkDerivation { pname = "flux-monoid"; - version = "0.1.0.0"; - sha256 = "0aa5p8604j63zz8rfxcp4p4110k27ys5dcy980kg5hjzba7aj54m"; + version = "1.0.0.0"; + sha256 = "09brqhyv0hdq2df21pk63551ig8xxj68zvjzi46w4f47h2g3bw60"; libraryHaskellDepends = [ base ]; description = "A monoid for tracking changes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -239993,6 +238974,54 @@ self: { } ) { }; + folly-clib = + callPackage + ( + { + mkDerivation, + boost, + boost_filesystem, + boost_program_options, + fmt, + glog, + libunwind, + openssl, + snappy, + }: + mkDerivation { + pname = "folly-clib"; + version = "20250713.1537"; + sha256 = "1qwznpx922gcy17nzvv249dq4f6f2lvh7y055cpd6kzqk03a984j"; + librarySystemDepends = [ + boost + boost_filesystem + boost_program_options + ]; + libraryPkgconfigDepends = [ + fmt + glog + libunwind + openssl + snappy + ]; + doHaddock = false; + description = "The folly C++ library from Meta"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) + { + inherit (pkgs) boost; + boost_filesystem = null; + boost_program_options = null; + inherit (pkgs) fmt; + inherit (pkgs) glog; + inherit (pkgs) libunwind; + inherit (pkgs) openssl; + inherit (pkgs) snappy; + }; + foma = callPackage ( { mkDerivation, @@ -240232,33 +239261,6 @@ self: { ) { }; force-layout = callPackage ( - { - mkDerivation, - base, - containers, - data-default-class, - lens, - linear, - }: - mkDerivation { - pname = "force-layout"; - version = "0.4.0.6"; - sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "13"; - editedCabalFile = "07p1rlal8fjbyd4hm0p3a3cp3b67a86qdls88yl3f0xcgrnxxmkq"; - libraryHaskellDepends = [ - base - containers - data-default-class - lens - linear - ]; - description = "Simple force-directed layout"; - license = lib.licenses.bsd3; - } - ) { }; - - force-layout_0_4_1 = callPackage ( { mkDerivation, base, @@ -240282,7 +239284,6 @@ self: { ]; description = "Simple force-directed layout"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -240796,8 +239797,8 @@ self: { }: mkDerivation { pname = "formatn"; - version = "0.3.1.0"; - sha256 = "0xh78ckdsih2p984qr170f6l4yfz5fnq7xni6gjzapcilfxzvky9"; + version = "0.3.2.0"; + sha256 = "082cakp1wwndb02ig387sc5r6dji27r6ahdbsvxvwmxfg52rqa2l"; libraryHaskellDepends = [ base containers @@ -241371,7 +240372,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial)"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "fortran-src"; + broken = true; } ) { }; @@ -241901,7 +240904,7 @@ self: { } ) { }; - fourmolu = callPackage ( + fourmolu_0_15_0_0 = callPackage ( { mkDerivation, aeson, @@ -242004,118 +241007,12 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; - mainProgram = "fourmolu"; - } - ) { }; - - fourmolu_0_16_0_0 = callPackage ( - { - mkDerivation, - aeson, - ansi-terminal, - array, - base, - binary, - bytestring, - Cabal-syntax, - containers, - deepseq, - Diff, - directory, - file-embed, - filepath, - ghc-lib-parser, - hspec, - hspec-discover, - hspec-megaparsec, - megaparsec, - MemoTrie, - mtl, - optparse-applicative, - path, - path-io, - pretty, - process, - QuickCheck, - scientific, - syb, - temporary, - terminal-size, - text, - th-env, - yaml, - }: - mkDerivation { - pname = "fourmolu"; - version = "0.16.0.0"; - sha256 = "0vczia3hb1klvbf9fjy32ynyqaka8n7cdk0h8jg6nr89pixla9lc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - ansi-terminal - array - base - binary - bytestring - Cabal-syntax - containers - deepseq - Diff - directory - file-embed - filepath - ghc-lib-parser - megaparsec - MemoTrie - mtl - scientific - syb - text - ]; - executableHaskellDepends = [ - base - Cabal-syntax - containers - directory - filepath - ghc-lib-parser - optparse-applicative - terminal-size - text - th-env - yaml - ]; - testHaskellDepends = [ - base - bytestring - Cabal-syntax - containers - Diff - directory - filepath - ghc-lib-parser - hspec - hspec-megaparsec - megaparsec - path - path-io - pretty - process - QuickCheck - temporary - text - yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "fourmolu"; } ) { }; - fourmolu_0_18_0_0 = callPackage ( + fourmolu = callPackage ( { mkDerivation, aeson, @@ -242155,8 +241052,8 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.18.0.0"; - sha256 = "0nv5lbjp1ilqzkmgq9k4nb555yzbv023z8rm2x0368nz92q61f38"; + version = "0.19.0.0"; + sha256 = "0sq9sxj99bzzmc5bdynh9c91yxsgrl2c4n9kdhnj78p7w9mkqfnb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242220,7 +241117,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "fourmolu"; } ) { }; @@ -242262,6 +241158,8 @@ self: { ]; description = "IEEE 754-2019 compliant operations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -243134,8 +242032,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.23.3.0"; - sha256 = "0405dj2isvhgib85km2fppq32aan5sghsny2ilwv39pr2g6kkwkm"; + version = "1.24.0.1"; + sha256 = "1hv8mgdr9qfwrl6a4p1kcqhxswqp8b513s2pf6qzsx370ynkw3c1"; libraryHaskellDepends = [ aeson annotated-exception @@ -243328,6 +242226,7 @@ self: { ]; description = "Some extensions to the annotated-exception library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -243481,6 +242380,7 @@ self: { ]; description = "Some extensions to the hw-kafka-client library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -243651,8 +242551,8 @@ self: { }: mkDerivation { pname = "freckle-prelude"; - version = "0.0.1.1"; - sha256 = "0mvfh2yw63njx3jmqjzpxzk370gyslfwhss40cysji5j6f9514yf"; + version = "0.0.3.0"; + sha256 = "0xnxrh3cniwlcjdjlxg1acdhfd51lpx2q112qhgynnfar866zbdc"; libraryHaskellDepends = [ base containers @@ -243669,6 +242569,7 @@ self: { ]; description = "Standard prelude for Freckle applications"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -244043,6 +242944,8 @@ self: { ]; description = "Efficient Type-Safe Capture-Avoiding Substitution for Free (Scoped Monads)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -244208,6 +243111,8 @@ self: { testHaskellDepends = [ base ]; description = "Lawful list and set monad transformers based on free monads"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -244860,7 +243765,9 @@ self: { ]; description = "A friendly effect system for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "freer-simple-examples"; + broken = true; } ) { }; @@ -245592,18 +244499,16 @@ self: { { mkDerivation, base, - bifunctors, optparse-applicative, }: mkDerivation { pname = "friendly"; - version = "0.1.0.4"; - sha256 = "0nk48ly13mcrishi4xz9djh0n9k4q68lbgkr1p3ls5cf902nsn3i"; + version = "0.1.1"; + sha256 = "16bivgrpvb9yxpy9nv8kx5pnwbqjfpr33ik3ijhzvlh804zjpf5a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base - bifunctors optparse-applicative ]; description = "Attempt to pretty-print any input"; @@ -246177,6 +245082,8 @@ self: { pname = "fs-sim"; version = "0.4.0.0"; sha256 = "0wirx3mk2dmjw13adbf4d9qpgx7b9kk0y5my7s3yx1lsm2z9m4pw"; + revision = "1"; + editedCabalFile = "1lz7jaq5qp1pdc8dvahc3nl8csgpp0qplriqfnmrryn22dyqfi4s"; libraryHaskellDepends = [ base base16-bytestring @@ -246212,6 +245119,7 @@ self: { ]; description = "Simulated file systems"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -246283,63 +245191,6 @@ self: { } ) { }; - fsnotify_0_3_0_1 = callPackage ( - { - mkDerivation, - async, - base, - bytestring, - containers, - directory, - filepath, - hinotify, - random, - shelly, - tasty, - tasty-hunit, - temporary, - text, - time, - unix, - unix-compat, - }: - mkDerivation { - pname = "fsnotify"; - version = "0.3.0.1"; - sha256 = "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny"; - revision = "3"; - editedCabalFile = "0n5p6ljx8i5mmalkw05izjgzbqg08y7rxxn2gk8ghxlqldgqgix9"; - libraryHaskellDepends = [ - async - base - bytestring - containers - directory - filepath - hinotify - shelly - text - time - unix - unix-compat - ]; - testHaskellDepends = [ - async - base - directory - filepath - random - tasty - tasty-hunit - temporary - unix-compat - ]; - description = "Cross platform library for file change notification"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - fsnotify = callPackage ( { mkDerivation, @@ -246367,8 +245218,8 @@ self: { }: mkDerivation { pname = "fsnotify"; - version = "0.4.3.0"; - sha256 = "0dq0dm4j5f16wpfrgh22001icvknmq4cmjyslakjvkyj7w9yfmnf"; + version = "0.4.4.0"; + sha256 = "06v3yb8vpvk43qb0r0063q1rr1rf2c0l9plhs6pm1gzhwbcszcc2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246641,7 +245492,9 @@ self: { ]; description = "Watch a file/directory and run a command when it's modified"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "fswatcher"; + broken = true; } ) { }; @@ -247487,6 +246340,8 @@ self: { ]; description = "Library providing values and operations on values in a fixed universe"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -247639,6 +246494,8 @@ self: { ]; description = "Data.Functor.Classes instances for core packages"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -248209,6 +247066,7 @@ self: { ]; description = "GLL parser with simple combinator interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -248784,6 +247642,7 @@ self: { cmark-gfm, co-log-core, containers, + criterion, cryptohash-md5, Diff, directory, @@ -248834,8 +247693,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.31"; - sha256 = "0sbbc296gzxfib1i0390ipasy4k8dbxkv3nn4615vmg99njdz84p"; + version = "0.25.33"; + sha256 = "0fasqms7ap96b1iyrhmp35c5z4kas7iffbbk2s1scg3wsmghd3p4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248853,6 +247712,7 @@ self: { cmark-gfm co-log-core containers + criterion cryptohash-md5 Diff directory @@ -248882,10 +247742,14 @@ self: { prettyprinter prettyprinter-ansi-terminal process-extras + QuickCheck random regex-tdfa srcloc statistics + tasty + tasty-hunit + tasty-quickcheck template-haskell temporary terminal-size @@ -248903,16 +247767,13 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base - containers - free - megaparsec - mtl - QuickCheck tasty - tasty-hunit - tasty-quickcheck - text ]; + benchmarkHaskellDepends = [ + base + criterion + ]; + doHaddock = false; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; mainProgram = "futhark"; @@ -249203,8 +248064,8 @@ self: { }: mkDerivation { pname = "fuzzily"; - version = "0.2.0.0"; - sha256 = "10xa34441fwjk4pabw98lgrfi3iw4yb03rxnjlir0lp38cfxgqvi"; + version = "0.2.1.0"; + sha256 = "1yna3f5ny5krqw1vvczh35m5lhmqfaymdshnhqymbcxn4v0niwdc"; libraryHaskellDepends = [ base monoid-subclasses @@ -249332,8 +248193,8 @@ self: { }: mkDerivation { pname = "fuzzy-time"; - version = "0.3.0.0"; - sha256 = "00283a009wcgzmg86mq4rbxzpycrjy0cvjnn2nc3yfy92lq1j9ad"; + version = "0.3.0.1"; + sha256 = "1zcpmp3zknpy6vw4q3l373s70vjc63rwq6if4418x0d786sd54kg"; libraryHaskellDepends = [ base containers @@ -249506,7 +248367,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Fuzzy text matching"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "bench"; + broken = true; } ) { }; @@ -250557,8 +249420,8 @@ self: { }: mkDerivation { pname = "gargoyle"; - version = "0.1.2.1"; - sha256 = "1q7lgspa8jrk3mdhh0f8fazmq9zwnwzdy35dgnzhyw9ashvzs2ri"; + version = "0.1.2.2"; + sha256 = "1aag3si8yrx0b6gg68rk86s7kq8jiqb0qy19558bjdwxlhlr2h30"; libraryHaskellDepends = [ base directory @@ -250589,8 +249452,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql"; - version = "0.2.0.3"; - sha256 = "1ci6cfrvdl4ybl59g26immz29s2zcqlhy3xwqka94zpx7kldxjfc"; + version = "0.2.0.4"; + sha256 = "0kqrw4yjy6iz3fpiivp9rpbyg0v2g1m8n9n424w25rj1qj85q3zz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250632,8 +249495,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql-connect"; - version = "0.1.0.3"; - sha256 = "0wlpfqskx2svdq1g547qqh6ymwrhcc3yknh12cwvch1bkriyz3nf"; + version = "0.1.0.4"; + sha256 = "09zvkdq1fg0adbcxxb4q09lm8jg068hx900wg8mmg7iwid01j4z8"; libraryHaskellDepends = [ base bytestring @@ -250662,8 +249525,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql-nix"; - version = "0.3.0.3"; - sha256 = "1y40csa4k0d3mwmb4qnhp8vpi07p8vv3kcx0j9nl3sybimdc7h0a"; + version = "0.3.0.4"; + sha256 = "1zr0nr12xikcihbf8cs6k2lnl4rqj23a6f9chh0j8s7rlbqdxh7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250831,6 +249694,8 @@ self: { benchmarkHaskellDepends = [ base ]; description = "small framework for performance measurement and analysis"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -252445,6 +251310,8 @@ self: { ]; description = "A library for interacting with various generative AI LLMs"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -252606,6 +251473,8 @@ self: { ]; description = "Exception-safe resource management in more monads"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -253296,6 +252165,41 @@ self: { } ) { }; + generic-lens_2_3_0_0 = callPackage ( + { + mkDerivation, + base, + doctest, + generic-lens-core, + HUnit, + inspection-testing, + lens, + mtl, + profunctors, + }: + mkDerivation { + pname = "generic-lens"; + version = "2.3.0.0"; + sha256 = "0db1h4nafdq1ds1qss9qjlg67xvx5ky5lr9apfq9jas5mcay25n1"; + libraryHaskellDepends = [ + base + generic-lens-core + profunctors + ]; + testHaskellDepends = [ + base + doctest + HUnit + inspection-testing + lens + mtl + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + generic-lens-core = callPackage ( { mkDerivation, @@ -253319,6 +252223,28 @@ self: { } ) { }; + generic-lens-core_2_3_0_0 = callPackage ( + { + mkDerivation, + base, + indexed-profunctors, + text, + }: + mkDerivation { + pname = "generic-lens-core"; + version = "2.3.0.0"; + sha256 = "1q2saa6y9g29d8xz6fgnh7inwr4kj9jqipd1pxcqwh1f0xnj6c8x"; + libraryHaskellDepends = [ + base + indexed-profunctors + text + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + generic-lens-labels = callPackage ( { mkDerivation, @@ -253526,6 +252452,41 @@ self: { } ) { }; + generic-optics_2_3_0_0 = callPackage ( + { + mkDerivation, + base, + doctest, + generic-lens-core, + HUnit, + inspection-testing, + mtl, + optics-core, + }: + mkDerivation { + pname = "generic-optics"; + version = "2.3.0.0"; + sha256 = "1038bbnfn47cz59cz0qp1168vx4wjwvcsd5ar3w59miwsr4k3wac"; + libraryHaskellDepends = [ + base + generic-lens-core + optics-core + ]; + testHaskellDepends = [ + base + doctest + HUnit + inspection-testing + mtl + optics-core + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + } + ) { }; + generic-optics-lite = callPackage ( { mkDerivation, @@ -254546,6 +253507,8 @@ self: { ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -256371,47 +255334,6 @@ self: { ) { }; geodetics = callPackage ( - { - mkDerivation, - array, - base, - checkers, - dimensional, - HUnit, - QuickCheck, - semigroups, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - }: - mkDerivation { - pname = "geodetics"; - version = "0.1.2"; - sha256 = "18jjq4z16v6mkmm4as67srrwzk75cl32jlph3qbm106gms54vska"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array - base - dimensional - semigroups - ]; - testHaskellDepends = [ - array - base - checkers - dimensional - HUnit - QuickCheck - test-framework - test-framework-hunit - test-framework-quickcheck2 - ]; - description = "Terrestrial coordinate systems and geodetic calculations"; - license = lib.licenses.bsd3; - } - ) { }; - - geodetics_1_1_0 = callPackage ( { mkDerivation, array, @@ -256442,7 +255364,6 @@ self: { ]; description = "Terrestrial coordinate systems and geodetic calculations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -257026,26 +255947,19 @@ self: { pretty, process, random, + template-haskell, terminfo, time, - transformers-compat, unix, utf8-string, }: mkDerivation { pname = "gf"; - version = "3.11"; - sha256 = "18fx0kba86hyyimrahvgs7jsd5g718psis4drmxmxmx3bdvxj3bd"; + version = "3.12"; + sha256 = "10dlp5rxqhzli08ra711gjbzzr9c6fm02r51my9hpq7sjbr2pf7b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - setupHaskellDepends = [ - base - Cabal - directory - filepath - process - ]; libraryHaskellDepends = [ array base @@ -257066,9 +255980,9 @@ self: { pretty process random + template-haskell terminfo time - transformers-compat unix utf8-string ]; @@ -257378,16 +256292,15 @@ self: { description = "Shared functionality between GHC and its boot libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; } - ) { ghc-platform = null; }; + ) { }; - ghc-boot-th_9_10_2 = callPackage ( + ghc-boot-th_9_10_3 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "9.10.2"; - sha256 = "0g7a71w56hr7s5ysy1nm3wm2s1rly3nc2phfgdr0f1w0pd77shqx"; + version = "9.10.3"; + sha256 = "0iizi093swkdblngqi11v6v4rrf93wp4sqnpmisaxkb5kghf3wpj"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = lib.licenses.bsd3; @@ -258156,9 +257069,8 @@ self: { ghc-events-analyze = callPackage ( { mkDerivation, + async, base, - blaze-svg, - bytestring, containers, diagrams-lib, diagrams-svg, @@ -258169,7 +257081,6 @@ self: { mtl, optparse-applicative, parsec, - regex-base, regex-pcre-builtin, SVGFonts, template-haskell, @@ -258181,16 +257092,12 @@ self: { }: mkDerivation { pname = "ghc-events-analyze"; - version = "0.2.8"; - sha256 = "1aam80l76dy76b8wbkjnbmxkmbgvczs591yjnbb9rm5bv9ggcb29"; - revision = "1"; - editedCabalFile = "12p15xrlqfjwz2izp39b2yyvdjhsvpv89djskym9f6fpcki8ij4y"; + version = "0.2.9"; + sha256 = "0gzzhf369b8f5j870rx1sai60khrd6k2ryxikngv4a3nwh75p151"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base - blaze-svg - bytestring containers diagrams-lib diagrams-svg @@ -258201,7 +257108,6 @@ self: { mtl optparse-applicative parsec - regex-base regex-pcre-builtin SVGFonts template-haskell @@ -258211,6 +257117,10 @@ self: { transformers unordered-containers ]; + testHaskellDepends = [ + async + base + ]; description = "Analyze and visualize event logs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -258540,7 +257450,7 @@ self: { } ) { }; - ghc-exactprint = callPackage ( + ghc-exactprint_1_8_0_0 = callPackage ( { mkDerivation, base, @@ -258603,23 +257513,111 @@ self: { ]; description = "ExactPrint for GHC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; ghc-exactprint_1_9_0_0 = callPackage ( - { mkDerivation }: + { + mkDerivation, + base, + containers, + Diff, + directory, + extra, + filepath, + ghc, + ghc-boot, + ghc-paths, + HUnit, + mtl, + silently, + syb, + }: mkDerivation { pname = "ghc-exactprint"; version = "1.9.0.0"; sha256 = "195y3yy7bjrx3b21nqrhxrnbxidaydb9g28i37wqx5glv8y65v51"; isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base + containers + ghc + ghc-boot + mtl + syb + ]; + testHaskellDepends = [ + base + containers + Diff + directory + extra + filepath + ghc + ghc-boot + ghc-paths + HUnit + silently + syb + ]; description = "ExactPrint for GHC"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; } ) { }; + ghc-exactprint = callPackage ( + { + mkDerivation, + base, + containers, + Diff, + directory, + extra, + filepath, + ghc, + ghc-boot, + ghc-paths, + HUnit, + mtl, + silently, + syb, + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "1.10.0.0"; + sha256 = "14jwkx0q2bidcv5ss7zmkvl41z264k7siy9fh7py27h7azb539v0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + ghc + ghc-boot + mtl + syb + ]; + testHaskellDepends = [ + base + containers + Diff + directory + extra + filepath + ghc + ghc-boot + ghc-paths + HUnit + silently + syb + ]; + description = "ExactPrint for GHC"; + license = lib.licenses.bsd3; + } + ) { }; + ghc-exactprint_1_12_0_0 = callPackage ( { mkDerivation }: mkDerivation { @@ -258634,7 +257632,7 @@ self: { } ) { }; - ghc-experimental = callPackage ( + ghc-experimental_9_1201_0 = callPackage ( { mkDerivation, base, @@ -258694,6 +257692,8 @@ self: { pname = "ghc-gc-tune"; version = "0.3.2"; sha256 = "1q77q0vavypdc9iqf1hrnxzhwj851a9s9qk646w98qkncm4ifblp"; + revision = "1"; + editedCabalFile = "099bfdaxh8j3wd7w48jwivcvh658kk9y4qq0q8bh89w63vndqawn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -258734,6 +257734,7 @@ self: { mkDerivation, base, containers, + ghc-internal, ghc-prim, rts, }: @@ -258744,6 +257745,7 @@ self: { libraryHaskellDepends = [ base containers + ghc-internal ghc-prim rts ]; @@ -258849,6 +257851,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "HIE-file parsing machinery that supports multiple versions of GHC"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -259086,7 +258090,7 @@ self: { } ) { }; - ghc-internal = callPackage ( + ghc-internal_9_1201_0 = callPackage ( { mkDerivation, ghc-bignum, @@ -259261,7 +258265,7 @@ self: { } ) { }; - ghc-lib = callPackage ( + ghc-lib_9_10_3_20250912 = callPackage ( { mkDerivation, alex, @@ -259290,8 +258294,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.8.5.20250214"; - sha256 = "1f0q8y22k8qwqjax4bvn1cbg2whxmcnfydp6izw54rk4yqyx5b0c"; + version = "9.10.3.20250912"; + sha256 = "0ighyjwmdfapqa22abqrs7jd89l9kgg24ixfa7ldxrm3il4y5a7k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -259322,10 +258326,11 @@ self: { ]; description = "The GHC API, decoupled from GHC versions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; - ghc-lib_9_10_2_20250515 = callPackage ( + ghc-lib = callPackage ( { mkDerivation, alex, @@ -259342,6 +258347,7 @@ self: { ghc-prim, happy, hpc, + os-string, parsec, pretty, process, @@ -259354,8 +258360,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.10.2.20250515"; - sha256 = "0ix0pbpn945hdcnha7vklxsamvqqr698yg5xy52p0s6q7shydvn3"; + version = "9.12.2.20250421"; + sha256 = "1liyrxdf790b3ga7v1kq501pa54wq92yvaggzy6vf1l3viakyxpl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -259370,6 +258376,7 @@ self: { ghc-lib-parser ghc-prim hpc + os-string parsec pretty process @@ -259386,11 +258393,10 @@ self: { ]; description = "The GHC API, decoupled from GHC versions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; - ghc-lib_9_12_2_20250421 = callPackage ( + ghc-lib-parser_9_2_8_20230729 = callPackage ( { mkDerivation, alex, @@ -259403,25 +258409,19 @@ self: { directory, exceptions, filepath, - ghc-lib-parser, ghc-prim, happy, - hpc, - os-string, parsec, pretty, process, - rts, - semaphore-compat, - stm, time, transformers, unix, }: mkDerivation { - pname = "ghc-lib"; - version = "9.12.2.20250421"; - sha256 = "1liyrxdf790b3ga7v1kq501pa54wq92yvaggzy6vf1l3viakyxpl"; + pname = "ghc-lib-parser"; + version = "9.2.8.20230729"; + sha256 = "0lk6s6ka0yhqph6wlijlyzgj47r5j7cw6mnn02vgvqdvlmrkwkkl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -259433,16 +258433,10 @@ self: { directory exceptions filepath - ghc-lib-parser ghc-prim - hpc - os-string parsec pretty process - rts - semaphore-compat - stm time transformers unix @@ -259457,7 +258451,7 @@ self: { } ) { }; - ghc-lib-parser_9_2_8_20230729 = callPackage ( + ghc-lib-parser_9_6_7_20250325 = callPackage ( { mkDerivation, alex, @@ -259470,6 +258464,7 @@ self: { directory, exceptions, filepath, + ghc-internal, ghc-prim, happy, parsec, @@ -259481,8 +258476,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.8.20230729"; - sha256 = "0lk6s6ka0yhqph6wlijlyzgj47r5j7cw6mnn02vgvqdvlmrkwkkl"; + version = "9.6.7.20250325"; + sha256 = "1zfngikw6dv5zzr90cw0j3s3hflf5fs0nm1acwki6fd22qy1l0xc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -259494,6 +258489,7 @@ self: { directory exceptions filepath + ghc-internal ghc-prim parsec pretty @@ -259512,7 +258508,7 @@ self: { } ) { }; - ghc-lib-parser_9_6_7_20250325 = callPackage ( + ghc-lib-parser_9_8_5_20250214 = callPackage ( { mkDerivation, alex, @@ -259525,6 +258521,7 @@ self: { directory, exceptions, filepath, + ghc-internal, ghc-prim, happy, parsec, @@ -259536,8 +258533,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.6.7.20250325"; - sha256 = "1zfngikw6dv5zzr90cw0j3s3hflf5fs0nm1acwki6fd22qy1l0xc"; + version = "9.8.5.20250214"; + sha256 = "1l07lkc4d9ryxy26fr7mry4691m0f3p0wi6b6l1jzr968hrs06cb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -259549,6 +258546,7 @@ self: { directory exceptions filepath + ghc-internal ghc-prim parsec pretty @@ -259580,8 +258578,10 @@ self: { directory, exceptions, filepath, + ghc-internal, ghc-prim, happy, + os-string, parsec, pretty, process, @@ -259591,8 +258591,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.8.5.20250214"; - sha256 = "1l07lkc4d9ryxy26fr7mry4691m0f3p0wi6b6l1jzr968hrs06cb"; + version = "9.12.2.20250421"; + sha256 = "1lscfnbpmyv0fahl9y33kwiypnp45iljljax69dxhlr9zdijv7x4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -259604,7 +258604,9 @@ self: { directory exceptions filepath + ghc-internal ghc-prim + os-string parsec pretty process @@ -259621,119 +258623,89 @@ self: { } ) { }; - ghc-lib-parser_9_10_2_20250515 = callPackage ( + ghc-lib-parser-ex_9_2_1_1 = callPackage ( { mkDerivation, - alex, - array, base, - binary, bytestring, containers, - deepseq, directory, - exceptions, + extra, filepath, - ghc-prim, - happy, - parsec, - pretty, - process, - time, - transformers, - unix, + ghc-lib-parser, + tasty, + tasty-hunit, + uniplate, }: mkDerivation { - pname = "ghc-lib-parser"; - version = "9.10.2.20250515"; - sha256 = "1wlwgm6596dnsc60j40byw9d1krb3gmvapglz3g8ampjy8scadvb"; - enableSeparateDataOutput = true; + pname = "ghc-lib-parser-ex"; + version = "9.2.1.1"; + sha256 = "01004zsi4d3vd9k1d2ik284z6wnkny48yp5d2y6fi9hgba11d53q"; libraryHaskellDepends = [ - array base - binary bytestring containers - deepseq + ghc-lib-parser + uniplate + ]; + testHaskellDepends = [ + base directory - exceptions + extra filepath - ghc-prim - parsec - pretty - process - time - transformers - unix - ]; - libraryToolDepends = [ - alex - happy + ghc-lib-parser + tasty + tasty-hunit + uniplate ]; - description = "The GHC API, decoupled from GHC versions"; + description = "Algorithms on GHC parse trees"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; } ) { }; - ghc-lib-parser_9_12_2_20250421 = callPackage ( + ghc-lib-parser-ex_9_6_0_2 = callPackage ( { mkDerivation, - alex, - array, base, - binary, bytestring, containers, - deepseq, directory, - exceptions, + extra, filepath, - ghc-prim, - happy, - os-string, - parsec, - pretty, - process, - time, - transformers, - unix, + ghc-lib-parser, + tasty, + tasty-hunit, + uniplate, }: mkDerivation { - pname = "ghc-lib-parser"; - version = "9.12.2.20250421"; - sha256 = "1lscfnbpmyv0fahl9y33kwiypnp45iljljax69dxhlr9zdijv7x4"; - enableSeparateDataOutput = true; + pname = "ghc-lib-parser-ex"; + version = "9.6.0.2"; + sha256 = "1fr653b4hgwxz12mvbf9wd93r83qk3qdajplrdmw85hk0f9qfq9a"; libraryHaskellDepends = [ - array base - binary bytestring containers - deepseq + ghc-lib-parser + uniplate + ]; + testHaskellDepends = [ + base directory - exceptions + extra filepath - ghc-prim - os-string - parsec - pretty - process - time - transformers - unix - ]; - libraryToolDepends = [ - alex - happy + ghc-lib-parser + tasty + tasty-hunit + uniplate ]; - description = "The GHC API, decoupled from GHC versions"; + description = "Algorithms on GHC parse trees"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; } ) { }; - ghc-lib-parser-ex_9_2_1_1 = callPackage ( + ghc-lib-parser-ex_9_8_0_2 = callPackage ( { mkDerivation, base, @@ -259749,49 +258721,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.2.1.1"; - sha256 = "01004zsi4d3vd9k1d2ik284z6wnkny48yp5d2y6fi9hgba11d53q"; - libraryHaskellDepends = [ - base - bytestring - containers - ghc-lib-parser - uniplate - ]; - testHaskellDepends = [ - base - directory - extra - filepath - ghc-lib-parser - tasty - tasty-hunit - uniplate - ]; - description = "Algorithms on GHC parse trees"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - ghc-lib-parser-ex_9_6_0_2 = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - directory, - extra, - filepath, - ghc-lib-parser, - tasty, - tasty-hunit, - uniplate, - }: - mkDerivation { - pname = "ghc-lib-parser-ex"; - version = "9.6.0.2"; - sha256 = "1fr653b4hgwxz12mvbf9wd93r83qk3qdajplrdmw85hk0f9qfq9a"; + version = "9.8.0.2"; + sha256 = "1s4ibjdzrflb2r88srmdnslj09h78xqwdn6djcnirmnka7qrf09v"; libraryHaskellDepends = [ base bytestring @@ -259816,89 +258747,6 @@ self: { ) { }; ghc-lib-parser-ex = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - directory, - extra, - filepath, - ghc-lib-parser, - tasty, - tasty-hunit, - uniplate, - }: - mkDerivation { - pname = "ghc-lib-parser-ex"; - version = "9.8.0.2"; - sha256 = "1s4ibjdzrflb2r88srmdnslj09h78xqwdn6djcnirmnka7qrf09v"; - libraryHaskellDepends = [ - base - bytestring - containers - ghc-lib-parser - uniplate - ]; - testHaskellDepends = [ - base - directory - extra - filepath - ghc-lib-parser - tasty - tasty-hunit - uniplate - ]; - description = "Algorithms on GHC parse trees"; - license = lib.licenses.bsd3; - } - ) { }; - - ghc-lib-parser-ex_9_10_0_0 = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - directory, - extra, - filepath, - ghc-lib-parser, - tasty, - tasty-hunit, - uniplate, - }: - mkDerivation { - pname = "ghc-lib-parser-ex"; - version = "9.10.0.0"; - sha256 = "1v4nq8nvg9bpdnqgpy8pkzb05h7f9f6m2a6bcqj3j2i9jzqv7sb6"; - libraryHaskellDepends = [ - base - bytestring - containers - ghc-lib-parser - uniplate - ]; - testHaskellDepends = [ - base - bytestring - containers - directory - extra - filepath - ghc-lib-parser - tasty - tasty-hunit - uniplate - ]; - description = "Programming with GHC parse trees"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - ghc-lib-parser-ex_9_12_0_0 = callPackage ( { mkDerivation, base, @@ -259949,7 +258797,6 @@ self: { ]; description = "Programming with GHC parse trees"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ghc-lib-parser-ex-build-tool"; } ) { }; @@ -260356,8 +259203,8 @@ self: { pname = "ghc-paths"; version = "0.1.0.12"; sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf"; - revision = "7"; - editedCabalFile = "0irq8j1bz5z3da1g4xd3dp392hwi2xn1cjsrdiqyp4srjlyg2532"; + revision = "8"; + editedCabalFile = "1ymhq0il4l8a91n8iqfrq9q57sj6zfkmvpjf8nwgavwclfi50ka2"; setupHaskellDepends = [ base Cabal @@ -260933,36 +259780,6 @@ self: { ) { }; ghc-syntax-highlighter = callPackage ( - { - mkDerivation, - base, - ghc-lib-parser, - hspec, - hspec-discover, - text, - }: - mkDerivation { - pname = "ghc-syntax-highlighter"; - version = "0.0.11.0"; - sha256 = "0y2vhw6damddry3prvd5lcs3hak7r9ixv0mf1wvx8g276gs9frxs"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base - ghc-lib-parser - text - ]; - testHaskellDepends = [ - base - hspec - text - ]; - testToolDepends = [ hspec-discover ]; - description = "Syntax highlighter for Haskell using the lexer of GHC"; - license = lib.licenses.bsd3; - } - ) { }; - - ghc-syntax-highlighter_0_0_13_0 = callPackage ( { mkDerivation, base, @@ -260989,7 +259806,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Syntax highlighter for Haskell using the lexer of GHC"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -261121,8 +259937,7 @@ self: { deepseq, directory, filepath, - ghc, - ghc-boot, + ghc-lib, ghc-paths, optparse-applicative, process, @@ -261151,8 +259966,7 @@ self: { deepseq directory filepath - ghc - ghc-boot + ghc-lib ghc-paths optparse-applicative process @@ -261182,7 +259996,8 @@ self: { deepseq, directory, filepath, - ghc-lib, + ghc, + ghc-boot, ghc-paths, optparse-applicative, process, @@ -261211,7 +260026,8 @@ self: { deepseq directory filepath - ghc-lib + ghc + ghc-boot ghc-paths optparse-applicative process @@ -261346,6 +260162,7 @@ self: { ghc-tcplugin-api = callPackage ( { mkDerivation, + array, base, containers, ghc, @@ -261354,9 +260171,10 @@ self: { }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.15.0.0"; - sha256 = "024gwhs575rirrizlriigxvz0b9az2c63vbbdfm3dd4qa5ln3jmq"; + version = "0.17.2.0"; + sha256 = "01p6x6jppap6q82x8m5jw3rbzn60gqmap23x6lxq9jbn6am44vhv"; libraryHaskellDepends = [ + array base containers ghc @@ -261575,6 +260393,46 @@ self: { } ) { }; + ghc-typelits-knownnat_0_8_0 = callPackage ( + { + mkDerivation, + base, + ghc, + ghc-bignum, + ghc-tcplugin-api, + ghc-typelits-natnormalise, + tasty, + tasty-hunit, + tasty-quickcheck, + template-haskell, + transformers, + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.8.0"; + sha256 = "009vfifi462dqp3z26b3czx1x22ayn3s8r1s4x967yw68mpwhpda"; + libraryHaskellDepends = [ + base + ghc + ghc-bignum + ghc-tcplugin-api + ghc-typelits-natnormalise + template-haskell + transformers + ]; + testHaskellDepends = [ + base + ghc-typelits-natnormalise + tasty + tasty-hunit + tasty-quickcheck + ]; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ghc-typelits-natnormalise = callPackage ( { mkDerivation, @@ -261614,7 +260472,7 @@ self: { } ) { }; - ghc-typelits-natnormalise_0_7_11 = callPackage ( + ghc-typelits-natnormalise_0_7_12 = callPackage ( { mkDerivation, base, @@ -261630,8 +260488,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.11"; - sha256 = "1r661cnhn4gc2vlmdgxx3w42h8m3fbh7s7sf98kdp3ac9a59s8hb"; + version = "0.7.12"; + sha256 = "03yrh9nrvnnb6ay2xy12jx94pxicjwrxc9wdnpw2qkca06z5sxla"; libraryHaskellDepends = [ base containers @@ -261654,6 +260512,45 @@ self: { } ) { }; + ghc-typelits-natnormalise_0_8_0 = callPackage ( + { + mkDerivation, + base, + containers, + ghc, + ghc-bignum, + ghc-prim, + ghc-tcplugin-api, + tasty, + tasty-hunit, + template-haskell, + transformers, + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.8.0"; + sha256 = "1vdhj5pzx76aigim3a0ap3nhzhnhwl5cywz5rzzkplag8970rfdn"; + libraryHaskellDepends = [ + base + containers + ghc + ghc-bignum + ghc-tcplugin-api + transformers + ]; + testHaskellDepends = [ + base + ghc-prim + tasty + tasty-hunit + template-haskell + ]; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ghc-typelits-presburger = callPackage ( { mkDerivation, @@ -261675,8 +260572,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.7.4.1"; - sha256 = "0n9jzw319cmf0a0pa90y133rmbjx0109ddwzndvpfqrhj6bf27cw"; + version = "0.7.4.2"; + sha256 = "1vnhhz8vb0v0ym9wq82xx324c310bjl51y0igggy77z94fhm0q0n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261702,6 +260599,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -261928,7 +260827,9 @@ self: { ]; description = "ghci-dap is a GHCi having DAP interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ghci-dap"; + broken = true; } ) { }; @@ -262148,6 +261049,7 @@ self: { ]; description = "colored pretty-printing within ghci"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -262203,8 +261105,8 @@ self: { }: mkDerivation { pname = "ghci4luatex"; - version = "0.1"; - sha256 = "1x3kdwxcallnyvssbxaj4scf6rc0f5yx3js1bzzwmi9p3imxj4x8"; + version = "0.1.2"; + sha256 = "12k0j92j65n3qidczx088xr47xbj86srria1859bw0qm8f1zzy2j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262394,6 +261296,8 @@ self: { pname = "ghcide"; version = "2.11.0.0"; sha256 = "0d9rvh6xxw8y64f1pdivwdkmi9wqknl4m2n2h3x4rjmqj2al92vs"; + revision = "2"; + editedCabalFile = "0kqdzwf0fpzg69sawsrlhf3x0yv3ixi2x5ia6jb2zckaa5wl4ik2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262891,8 +261795,6 @@ self: { sha256 = "0fhcs89x180kw75qgbfh28wjyn55frwdfj4rqlqa1smx0fwhzyy1"; description = "DOM library using JSFFI and GHCJS"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -263236,7 +262138,9 @@ self: { ]; description = "GHC .prof files viewer"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ghcprofview"; + broken = true; } ) { }; @@ -264255,35 +263159,6 @@ self: { ) { inherit (pkgs) freetype; }; gi-gdk = callPackage ( - { - mkDerivation, - base, - Cabal, - gi-gdk3, - haskell-gi, - }: - mkDerivation { - pname = "gi-gdk"; - version = "3.0.30"; - sha256 = "0fq77cryf9njdxxh7ywhv3dinpn5hy5p7ppfsaf6163zw2qjshz3"; - revision = "1"; - editedCabalFile = "1pf2dxjr47hhxkxhv9wy7w8d0w7zbszindja2xqi3ss8imsljpxl"; - setupHaskellDepends = [ - base - Cabal - gi-gdk3 - haskell-gi - ]; - libraryHaskellDepends = [ - base - gi-gdk3 - ]; - description = "Gdk 3.x bindings (compatibility layer)"; - license = lib.licenses.lgpl21Only; - } - ) { }; - - gi-gdk_4_0_10 = callPackage ( { mkDerivation, base, @@ -264309,7 +263184,6 @@ self: { ]; description = "Gdk bindings (compatibility layer)"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -264479,36 +263353,6 @@ self: { ) { inherit (pkgs) gdk-pixbuf; }; gi-gdkx11 = callPackage ( - { - mkDerivation, - base, - Cabal, - gi-gdkx113, - haskell-gi, - }: - mkDerivation { - pname = "gi-gdkx11"; - version = "3.0.17"; - sha256 = "03jyplzw32w8lyasbq4njjw1jyixa83hyggpk3z9n5w0d6l2xwz3"; - revision = "1"; - editedCabalFile = "04xjy6apyn6yk63q04bnh36gryrcz0r1id0hnp9bblf7jpr0jqxk"; - setupHaskellDepends = [ - base - Cabal - gi-gdkx113 - haskell-gi - ]; - libraryHaskellDepends = [ - base - gi-gdkx113 - ]; - doHaddock = false; - description = "GdkX11 3.x bindings (compatibility layer)"; - license = lib.licenses.lgpl21Only; - } - ) { }; - - gi-gdkx11_4_0_9 = callPackage ( { mkDerivation, base, @@ -264535,7 +263379,6 @@ self: { doHaddock = false; description = "GdkX11 4.x bindings (compatibility layer)"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -265459,35 +264302,6 @@ self: { ) { inherit (pkgs.gst_all_1) gst-plugins-base; }; gi-gtk = callPackage ( - { - mkDerivation, - base, - Cabal, - gi-gtk3, - haskell-gi, - }: - mkDerivation { - pname = "gi-gtk"; - version = "3.0.44"; - sha256 = "19rj31plyr8syx0g0f5q7p0g8ay4i38cfnmqdkvzbx7zczv7hlck"; - revision = "1"; - editedCabalFile = "18yxy4h72rc13qjqzkr3jqpk19fvahmj9hhyllc4hy3z3s7zp0zp"; - setupHaskellDepends = [ - base - Cabal - gi-gtk3 - haskell-gi - ]; - libraryHaskellDepends = [ - base - gi-gtk3 - ]; - description = "Gtk 3.x bindings (compatibility layer)"; - license = lib.licenses.lgpl21Only; - } - ) { }; - - gi-gtk_4_0_12 = callPackage ( { mkDerivation, base, @@ -265513,7 +264327,6 @@ self: { ]; description = "Gtk 4.x bindings (compatibility layer)"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -265577,6 +264390,8 @@ self: { ]; description = "Declarative GTK+ programming in Haskell"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -265627,6 +264442,7 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -265666,6 +264482,8 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -266003,36 +264821,6 @@ self: { ) { inherit (pkgs) gtksheet; }; gi-gtksource = callPackage ( - { - mkDerivation, - base, - Cabal, - gi-gtksource3, - haskell-gi, - }: - mkDerivation { - pname = "gi-gtksource"; - version = "3.0.30"; - sha256 = "1iiqhfjgsis14wbchr0xnqsrplzlp2whp7c23ji59zf4s24ylx3r"; - revision = "1"; - editedCabalFile = "015v8janqmilydq3xv6wd26fglnrc6vl7226y6lnflnc9zi2fvll"; - setupHaskellDepends = [ - base - Cabal - gi-gtksource3 - haskell-gi - ]; - libraryHaskellDepends = [ - base - gi-gtksource3 - ]; - doHaddock = false; - description = "GtkSource 3.x bindings (compatibility layer)"; - license = lib.licenses.lgpl21Only; - } - ) { }; - - gi-gtksource_5_0_2 = callPackage ( { mkDerivation, base, @@ -266059,7 +264847,6 @@ self: { doHaddock = false; description = "GtkSource 5.x bindings (compatibility layer)"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -266430,6 +265217,7 @@ self: { libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "JavaScriptCore 4.x bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; } ) { inherit (pkgs) webkitgtk_4_0; }; @@ -267008,36 +265796,6 @@ self: { ) { inherit (pkgs) libsecret; }; gi-soup = callPackage ( - { - mkDerivation, - base, - Cabal, - gi-soup2, - haskell-gi, - }: - mkDerivation { - pname = "gi-soup"; - version = "2.4.30"; - sha256 = "1c9cnxiwi722gizhm4z0mlwy6dwis11nw2dppx04k8v34qxqskaa"; - revision = "1"; - editedCabalFile = "040rszg07azivvyb4z5szxj4kk4fyhx9hfb7x3y8i30d7isfsvhw"; - setupHaskellDepends = [ - base - Cabal - gi-soup2 - haskell-gi - ]; - libraryHaskellDepends = [ - base - gi-soup2 - ]; - doHaddock = false; - description = "Libsoup 2.4.x bindings (compatibility layer)"; - license = lib.licenses.lgpl21Only; - } - ) { }; - - gi-soup_3_0_4 = callPackage ( { mkDerivation, base, @@ -267064,7 +265822,6 @@ self: { doHaddock = false; description = "Libsoup 3.x bindings (compatibility layer)"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -267113,6 +265870,7 @@ self: { libraryPkgconfigDepends = [ libsoup_2_4 ]; description = "Libsoup 2.4.x bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; } ) { inherit (pkgs) libsoup_2_4; }; @@ -267171,6 +265929,7 @@ self: { bytestring, Cabal, containers, + gi-gio, gi-glib, gi-gobject, haskell-gi, @@ -267182,11 +265941,12 @@ self: { }: mkDerivation { pname = "gi-vips"; - version = "8.0.5"; - sha256 = "07747sr630461d2k44yf2ns7jr6f02c5y7gjg69wcmw7g03gjhfw"; + version = "8.0.6"; + sha256 = "15b90kblc81bjvrcrlhdx64v8p6c15qncxmv2icfbrzz1acqnal4"; setupHaskellDepends = [ base Cabal + gi-gio gi-glib gi-gobject haskell-gi @@ -267195,6 +265955,7 @@ self: { base bytestring containers + gi-gio gi-glib gi-gobject haskell-gi @@ -267340,6 +266101,7 @@ self: { description = "WebKit 6.x bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; } ) { webkitgtk = null; }; @@ -267407,6 +266169,7 @@ self: { description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; } ) { inherit (pkgs) webkitgtk_4_0; }; @@ -267794,6 +266557,8 @@ self: { pname = "gibbon"; version = "0.1.1"; sha256 = "1fvb7fg4dh26xszbfcrjyd7h8pl0nxpxkls6lb1ibyw9z76h0shh"; + revision = "1"; + editedCabalFile = "0ncx7hnarwfzw4h9xkv697h87wwm096z2mmw19l0x7ndnjch6zjs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -267850,6 +266615,8 @@ self: { ]; description = "Refreshed parsec-style library for compatibility with Scala parsley"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -268583,8 +267350,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20250630"; - sha256 = "1varfir2vmnr29kfsjpqc5vd6msansch6xiag1d0s4bj5wpn1pq3"; + version = "10.20250828"; + sha256 = "11riq7ni0sqpkks2xaiimb7hl76wrnyac1smjs182m2sscn9bym4"; configureFlags = [ "-fassistant" "-f-benchmark" @@ -269268,6 +268035,7 @@ self: { ]; description = "Passively snapshots working tree changes efficiently"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "git-monitor"; } ) { }; @@ -269304,6 +268072,106 @@ self: { } ) { }; + git-phoenix = callPackage ( + { + mkDerivation, + base, + binary, + bytestring, + conduit, + containers, + cryptohash-sha1, + deepseq, + directory, + extra, + filepath, + lazy-scope, + lens, + memory, + optparse-applicative, + pretty-hex, + QuickCheck, + regex-tdfa, + relude, + tagged, + tasty, + tasty-discover, + tasty-hunit, + tasty-quickcheck, + template-haskell, + time, + trace-embrace, + unliftio, + wl-pprint-text, + word8, + zlib, + }: + mkDerivation { + pname = "git-phoenix"; + version = "0.0.2"; + sha256 = "0nkpa6nw1a9cnr1zhb92h6c8ykf92744c2pn2gnqx4nl89rx1w2g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + binary + bytestring + conduit + containers + cryptohash-sha1 + deepseq + directory + extra + filepath + lazy-scope + lens + memory + optparse-applicative + pretty-hex + regex-tdfa + relude + tagged + template-haskell + time + trace-embrace + unliftio + wl-pprint-text + word8 + zlib + ]; + executableHaskellDepends = [ + base + bytestring + directory + optparse-applicative + relude + tagged + unliftio + ]; + testHaskellDepends = [ + base + bytestring + directory + optparse-applicative + QuickCheck + relude + tagged + tasty + tasty-discover + tasty-hunit + tasty-quickcheck + time + unliftio + ]; + testToolDepends = [ tasty-discover ]; + description = "Recover Git repositories from disk recovery tool output (photorec)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "git-phoenix"; + broken = true; + } + ) { }; + git-remote-ipfs = callPackage ( { mkDerivation, @@ -269871,96 +268739,6 @@ self: { containers, cryptohash-sha1, deepseq, - deepseq-generics, - exceptions, - file-embed, - hashable, - hspec, - hspec-discover, - http-client, - http-client-tls, - http-link-header, - http-types, - iso8601-time, - mtl, - network-uri, - tagged, - text, - time-compat, - tls, - transformers, - transformers-compat, - unordered-containers, - vector, - }: - mkDerivation { - pname = "github"; - version = "0.29"; - sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "6"; - editedCabalFile = "0ylwq4jzsng513pi98b3hxnn9lbjvjv5sgq1r7kfbd8nxgdcrbmw"; - libraryHaskellDepends = [ - aeson - base - base-compat - base16-bytestring - binary - binary-instances - bytestring - containers - cryptohash-sha1 - deepseq - deepseq-generics - exceptions - hashable - http-client - http-client-tls - http-link-header - http-types - iso8601-time - mtl - network-uri - tagged - text - time-compat - tls - transformers - transformers-compat - unordered-containers - vector - ]; - testHaskellDepends = [ - aeson - base - base-compat - bytestring - file-embed - hspec - tagged - text - unordered-containers - vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Access to the GitHub API, v3"; - license = lib.licenses.bsd3; - } - ) { }; - - github_0_30 = callPackage ( - { - mkDerivation, - aeson, - base, - base-compat, - base16-bytestring, - binary, - binary-instances, - bytestring, - containers, - cryptohash-sha1, - deepseq, - deepseq-generics, exceptions, file-embed, hashable, @@ -269978,14 +268756,13 @@ self: { time, tls, transformers, - transformers-compat, unordered-containers, vector, }: mkDerivation { pname = "github"; - version = "0.30"; - sha256 = "04rwdgrzsf2bq829w1v3435ynxz0lhb3c5vgbm2q080rwww29bif"; + version = "0.30.0.1"; + sha256 = "1lqdpr1dkap9prnsz14shk3kjan5k36s7c0n9kc50pkqjlq2hj21"; libraryHaskellDepends = [ aeson base @@ -269997,7 +268774,6 @@ self: { containers cryptohash-sha1 deepseq - deepseq-generics exceptions hashable http-client @@ -270012,7 +268788,6 @@ self: { time tls transformers - transformers-compat unordered-containers vector ]; @@ -270032,7 +268807,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -270060,10 +268834,10 @@ self: { }: mkDerivation { pname = "github-actions"; - version = "0.1.0.0"; - sha256 = "0aa4j8cbij6ags49pmdlfjgwfhj4w1960cjijfhncjm1dr5gij1z"; + version = "0.1.1.0"; + sha256 = "1nxph5yypjqjcwwr7r397pdgnk7ad7y144dgmapzvrbz3xbzkz2d"; revision = "1"; - editedCabalFile = "13n5nxpqgak96fqyywp1kx0yvzp7m2r19fn84z0khb5bq5nglv01"; + editedCabalFile = "12dvv7jg1qhlf087fb9sg06nlr5k8d3ph4237q3v604lz4ib4vpq"; libraryHaskellDepends = [ aeson base @@ -270701,52 +269475,6 @@ self: { ) { }; github-webhooks = callPackage ( - { - mkDerivation, - aeson, - base, - base16-bytestring, - bytestring, - cryptonite, - deepseq, - deepseq-generics, - hspec, - memory, - text, - time, - vector, - }: - mkDerivation { - pname = "github-webhooks"; - version = "0.17.0"; - sha256 = "06dh28yqhjmh4gks0r20x6cn1974a0cx1yr3n55l3slr1w9j46bv"; - libraryHaskellDepends = [ - aeson - base - base16-bytestring - bytestring - cryptonite - deepseq - deepseq-generics - memory - text - time - vector - ]; - testHaskellDepends = [ - aeson - base - bytestring - hspec - text - vector - ]; - description = "Aeson instances for GitHub Webhook payloads"; - license = lib.licenses.mit; - } - ) { }; - - github-webhooks_0_18_0 = callPackage ( { mkDerivation, aeson, @@ -270789,7 +269517,6 @@ self: { ]; description = "Aeson instances for GitHub webhook payloads"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -271110,68 +269837,6 @@ self: { ) { }; gitlab-haskell = callPackage ( - { - mkDerivation, - aeson, - ansi-wl-pprint, - base, - bytestring, - crypton-connection, - data-default-class, - http-client, - http-conduit, - http-types, - mtl, - tasty, - tasty-hunit, - temporary, - text, - time, - transformers, - tree-diff, - unix-compat, - unordered-containers, - vector, - }: - mkDerivation { - pname = "gitlab-haskell"; - version = "1.0.2.2"; - sha256 = "11pck9gqlnjp7759kdy3qk3xq6wcnj6acyxgdhx40190d1h3sid9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson - base - bytestring - crypton-connection - data-default-class - http-client - http-conduit - http-types - mtl - temporary - text - time - transformers - unix-compat - ]; - testHaskellDepends = [ - aeson - ansi-wl-pprint - base - bytestring - tasty - tasty-hunit - text - tree-diff - unordered-containers - vector - ]; - description = "A Haskell library for the GitLab web API"; - license = lib.licenses.bsd3; - } - ) { }; - - gitlab-haskell_1_1_0_0 = callPackage ( { mkDerivation, aeson, @@ -271230,7 +269895,6 @@ self: { ]; description = "A Haskell library for the GitLab web API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -271288,6 +269952,8 @@ self: { ]; description = "API library for working with Git repositories"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -271477,6 +270143,7 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -271605,6 +270272,7 @@ self: { ]; description = "Sample backend for gitlib showing the basic structure for any backend"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -271648,6 +270316,7 @@ self: { ]; description = "Test library for confirming gitlib backend compliance"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -271765,8 +270434,6 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -272559,6 +271226,353 @@ self: { } ) { }; + glean = + callPackage + ( + { + mkDerivation, + aeson, + aeson-pretty, + alex, + ansi-terminal, + array, + async, + atomic, + attoparsec, + attoparsec-aeson, + base, + binary, + bytestring, + clock, + containers, + contravariant, + criterion, + data-default, + deepseq, + directory, + exceptions, + extra, + fb-util, + filepath, + fmt, + fuzzy, + gflags, + ghc, + ghc-compact, + ghc-prim, + Glob, + glog, + gtest_main, + happy, + hashable, + haskeline, + haxl, + hie-compat, + hiedb, + hinotify, + http-types, + HUnit, + icu, + IntervalMap, + json, + libfolly, + libunwind, + mangle, + microlens, + monad-control, + mtl, + network, + network-uri, + optparse-applicative, + parsec, + pretty, + prettyprinter, + prettyprinter-ansi-terminal, + primitive, + process, + process-extras, + proto-lens, + proto-lens-runtime, + QuickCheck, + quickcheck-io, + quickcheck-text, + random, + regex-base, + regex-pcre, + rocksdb, + safe, + safe-exceptions, + scientific, + SHA, + split, + stm, + STMonadTrans, + tar, + tasty, + tasty-hunit-adapter, + template-haskell, + temporary, + text, + text-show, + thrift-haxl, + thrift-http, + thrift-lib, + time, + transformers, + unix, + unordered-containers, + uri-encode, + utf8-string, + uuid, + vector, + vector-algorithms, + wai, + warp, + xxHash, + yaml, + }: + mkDerivation { + pname = "glean"; + version = "0.1.0.0"; + sha256 = "0x8k1h1g75j90kdl9hdk0sb1yl237a89s21zah14igvrnamjhyn1"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + aeson-pretty + ansi-terminal + array + async + attoparsec + attoparsec-aeson + base + binary + bytestring + clock + containers + contravariant + criterion + data-default + deepseq + directory + exceptions + extra + fb-util + filepath + ghc + ghc-compact + ghc-prim + hashable + haskeline + haxl + hinotify + HUnit + IntervalMap + json + mangle + microlens + monad-control + mtl + network + network-uri + optparse-applicative + parsec + pretty + prettyprinter + prettyprinter-ansi-terminal + primitive + process + process-extras + proto-lens + proto-lens-runtime + random + regex-base + regex-pcre + safe + safe-exceptions + scientific + SHA + split + stm + STMonadTrans + tar + tasty + tasty-hunit-adapter + template-haskell + temporary + text + text-show + thrift-haxl + thrift-http + thrift-lib + time + transformers + unix + unordered-containers + uri-encode + utf8-string + uuid + vector + vector-algorithms + yaml + ]; + librarySystemDepends = [ atomic ]; + libraryPkgconfigDepends = [ + fmt + gflags + glog + icu + libfolly + libunwind + rocksdb + xxHash + ]; + libraryToolDepends = [ + alex + happy + ]; + executableHaskellDepends = [ + aeson + aeson-pretty + ansi-terminal + array + async + attoparsec + attoparsec-aeson + base + binary + bytestring + clock + containers + contravariant + data-default + deepseq + directory + exceptions + extra + fb-util + filepath + fuzzy + ghc + ghc-prim + Glob + hashable + haskeline + haxl + hie-compat + hiedb + hinotify + http-types + HUnit + json + mtl + network-uri + optparse-applicative + parsec + prettyprinter + process + random + regex-base + regex-pcre + safe + safe-exceptions + scientific + split + stm + STMonadTrans + tar + temporary + text + text-show + thrift-http + thrift-lib + time + transformers + unix + unordered-containers + utf8-string + uuid + vector + wai + warp + ]; + testHaskellDepends = [ + aeson + ansi-terminal + array + async + attoparsec + attoparsec-aeson + base + binary + bytestring + clock + containers + contravariant + data-default + deepseq + directory + exceptions + extra + fb-util + filepath + ghc-prim + hashable + haxl + hinotify + HUnit + json + mtl + network-uri + optparse-applicative + parsec + prettyprinter + process + QuickCheck + quickcheck-io + quickcheck-text + random + regex-base + regex-pcre + safe + safe-exceptions + scientific + stm + STMonadTrans + tar + temporary + text + text-show + thrift-lib + time + transformers + unix + unordered-containers + utf8-string + uuid + vector + ]; + testPkgconfigDepends = [ gtest_main ]; + doHaddock = false; + description = "A system for collecting, deriving and working with facts about source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) + { + atomic = null; + inherit (pkgs) fmt; + inherit (pkgs) gflags; + inherit (pkgs) glog; + gtest_main = null; + inherit (pkgs) icu; + libfolly = null; + inherit (pkgs) libunwind; + inherit (pkgs) rocksdb; + inherit (pkgs) xxHash; + }; + glfw-group = callPackage ( { mkDerivation, @@ -272848,6 +271862,8 @@ self: { pname = "glirc"; version = "2.41"; sha256 = "1sigh9154jxsisszj4sm3zbjja0mgqk9hrv7a4rr2c976pqri9yb"; + revision = "1"; + editedCabalFile = "1inwjbag35qfyndmb05gpyc3ws1acmzp4qfq6g1jv2j1fjm3cc7v"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -272935,6 +271951,8 @@ self: { ]; description = "GLL parser with simple combinator interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -273584,6 +272602,8 @@ self: { ]; description = "Parallel rendering of raster images"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -274251,6 +273271,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -274298,6 +273320,7 @@ self: { ]; description = "Make better services and clients"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "glue-example"; } ) { }; @@ -274396,7 +273419,6 @@ self: { ]; description = "Composable maps and generic tries"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -277882,8 +276904,8 @@ self: { pname = "goldplate"; version = "0.2.2.1"; sha256 = "09z937azq3n736gn1sgdy7bxw4nvgsrqicgxdh7x79qng7ks035w"; - revision = "1"; - editedCabalFile = "1ghf2j3hn0gfb4abbb8nk95wfwqx9sn349pchfvad0h07qv2ligf"; + revision = "2"; + editedCabalFile = "04wn6sj57v3xc01000pg41zq0dqjnsahif6hh7kwksayzrbyrx6s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277995,15 +277017,13 @@ self: { hspec, http-conduit, jwt, - mtl, - process, text, time, }: mkDerivation { pname = "google-cloud-common"; - version = "0.1.0.0"; - sha256 = "094gfjd0mlnp44a2a1zjqz88rgq9xp12spff00yiyf6vkrqpxnkb"; + version = "1.1.0.0"; + sha256 = "03g3m4yrqkx4gx4w3nckjfa02f2hkdh9nqh2p8hkp7mgz7qsvfc0"; libraryHaskellDepends = [ aeson base @@ -278011,8 +277031,6 @@ self: { containers http-conduit jwt - mtl - process text time ]; @@ -278024,8 +277042,6 @@ self: { hspec http-conduit jwt - mtl - process text time ]; @@ -278048,8 +277064,8 @@ self: { }: mkDerivation { pname = "google-cloud-compute"; - version = "0.1.0.0"; - sha256 = "1s8dy9ns65m5vcf6ybfjg2jvck4awmzrg8szfdzfi89pqcnwx40w"; + version = "1.1.0.0"; + sha256 = "0n5xcngaqq03qlk9c37acqc7djnnnsqa3znvl984gzj7fcsch652"; libraryHaskellDepends = [ aeson base @@ -278079,27 +277095,80 @@ self: { mkDerivation, aeson, base, + bytestring, google-cloud-common, + tasty, + tasty-hunit, }: mkDerivation { pname = "google-cloud-logging"; - version = "0.1.0.0"; - sha256 = "0yjwihsklbhqq1k3gdcn1df3bvln4brby8ymr6jizwgsy64cvsz3"; + version = "1.1.0.0"; + sha256 = "0nrp3zqs591nah1bcrll3rhfwpi8zr608hqlbmbgi4jqd1105gi3"; libraryHaskellDepends = [ aeson base + bytestring google-cloud-common ]; testHaskellDepends = [ aeson base + bytestring google-cloud-common + tasty + tasty-hunit ]; description = "GCP Client for Haskell"; license = lib.licenses.mit; } ) { }; + google-cloud-pubsub = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + bytestring, + containers, + google-cloud-common, + http-conduit, + http-types, + text, + }: + mkDerivation { + pname = "google-cloud-pubsub"; + version = "1.1.0.0"; + sha256 = "0vl3qlqs6fl10wff49a3nwfarlc87541myn2cdfb4ghfhkhf6l0k"; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + google-cloud-common + http-conduit + http-types + text + ]; + testHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + google-cloud-common + http-conduit + http-types + text + ]; + description = "GCP Pub/Sub Client for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + google-cloud-storage = callPackage ( { mkDerivation, @@ -278107,17 +277176,25 @@ self: { base, bytestring, google-cloud-common, + http-conduit, + http-types, + tasty, + tasty-hunit, text, }: mkDerivation { pname = "google-cloud-storage"; - version = "0.1.0.0"; - sha256 = "14c3m2r6br623ij7amig05mirhnpdcazszzys6dqd2izpf8dn85r"; + version = "1.1.0.0"; + sha256 = "1mxiap5ppp1lxlx4x9klnil0rkdbk416rjyc0gr5pxmrw72kn1ii"; + revision = "1"; + editedCabalFile = "100byc9905fdgfgbx1b9815c68j9kl2b1crkdfwg4ncw8pp90ffp"; libraryHaskellDepends = [ aeson base bytestring google-cloud-common + http-conduit + http-types text ]; testHaskellDepends = [ @@ -278125,8 +277202,13 @@ self: { base bytestring google-cloud-common + http-conduit + http-types + tasty + tasty-hunit text ]; + description = "GCP Client for Haskell"; license = lib.licenses.mit; } ) { }; @@ -278352,6 +277434,7 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -278660,6 +277743,8 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -279972,7 +279057,6 @@ self: { ]; description = "Vulkan library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280100,7 +279184,6 @@ self: { ]; description = "VK_KHR_surface extension of the Vulkan API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280145,7 +279228,6 @@ self: { ]; description = "GLFW surface for Vulkan"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280193,7 +279275,6 @@ self: { ]; description = "VK_KHR_swapchain extension of the Vulkan API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280218,14 +279299,15 @@ self: { template-haskell, text, text-misc-yj, + tools-yj, typelevel-tools-yj, union-color, uuid, }: mkDerivation { pname = "gpu-vulkan-middle"; - version = "0.1.0.76"; - sha256 = "188g8i3zszb3xm5cl57bvhmwwrg1adx679h4j52z1a1qzyiia02m"; + version = "0.1.0.77"; + sha256 = "1ar3sw72hi2wd8aqrd2421szc7rrk5vdq5byhmgkyzrva9iyqwn3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -280246,6 +279328,7 @@ self: { template-haskell text text-misc-yj + tools-yj typelevel-tools-yj union-color uuid @@ -280269,6 +279352,7 @@ self: { template-haskell text text-misc-yj + tools-yj typelevel-tools-yj union-color uuid @@ -280843,6 +279927,46 @@ self: { } ) { }; + granite = callPackage ( + { + mkDerivation, + base, + hspec, + hspec-discover, + QuickCheck, + random, + text, + }: + mkDerivation { + pname = "granite"; + version = "0.3.0.0"; + sha256 = "0dax05bqkvfa6wj2v7xdqrm3k6jr9qjyax93xasbybsh2zh352dr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + text + ]; + executableHaskellDepends = [ + base + random + text + ]; + testHaskellDepends = [ + base + hspec + QuickCheck + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Easy terminal plotting"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "granite"; + broken = true; + } + ) { }; + grapefruit-examples = callPackage ( { mkDerivation, @@ -281050,8 +280174,8 @@ self: { }: mkDerivation { pname = "grapesy"; - version = "1.0.1"; - sha256 = "1iplb4pvbqrpqdd6vbafd01drxyfinbrjq0w74w8rjzs4h7ag9wp"; + version = "1.1.0"; + sha256 = "1zr9x487l6aw872sdfdhcl7wl70nwfbdm8f3jrp7naayamxl2hzf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -281102,6 +280226,7 @@ self: { mtl network optparse-applicative + proto-lens proto-lens-protobuf-types proto-lens-runtime QuickCheck @@ -281128,6 +280253,7 @@ self: { deepseq hashable optparse-applicative + proto-lens proto-lens-runtime splitmix text @@ -281826,6 +280952,8 @@ self: { ]; description = "A wrapper around the standard Data.Graph with a less awkward interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -282825,7 +281953,9 @@ self: { testToolDepends = [ tasty-autocollect ]; description = "Monadic DOT graph builder DSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; + broken = true; } ) { }; @@ -283621,7 +282751,9 @@ self: { ]; description = "Uniformly-random pre-factored numbers (Kalai)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "grfn-exe"; + broken = true; } ) { }; @@ -283650,6 +282782,8 @@ self: { ]; description = "Tools for working with regular grids (graphs, lattices)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -283971,123 +283105,8 @@ self: { }: mkDerivation { pname = "grisette"; - version = "0.9.0.0"; - sha256 = "1j9aqdi8lx4i65dqj68hsjaq95kddk7bnk8mzznga7vspczlarsx"; - libraryHaskellDepends = [ - array - async - atomic-primops - base - binary - bytes - bytestring - cereal - cereal-text - containers - deepseq - generic-deriving - hashable - libBF - loch-th - mtl - parallel - prettyprinter - QuickCheck - sbv - stm - template-haskell - text - th-abstraction - th-compat - th-lift-instances - transformers - unordered-containers - vector - ]; - testHaskellDepends = [ - array - async - atomic-primops - base - binary - bytes - bytestring - cereal - cereal-text - containers - deepseq - doctest - generic-deriving - hashable - HUnit - libBF - loch-th - mtl - parallel - prettyprinter - QuickCheck - sbv - stm - template-haskell - test-framework - test-framework-hunit - test-framework-quickcheck2 - text - th-abstraction - th-compat - th-lift-instances - transformers - unordered-containers - vector - ]; - description = "Symbolic evaluation as a library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - grisette_0_13_0_0 = callPackage ( - { - mkDerivation, - array, - async, - atomic-primops, - base, - binary, - bytes, - bytestring, - cereal, - cereal-text, - containers, - deepseq, - doctest, - generic-deriving, - hashable, - HUnit, - libBF, - loch-th, - mtl, - parallel, - prettyprinter, - QuickCheck, - sbv, - stm, - template-haskell, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - text, - th-abstraction, - th-compat, - th-lift-instances, - transformers, - unordered-containers, - vector, - }: - mkDerivation { - pname = "grisette"; - version = "0.13.0.0"; - sha256 = "0115al5kw0vfsp11cndra6qrjiakm2w0gpi8ai4g47fysn8xbx6p"; + version = "0.13.0.1"; + sha256 = "0lid92s0si7l0phmba23m5yrsf1gjyxp7sbpzbwi3cbxqsapjid5"; libraryHaskellDepends = [ array async @@ -285119,6 +284138,8 @@ self: { ]; description = "A contiguous growable array type"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -285594,8 +284615,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Gruvbox colors for use in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -286299,6 +285318,7 @@ self: { description = "A standalone StatusNotifierItem/AppIndicator tray"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; mainProgram = "gtk-sni-tray-standalone"; } ) { inherit (pkgs) gtk3; }; @@ -286329,6 +285349,8 @@ self: { ]; description = "Library for creating strut windows with gi-gtk"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -287397,6 +286419,68 @@ self: { } ) { }; + gym-hs = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + hspec, + process, + scientific, + text, + unordered-containers, + vector, + }: + mkDerivation { + pname = "gym-hs"; + version = "0.1.0.1"; + sha256 = "1njgq9bhb1pq0prih9siwcj6y5aigz4w4k8vld7z96cr18hqzam3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + process + scientific + text + unordered-containers + vector + ]; + executableHaskellDepends = [ + aeson + base + bytestring + containers + process + scientific + text + unordered-containers + vector + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + hspec + process + scientific + text + unordered-containers + vector + ]; + description = "Haskell bindings for OpenAI Gymnasium"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "gym-hs-example"; + broken = true; + } + ) { }; + gym-http-api = callPackage ( { mkDerivation, @@ -287568,7 +286652,6 @@ self: { bytestring, c, containers, - exceptions, lens, libGL, libX11, @@ -287583,8 +286666,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.5.2.1"; - sha256 = "11jrlghfl9xyssrs4yjcaay825ank1v5sgsys9i4kamrnjpnvagf"; + version = "5.5.3.0"; + sha256 = "0r1fr1wisdahqysvj10yb8i1dk5wc980p03db7i8jgvx96m6afhw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -287592,7 +286675,6 @@ self: { base bytestring containers - exceptions lens linear template-haskell @@ -287863,6 +286945,8 @@ self: { libraryHaskellDepends = [ base ]; description = "An abstraction layer for BDD libraries"; license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -288273,6 +287357,7 @@ self: { ]; description = "Multiparty Computation in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "id3gini"; } ) { }; @@ -290131,7 +289216,6 @@ self: { optparse-applicative, pretty, process-extras, - semigroups, stringsearch, tagsoup, tar, @@ -290139,13 +289223,12 @@ self: { tasty-golden, text, time, - unordered-containers, zlib, }: mkDerivation { pname = "hackage-cli"; - version = "0.1.0.3"; - sha256 = "19mnvvhhcagq1l3qc37qxxv7pwzfw6p15194f21z7harj5y1ly5c"; + version = "0.1.0.4"; + sha256 = "1ixv09lk4lgvv19k8sn50pn4w8n7ya2xypsq0ns5jp5kkp3ix5bv"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -290175,13 +289258,11 @@ self: { netrc optparse-applicative process-extras - semigroups stringsearch tagsoup tar text time - unordered-containers zlib ]; testHaskellDepends = [ @@ -290524,10 +289605,8 @@ self: { }: mkDerivation { pname = "hackage-repo-tool"; - version = "0.1.1.4"; - sha256 = "1nqm6rri8rkhrqvppyzy04s3875c4wjcay8gny4ygbr65c6iw81v"; - revision = "2"; - editedCabalFile = "0ghjpd02ccv6xdp0n6mxylq09ff5w7yzvpw3v3w4i62l43fi9j7q"; + version = "0.1.1.5"; + sha256 = "0zm5hxx9hbbapp7ncrv600kvij1f7k3k48a2d9zdpa9snxfl3c3j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -290561,8 +289640,7 @@ self: { base, bytestring, Cabal, - cabal-install, - Cabal-syntax, + cabal-install-parsers, containers, filepath, optparse-applicative, @@ -290572,10 +289650,10 @@ self: { }: mkDerivation { pname = "hackage-revdeps"; - version = "0.1.1"; - sha256 = "0ckkcp2ndzv219hpl42vfzw0hvb5vblsx2bvdsa98wikkxnmn47j"; + version = "0.1"; + sha256 = "1rc6k7cjcc581cx7nx7q0p5qdfzpc010bacx4w524j6bw1qb2kp1"; revision = "1"; - editedCabalFile = "078lhc7lzs24qqizplyf4ipggxkqqsfmgq6vnrgbyhxiia2smc4b"; + editedCabalFile = "1x0rslnwk818wv37qxjfk8nmv1ld5an6ca402zhgmq0i94gd39h3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -290594,6 +289672,56 @@ self: { base bytestring Cabal + cabal-install-parsers + containers + optparse-applicative + time + ]; + description = "List Hackage reverse dependencies"; + license = lib.licenses.bsd3; + } + ) { }; + + hackage-revdeps_0_2 = callPackage ( + { + mkDerivation, + alfred-margaret, + ansi-terminal, + base, + bytestring, + Cabal, + cabal-install, + Cabal-syntax, + containers, + filepath, + optparse-applicative, + tar, + text, + time, + }: + mkDerivation { + pname = "hackage-revdeps"; + version = "0.2"; + sha256 = "1xzfyaq666gydpzbq61v7a9n96gh039jrfn8vjhca5v4v22yhxsj"; + revision = "1"; + editedCabalFile = "1753nlx4yk2jrpj1wgl4lnwmw0nf33da7kd4d1lqrgy9fr98aqvy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alfred-margaret + base + bytestring + Cabal-syntax + containers + filepath + tar + text + time + ]; + executableHaskellDepends = [ + ansi-terminal + base + Cabal cabal-install Cabal-syntax containers @@ -290603,6 +289731,7 @@ self: { ]; description = "List Hackage reverse dependencies"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -290643,10 +289772,8 @@ self: { }: mkDerivation { pname = "hackage-security"; - version = "0.6.3.1"; - sha256 = "05sckvvwj10krkhp1457mgp1hgq45p7r2sp850g3b5689i91mvqx"; - revision = "1"; - editedCabalFile = "1si6mkc8gimkpqkdl2wyzxp14v7yphp40hxvp77im7bhr8brsa77"; + version = "0.6.3.2"; + sha256 = "1yb8hz4h4wmmj2smr31nmfjfpfqrv3xcn3x92c59s8fmis39g3xz"; libraryHaskellDepends = [ base base16-bytestring @@ -290710,10 +289837,8 @@ self: { }: mkDerivation { pname = "hackage-security-HTTP"; - version = "0.1.1.2"; - sha256 = "0nsnn0lnnpvvfwgl480vhbmf4pfc11h128y252lslnlhzj1c66l3"; - revision = "1"; - editedCabalFile = "1jdrl10fvcibylsi027m4029rnzr0kc3l6yrd84ykyi0wcmyva3v"; + version = "0.1.1.3"; + sha256 = "0v9hpnzh3if7fxcah51gkhla962xnhf64hj7lrs83rx3azv3i1qx"; libraryHaskellDepends = [ base bytestring @@ -291655,8 +290780,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Eliminate warnings for names referred in Haddock only"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -291720,11 +290843,12 @@ self: { mkDerivation, aeson, base, + base16-bytestring, bytestring, Cabal, colourista, containers, - cryptonite, + cryptohash-sha1, data-default, deepseq, directory, @@ -291754,21 +290878,23 @@ self: { time, timerep, void, + xml-conduit, }: mkDerivation { pname = "hadolint"; - version = "2.12.0"; - sha256 = "190ighmy5bg21b67n8msli8im6xp1z4bh3cjadfpr76mikxk25vl"; + version = "2.13.1"; + sha256 = "0c4wazp5xrnbhp8gxg8mjppdb9ys77zxywkqysw6h7vzd1rsk7bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base + base16-bytestring bytestring Cabal colourista containers - cryptonite + cryptohash-sha1 data-default deepseq directory @@ -291794,6 +290920,7 @@ self: { time timerep void + xml-conduit ]; executableHaskellDepends = [ base @@ -292169,6 +291296,7 @@ self: { mkDerivation, base, containers, + criterion, deepseq, fgl, hashable, @@ -292184,8 +291312,8 @@ self: { }: mkDerivation { pname = "haggle"; - version = "0.3"; - sha256 = "0cnl62w8fwb033gyx473ghbawnj0vpmjpjnlpv0wsvh3qhlax4hj"; + version = "0.3.1"; + sha256 = "1nw5175yymkmcmvdc6232zz7x5q2nb1lxf24bky86p1qq7ralgn7"; libraryHaskellDepends = [ base containers @@ -292206,6 +291334,13 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base + containers + criterion + deepseq + fgl + ]; description = "A graph library offering mutable, immutable, and inductive graphs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -293014,14 +292149,13 @@ self: { wai, wai-app-static, warp, + xml-conduit, yaml, }: mkDerivation { pname = "hakyll"; - version = "4.16.6.0"; - sha256 = "1933k6aiawa0kdws7ajm9picjchnfrkkd0qd8xb9l2yv1fvcywg2"; - revision = "3"; - editedCabalFile = "0q2yl6vqf6qqc7azqwsls7b2pm3y42shhdcpyszrpi16zgx9y137"; + version = "4.16.7.1"; + sha256 = "18wg5ay6l3ngsmqq00g6y7djmg4f8285kwdi47g0rg70mq6sn0py"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -293062,6 +292196,7 @@ self: { wai wai-app-static warp + xml-conduit yaml ]; executableHaskellDepends = [ @@ -293178,8 +292313,8 @@ self: { }: mkDerivation { pname = "hakyll-alectryon"; - version = "0.1.2.0"; - sha256 = "0f1jznfr79z3y1zpi30abvcc0i3ylif1aa30wldj7ghpdxsvrjpb"; + version = "0.2.0.0"; + sha256 = "0zcl7wyi922lfp1dp3sbacqjcy8yk7qs6az48x40x2g42grrzddl"; libraryHaskellDepends = [ aeson base @@ -293668,8 +292803,8 @@ self: { }: mkDerivation { pname = "hakyll-filestore"; - version = "0.1.11"; - sha256 = "1gfyibnazvanrywl9bcb3y2frpp4n1cvx0c8m6cx8vmdwslwmrnv"; + version = "0.1.12"; + sha256 = "0bzs858sjlzazlf486rj74dvf7rs6i2r2q2k72s8ymjra3s3xnq0"; libraryHaskellDepends = [ base filestore @@ -293679,8 +292814,6 @@ self: { ]; description = "FileStore utilities for Hakyll"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -295598,7 +294731,9 @@ self: { testHaskellDepends = [ base ]; description = "API Client for the handwriting.io API."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "handwriting"; + broken = true; } ) { }; @@ -296995,7 +296130,6 @@ self: { base, bytestring, happstack-server, - harp, hsp, hsx2hs, mtl, @@ -297005,13 +296139,12 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.7"; - sha256 = "1bgjy77sbrb7nmbvb98hw5w7lb6ffvbb0nb62ylg2pf9nl862khv"; + version = "7.3.7.8"; + sha256 = "1r3fb4p0acrz6wg7fb5kkxls3fjcgvdqcblixm4lnjlpjjmgpza8"; libraryHaskellDepends = [ base bytestring happstack-server - harp hsp hsx2hs mtl @@ -297224,7 +296357,6 @@ self: { mtl, network, network-uri, - old-locale, parsec, process, sendfile, @@ -297235,7 +296367,6 @@ self: { time, transformers, transformers-base, - transformers-compat, unix, utf8-string, xhtml, @@ -297243,8 +296374,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.9.2.1"; - sha256 = "177qzsny5gn409j5l8ixyrs22dg8rnvrcjipv313rzkr449bl6sx"; + version = "7.9.3"; + sha256 = "1p2gi2knkrkdhip6ynsha76hwmfa9jjrq9q0n0xlm85agwsh57mb"; libraryHaskellDepends = [ base base64-bytestring @@ -297261,7 +296392,6 @@ self: { mtl network network-uri - old-locale parsec process sendfile @@ -297272,7 +296402,6 @@ self: { time transformers transformers-base - transformers-compat unix utf8-string xhtml @@ -297308,8 +296437,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.2.1.6"; - sha256 = "05gdqkgrvkv6qbcdfwyblnv4bs03gr1nl467kr6g4x4cwj77fmf3"; + version = "7.2.1.7"; + sha256 = "13wgqfzamr6xrnax9xkihn91vy5mmradl9d4f6kk1nwqnvlxnphz"; libraryHaskellDepends = [ base bytestring @@ -297600,41 +296729,8 @@ self: { }: mkDerivation { pname = "happy"; - version = "2.0.2"; - sha256 = "0gp8fwn0k4vdz4g3s00jrh0n4g1arvpp6ps4f5xljqd1x1sjxxgp"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array - base - containers - happy-lib - mtl - ]; - testHaskellDepends = [ - base - process - ]; - description = "Happy is a parser generator for Haskell"; - license = lib.licenses.bsd2; - mainProgram = "happy"; - } - ) { }; - - happy_2_1_5 = callPackage ( - { - mkDerivation, - array, - base, - containers, - happy-lib, - mtl, - process, - }: - mkDerivation { - pname = "happy"; - version = "2.1.5"; - sha256 = "1i21bklax7fjh5l2a2yw1va0wx8ww1pf3f8082r53yavyqj2zy3s"; + version = "2.1.7"; + sha256 = "0aky5m9r3420h88ghq0qf9ck09g8ysr1aqlgb531vlc2n050yfcy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -297650,7 +296746,6 @@ self: { ]; description = "Happy is a parser generator for Haskell"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; mainProgram = "happy"; } ) { }; @@ -297754,6 +296849,8 @@ self: { ]; description = "Parser for dot made with happy"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -297791,35 +296888,8 @@ self: { }: mkDerivation { pname = "happy-lib"; - version = "2.0.2"; - sha256 = "0ki1yn2m7fadsj1vjfskc2py7s6sgkhhzbs4l3ykbmgxkskvza29"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array - base - containers - mtl - transformers - ]; - doHaddock = false; - description = "Happy is a parser generator for Haskell implemented using this library"; - license = lib.licenses.bsd2; - } - ) { }; - - happy-lib_2_1_5 = callPackage ( - { - mkDerivation, - array, - base, - containers, - mtl, - transformers, - }: - mkDerivation { - pname = "happy-lib"; - version = "2.1.5"; - sha256 = "1swlva1h9shz8vwvi12b0dr66xrg627087n9p3scll5i5md6qnm2"; + version = "2.1.7"; + sha256 = "0sgj004khhy95xlw514s7pl8vk02fmssh3sn7kxgmdgjlg2b49gn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -297831,7 +296901,6 @@ self: { doHaddock = false; description = "Happy is a parser generator for Haskell implemented using this library"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -298480,46 +297549,6 @@ self: { ) { }; harpie = callPackage ( - { - mkDerivation, - adjunctions, - base, - distributive, - doctest-parallel, - first-class-families, - prettyprinter, - QuickCheck, - quickcheck-instances, - random, - vector, - vector-algorithms, - }: - mkDerivation { - pname = "harpie"; - version = "0.1.2.0"; - sha256 = "1dmga5rqhz7p1hxl9lyig3w3l3x3921av1n0zvd3ci40dbl6nsi9"; - libraryHaskellDepends = [ - adjunctions - base - distributive - first-class-families - prettyprinter - QuickCheck - quickcheck-instances - random - vector - vector-algorithms - ]; - testHaskellDepends = [ - base - doctest-parallel - ]; - description = "Haskell array programming"; - license = lib.licenses.bsd3; - } - ) { }; - - harpie_0_1_3_0 = callPackage ( { mkDerivation, adjunctions, @@ -298563,7 +297592,6 @@ self: { ]; description = "Haskell array programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "harpie-bug-issue1"; } ) { }; @@ -298581,8 +297609,8 @@ self: { }: mkDerivation { pname = "harpie-numhask"; - version = "0.1.0.1"; - sha256 = "1688gkwabg3ijnqq65j3nwrwdx2r6qb38dpchkm6wckycpy7i8f2"; + version = "0.1.0.2"; + sha256 = "1vf21nbqrgws4lk6k1rhw00wccdskjl5cqdc9w0psgcdrq8xvprm"; libraryHaskellDepends = [ adjunctions base @@ -298908,7 +297936,9 @@ self: { ]; description = "tiny calculator library and command-line program"; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "hascal"; + broken = true; } ) { }; @@ -299527,6 +298557,8 @@ self: { ]; description = "Opportunistic hash-consing data structure"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -299630,7 +298662,7 @@ self: { } ) { }; - hashable = callPackage ( + hashable_1_4_7_0 = callPackage ( { mkDerivation, base, @@ -299684,10 +298716,11 @@ self: { ]; description = "A class for types that can be converted to a hash value"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; - hashable_1_5_0_0 = callPackage ( + hashable = callPackage ( { mkDerivation, base, @@ -299743,7 +298776,6 @@ self: { ]; description = "A class for types that can be converted to a hash value"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -300143,6 +299175,8 @@ self: { ]; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -300233,6 +299267,8 @@ self: { ]; description = "A Hashmap on io monad"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -300350,52 +299386,6 @@ self: { ) { }; hashtables = callPackage ( - { - mkDerivation, - base, - ghc-prim, - hashable, - HUnit, - mwc-random, - primitive, - QuickCheck, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - vector, - }: - mkDerivation { - pname = "hashtables"; - version = "1.3.1"; - sha256 = "1hsrihk948xfpy14qrhar50b41kp60i1rx8bkadjg1xb4bml0gbg"; - revision = "1"; - editedCabalFile = "1xskh7v0wnnrm1gc6haihahq4gqrk38bzsf2v35aj0gr16sa9g3i"; - libraryHaskellDepends = [ - base - ghc-prim - hashable - primitive - vector - ]; - testHaskellDepends = [ - base - ghc-prim - hashable - HUnit - mwc-random - primitive - QuickCheck - test-framework - test-framework-hunit - test-framework-quickcheck2 - vector - ]; - description = "Mutable hash tables in the ST monad"; - license = lib.licenses.bsd3; - } - ) { }; - - hashtables_1_4_2 = callPackage ( { mkDerivation, base, @@ -300434,7 +299424,6 @@ self: { ]; description = "Mutable hash tables in the ST monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -300949,7 +299938,7 @@ self: { } ) { }; - haskeline_0_8_3_0 = callPackage ( + haskeline_0_8_4_0 = callPackage ( { mkDerivation, base, @@ -300968,8 +299957,8 @@ self: { }: mkDerivation { pname = "haskeline"; - version = "0.8.3.0"; - sha256 = "119mcjmmxg18qvj8mbyn4dw0ashh3ypgbgy16ngn8pzxyj0x4mwi"; + version = "0.8.4.0"; + sha256 = "1jky7h70f6k8qaxkh6f7pd5cam9sjqmibh18kksf8vr98dzh3xhp"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -300994,6 +299983,7 @@ self: { base bytestring containers + directory HUnit process text @@ -301610,7 +300600,9 @@ self: { ]; description = "PostgreSQL/PGMQ broker implementation for haskell-bee"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; mainProgram = "simple-worker"; + broken = true; } ) { }; @@ -302397,10 +301389,102 @@ self: { ]; description = "Haskell Debug Adapter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "haskell-debug-adapter"; } ) { }; + haskell-debugger = callPackage ( + { + mkDerivation, + aeson, + array, + async, + base, + base16-bytestring, + binary, + bytestring, + co-log-core, + containers, + cryptohash-sha1, + dap, + directory, + exceptions, + filepath, + ghc, + ghci, + haskeline, + hie-bios, + implicit-hie, + mtl, + optparse-applicative, + prettyprinter, + process, + text, + time, + transformers, + unix, + }: + mkDerivation { + pname = "haskell-debugger"; + version = "0.7.0.0"; + sha256 = "18hx1jb6w8yzxh410fsi2lv7xv37gm2k9i7yfchhiqccgbr5zp2j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + array + base + base16-bytestring + binary + bytestring + co-log-core + containers + cryptohash-sha1 + directory + exceptions + filepath + ghc + ghci + hie-bios + mtl + prettyprinter + process + text + time + unix + ]; + executableHaskellDepends = [ + aeson + async + base + bytestring + co-log-core + containers + dap + directory + exceptions + filepath + ghc + haskeline + hie-bios + implicit-hie + mtl + optparse-applicative + prettyprinter + process + text + transformers + unix + ]; + testHaskellDepends = [ base ]; + description = "A step-through machine-interface debugger for GHC Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hdb"; + } + ) { }; + haskell-disque = callPackage ( { mkDerivation, @@ -302951,81 +302035,6 @@ self: { ) { }; haskell-gi = - callPackage - ( - { - mkDerivation, - ansi-terminal, - attoparsec, - base, - bytestring, - Cabal, - cabal-doctest, - containers, - directory, - doctest, - filepath, - glib, - gobject-introspection, - haskell-gi-base, - mtl, - pretty-show, - process, - regex-tdfa, - safe, - text, - transformers, - xdg-basedir, - xml-conduit, - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.26.16"; - sha256 = "0v5pjysap2v5a9njc1z9c6by2sv18p9kkqcpzpxwqjs9hh4mxq5q"; - setupHaskellDepends = [ - base - Cabal - cabal-doctest - ]; - libraryHaskellDepends = [ - ansi-terminal - attoparsec - base - bytestring - Cabal - containers - directory - filepath - haskell-gi-base - mtl - pretty-show - process - regex-tdfa - safe - text - transformers - xdg-basedir - xml-conduit - ]; - libraryPkgconfigDepends = [ - glib - gobject-introspection - ]; - testHaskellDepends = [ - base - doctest - process - ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - } - ) - { - inherit (pkgs) glib; - inherit (pkgs) gobject-introspection; - }; - - haskell-gi_0_26_17 = callPackage ( { @@ -303093,7 +302102,6 @@ self: { ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; } ) { @@ -303441,14 +302449,16 @@ self: { primitive, random, singletons, + singletons-base, + singletons-th, tasty, tasty-golden, tasty-hunit, }: mkDerivation { pname = "haskell-igraph"; - version = "0.8.0"; - sha256 = "0lwpliym0rldf4pqi17a9gm0dxlxd8jf4r12lcyp78mhdxfgdzcc"; + version = "0.8.5"; + sha256 = "18v37fr01ngkg0m204gkcsfqydr2kjjqim5lyhwhnnm7hgkw85j3"; libraryHaskellDepends = [ base bytestring @@ -303458,6 +302468,8 @@ self: { data-ordlist primitive singletons + singletons-base + singletons-th ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -303471,7 +302483,7 @@ self: { tasty-golden tasty-hunit ]; - description = "Bindings to the igraph C library (v0.8.0)."; + description = "Bindings to the igraph C library (v0.8.5)."; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -303598,7 +302610,6 @@ self: { mkDerivation, aeson, aeson-pretty, - apply-refact, array, async, base, @@ -303617,23 +302628,18 @@ self: { eventlog2html, extra, filepath, - floskell, - foldl, fourmolu, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-exactprint, - ghc-lib-parser, - ghc-lib-parser-ex, ghcide, githash, hashable, hie-bios, hie-compat, hiedb, - hlint, hls-graph, hls-plugin-api, hls-test-utils, @@ -303658,10 +302664,8 @@ self: { process-extras, QuickCheck, random, - refact, regex-applicative, regex-tdfa, - retrie, row-types, safe-exceptions, semigroupoids, @@ -303679,7 +302683,6 @@ self: { tasty-quickcheck, tasty-rerun, template-haskell, - temporary, text, text-rope, time, @@ -303703,7 +302706,6 @@ self: { libraryHaskellDepends = [ aeson aeson-pretty - apply-refact array async base @@ -303720,23 +302722,18 @@ self: { dlist extra filepath - floskell - foldl fourmolu fuzzy ghc ghc-boot ghc-boot-th ghc-exactprint - ghc-lib-parser - ghc-lib-parser-ex ghcide githash hashable hie-bios hie-compat hiedb - hlint hls-graph hls-plugin-api hls-test-utils @@ -303756,10 +302753,8 @@ self: { prettyprinter process process-extras - refact regex-applicative regex-tdfa - retrie row-types safe-exceptions semigroupoids @@ -303771,14 +302766,12 @@ self: { stylish-haskell syb template-haskell - temporary text text-rope time transformers trial unliftio - unliftio-core unordered-containers vector yaml @@ -303887,18 +302880,6 @@ self: { ) { }; haskell-lexer = callPackage ( - { mkDerivation, base }: - mkDerivation { - pname = "haskell-lexer"; - version = "1.1.2"; - sha256 = "07b8vij3x90px9zm3zmfy55f8zja8wcy8m0kpbpa94gdzxmmpagk"; - libraryHaskellDepends = [ base ]; - description = "A fully compliant Haskell 98 lexer"; - license = lib.licenses.mit; - } - ) { }; - - haskell-lexer_1_2_1 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "haskell-lexer"; @@ -303907,7 +302888,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A fully compliant Haskell 98 lexer"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -305183,8 +304163,8 @@ self: { }: mkDerivation { pname = "haskell-src"; - version = "1.0.4.1"; - sha256 = "1fgg7wriwan4bfgmwan8q8mryrcdcikksjr26a9fpi7csccbwhv0"; + version = "1.0.4.2"; + sha256 = "1bairsbik3n9pbhkl547793sh9dp15n32a93di2n1xa75bbiy3zy"; libraryHaskellDepends = [ array base @@ -308480,127 +307460,7 @@ self: { cereal, conduit, containers, - cryptonite, - data-default, - deepseq, - entropy, - hashable, - hspec, - hspec-discover, - HUnit, - lens, - lens-aeson, - memory, - mtl, - murmur3, - network, - QuickCheck, - safe, - scientific, - secp256k1-haskell, - split, - string-conversions, - text, - time, - transformers, - unordered-containers, - vector, - }: - mkDerivation { - pname = "haskoin-core"; - version = "1.1.0"; - sha256 = "09ic5fcs1j0snbwgcvsn4bkr9d9a6sn537ll93nd5rim6nkbx09n"; - libraryHaskellDepends = [ - aeson - array - base - base16 - binary - bytes - bytestring - cereal - conduit - containers - cryptonite - data-default - deepseq - entropy - hashable - hspec - memory - mtl - murmur3 - network - QuickCheck - safe - scientific - secp256k1-haskell - split - string-conversions - text - time - transformers - unordered-containers - vector - ]; - testHaskellDepends = [ - aeson - array - base - base16 - base64 - binary - bytes - bytestring - cereal - conduit - containers - cryptonite - data-default - deepseq - entropy - hashable - hspec - HUnit - lens - lens-aeson - memory - mtl - murmur3 - network - QuickCheck - safe - scientific - secp256k1-haskell - split - string-conversions - text - time - transformers - unordered-containers - vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Bitcoin & Bitcoin Cash library for Haskell"; - license = lib.licenses.mit; - } - ) { }; - - haskoin-core_1_2_2 = callPackage ( - { - mkDerivation, - aeson, - array, - base, - base16, - base64, - binary, - bytes, - bytestring, - cereal, - conduit, - containers, - crypton, + crypton, data-default, deepseq, entropy, @@ -308703,7 +307563,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -309152,105 +308011,11 @@ self: { testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "haskoin-store"; - broken = true; } ) { }; haskoin-store-data = callPackage ( - { - mkDerivation, - aeson, - base, - binary, - bytes, - bytestring, - cereal, - containers, - data-default, - deepseq, - hashable, - haskoin-core, - hspec, - hspec-discover, - http-client, - http-types, - lens, - mtl, - network, - QuickCheck, - scotty, - string-conversions, - text, - time, - unordered-containers, - vector, - wreq, - }: - mkDerivation { - pname = "haskoin-store-data"; - version = "1.4.0"; - sha256 = "00az0j07f9xj9af502i7b6zkmz43f9c45z80y1znhlvf66as25vi"; - libraryHaskellDepends = [ - aeson - base - binary - bytes - bytestring - cereal - containers - data-default - deepseq - hashable - haskoin-core - http-client - http-types - lens - mtl - network - scotty - string-conversions - text - time - unordered-containers - vector - wreq - ]; - testHaskellDepends = [ - aeson - base - binary - bytes - bytestring - cereal - containers - data-default - deepseq - hashable - haskoin-core - hspec - http-client - http-types - lens - mtl - network - QuickCheck - scotty - string-conversions - text - time - unordered-containers - vector - wreq - ]; - testToolDepends = [ hspec-discover ]; - description = "Data for Haskoin Store"; - license = lib.licenses.mit; - } - ) { }; - - haskoin-store-data_1_5_16 = callPackage ( { mkDerivation, aeson, @@ -309339,7 +308104,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -310090,8 +308854,8 @@ self: { }: mkDerivation { pname = "hasktorch"; - version = "0.2.1.4"; - sha256 = "0g5k796s66mz53cabfd0gl099rrjk1pfxc55qfg2j97mn69hgb1q"; + version = "0.2.1.6"; + sha256 = "0zv1n54bjvisnr5himacq7mxanblldrdxnfvbszp0ahvlgjamm1z"; setupHaskellDepends = [ base Cabal @@ -310106,6 +308870,7 @@ self: { constraints containers data-default-class + deepseq finite-typelits foldl ghc-typelits-extra @@ -310984,8 +309749,8 @@ self: { pname = "haskyapi"; version = "0.0.0.2"; sha256 = "1s5krzzmrl8p97xg8p1dimijqmyjbrdfm4i0dpp7jiipj2hzvqyq"; - revision = "1"; - editedCabalFile = "0lglfby1cpaplq53cvsm3n6crdskfm8ck33rwkm6nbzylhszm0f0"; + revision = "3"; + editedCabalFile = "0v39ysp0yqqfai6xma07x3mkka8kyv8d126knsgshjjj7kkc4h6z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -311265,7 +310030,6 @@ self: { ]; description = "A monad for interfacing with external SMT solvers"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -311452,87 +310216,6 @@ self: { ) { }; hasql = callPackage ( - { - mkDerivation, - aeson, - attoparsec, - base, - bytestring, - bytestring-strict-builder, - contravariant, - contravariant-extras, - criterion, - dlist, - hashable, - hashtables, - hspec, - hspec-discover, - iproute, - mtl, - postgresql-binary, - postgresql-libpq, - profunctors, - quickcheck-instances, - rerebase, - scientific, - tasty, - tasty-hunit, - tasty-quickcheck, - text, - text-builder, - time, - transformers, - uuid, - vector, - }: - mkDerivation { - pname = "hasql"; - version = "1.8.1.4"; - sha256 = "0m2micp6g9kc1dq7sy3j8lba5iw7p0zn669613bs3an3ni4a7f03"; - libraryHaskellDepends = [ - aeson - attoparsec - base - bytestring - bytestring-strict-builder - contravariant - dlist - hashable - hashtables - iproute - mtl - postgresql-binary - postgresql-libpq - profunctors - scientific - text - text-builder - time - transformers - uuid - vector - ]; - testHaskellDepends = [ - contravariant-extras - hspec - quickcheck-instances - rerebase - tasty - tasty-hunit - tasty-quickcheck - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - criterion - rerebase - ]; - doHaddock = false; - description = "Fast PostgreSQL driver with a flexible mapping API"; - license = lib.licenses.mit; - } - ) { }; - - hasql_1_9_1_2 = callPackage ( { mkDerivation, aeson, @@ -311560,6 +310243,7 @@ self: { tasty, tasty-hunit, tasty-quickcheck, + testcontainers-postgresql, text, text-builder, time, @@ -311570,8 +310254,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.9.1.2"; - sha256 = "0z8hadc22nx2yxbp9m5yvlz72rsbagwx676h29nh3cagaz7a9swi"; + version = "1.9.3.1"; + sha256 = "1v8zj0qcq15cp8d70r24paj2iyagxyhc0svj28g6az2irslwx8dw"; libraryHaskellDepends = [ aeson attoparsec @@ -311605,6 +310289,7 @@ self: { tasty tasty-hunit tasty-quickcheck + testcontainers-postgresql ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -311614,7 +310299,6 @@ self: { doHaddock = false; description = "Fast PostgreSQL driver with a flexible mapping API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -311782,6 +310466,8 @@ self: { ]; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -312306,8 +310992,8 @@ self: { }: mkDerivation { pname = "hasql-notifications"; - version = "0.2.3.2"; - sha256 = "00sqzcyq90firpv4z8nwlizd2x7nz6zqpqwv3d6ky3zh5kfvfxpd"; + version = "0.2.4.0"; + sha256 = "0xnag6j2qkyzii9blbrm3fp6rgcx291ih01v7msfbp0wr3dkg1dj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -312336,37 +311022,6 @@ self: { ) { }; hasql-optparse-applicative = callPackage ( - { - mkDerivation, - attoparsec, - attoparsec-time, - base, - bytestring, - hasql, - hasql-pool, - optparse-applicative, - time, - }: - mkDerivation { - pname = "hasql-optparse-applicative"; - version = "0.8.0.1"; - sha256 = "0xxli8ln3kpwci7iksy6za3pmnds6blw0y349c76ibfjb69d412k"; - libraryHaskellDepends = [ - attoparsec - attoparsec-time - base - bytestring - hasql - hasql-pool - optparse-applicative - time - ]; - description = "\"optparse-applicative\" parsers for \"hasql\""; - license = lib.licenses.mit; - } - ) { }; - - hasql-optparse-applicative_0_9 = callPackage ( { mkDerivation, attoparsec, @@ -312396,7 +311051,6 @@ self: { ]; description = "\"optparse-applicative\" parsers for \"hasql\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -312487,48 +311141,8 @@ self: { }: mkDerivation { pname = "hasql-pool"; - version = "1.2.0.3"; - sha256 = "1jjr5wmign12m05f7p3cssmd9qfindv3q9q37j28jk8y74lnqxvy"; - libraryHaskellDepends = [ - base - bytestring - hasql - stm - text - time - uuid - ]; - testHaskellDepends = [ - async - hasql - hspec - random - rerebase - ]; - description = "Pool of connections for Hasql"; - license = lib.licenses.mit; - } - ) { }; - - hasql-pool_1_3_0_2 = callPackage ( - { - mkDerivation, - async, - base, - bytestring, - hasql, - hspec, - random, - rerebase, - stm, - text, - time, - uuid, - }: - mkDerivation { - pname = "hasql-pool"; - version = "1.3.0.2"; - sha256 = "1adx703q4vx2qpmp2hl3zaa48h79px2py9p04ikwixd1aq300wrh"; + version = "1.3.0.3"; + sha256 = "1r59bn50klalw3g9fal8xpbv86fzzw77nqbymhdvq11wslhpyrm3"; libraryHaskellDepends = [ base bytestring @@ -312547,7 +311161,6 @@ self: { ]; description = "Pool of connections for Hasql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -312911,6 +311524,7 @@ self: { ]; description = "Stream Hasql queries"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -313154,44 +311768,8 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "1.1.1.2"; - sha256 = "159dd3v9cz2kz1ph770w54nr25md6fncng86mfiphrh7823vfj4w"; - libraryHaskellDepends = [ - base - bytestring - bytestring-tree-builder - contravariant - hasql - mtl - transformers - ]; - testHaskellDepends = [ - async - hasql - rerebase - ]; - description = "Composable abstraction over retryable transactions for Hasql"; - license = lib.licenses.mit; - } - ) { }; - - hasql-transaction_1_2_0_1 = callPackage ( - { - mkDerivation, - async, - base, - bytestring, - bytestring-tree-builder, - contravariant, - hasql, - mtl, - rerebase, - transformers, - }: - mkDerivation { - pname = "hasql-transaction"; - version = "1.2.0.1"; - sha256 = "18dvw4vd91r74ljqysf8b3ww4ld9pg4cgrqxph59hlgkl7dxw330"; + version = "1.2.1"; + sha256 = "0mvk0g92hmjcv6yjcbm0jlrn8h6raj05lmmsi2jd1l1vqlqgip3l"; libraryHaskellDepends = [ base bytestring @@ -313208,7 +311786,6 @@ self: { ]; description = "Composable abstraction over retryable transactions for Hasql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -313244,6 +311821,8 @@ self: { ]; description = "Perform IO actions during transactions for Hasql"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -313824,7 +312403,9 @@ self: { testHaskellDepends = [ base ]; description = "A program to download subtitle files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hastily"; + broken = true; } ) { }; @@ -315359,8 +313940,6 @@ self: { ]; description = "Blosc (numerical compression library) bindings for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -316120,8 +314699,6 @@ self: { doHaddock = false; description = "Haskell COM support library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -316853,8 +315430,8 @@ self: { }: mkDerivation { pname = "hdf5"; - version = "1.8.14"; - sha256 = "0pw0il5mzkgvrxwvyndl085ram35rk7gfbd7mrarjqppqhhc9dhn"; + version = "1.8.15"; + sha256 = "1ndy228mrxy8d18nm5ryfrawnc8i7zdv9xprg1sm8xfgfiwym9cs"; libraryHaskellDepends = [ base bindings-DSL @@ -316879,8 +315456,6 @@ self: { ]; description = "Haskell interface to the HDF5 scientific data storage library"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) hdf5; }; @@ -318570,6 +317145,85 @@ self: { } ) { }; + hedgehog_1_6 = callPackage ( + { + mkDerivation, + ansi-terminal, + async, + barbies, + base, + bytestring, + concurrent-output, + containers, + deepseq, + directory, + erf, + exceptions, + lifted-async, + mmorph, + monad-control, + mtl, + pretty-show, + primitive, + random, + resourcet, + safe-exceptions, + stm, + template-haskell, + text, + time, + transformers, + transformers-base, + wl-pprint-annotated, + }: + mkDerivation { + pname = "hedgehog"; + version = "1.6"; + sha256 = "0lrwwlcp3rihs9z239lf6pd0m2fmi8ww4vvrwiphkrcba4c91bgf"; + libraryHaskellDepends = [ + ansi-terminal + async + barbies + base + bytestring + concurrent-output + containers + deepseq + directory + erf + exceptions + lifted-async + mmorph + monad-control + mtl + pretty-show + primitive + random + resourcet + safe-exceptions + stm + template-haskell + text + time + transformers + transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base + containers + mmorph + mtl + pretty-show + text + transformers + ]; + description = "Release with confidence"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hedgehog-checkers = callPackage ( { mkDerivation, @@ -318738,8 +317392,8 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.9.0.0"; - sha256 = "0l067gvm7vvhr5jrcys9676kfhdvaivbwiqh85n0zlcnkf3mjff0"; + version = "0.10.0.0"; + sha256 = "10mmvxvr64s7j6zil4ygk1l74iask96r7k2cgv59l1zkfgji44hx"; libraryHaskellDepends = [ aeson aeson-pretty @@ -318781,6 +317435,7 @@ self: { ]; testHaskellDepends = [ base + directory hedgehog lifted-base network @@ -318795,8 +317450,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Supplemental library for hedgehog"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -318813,8 +317466,8 @@ self: { pname = "hedgehog-fakedata"; version = "0.0.1.5"; sha256 = "00k26d83v0646klrg0k3cf94r4fnnx3ykxv7i8shjjgbkbzlzz78"; - revision = "3"; - editedCabalFile = "1gfknhs1lslw7s00ciqn14r9b1lpph0827hhbb6bg9r52lylv9g3"; + revision = "4"; + editedCabalFile = "0nxik29cn669k2ky70xl5vq06vp0clizma0d92scx0bn51174gqs"; libraryHaskellDepends = [ base fakedata @@ -319062,6 +317715,8 @@ self: { ]; description = "Hedgehog properties for optics laws"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -319077,8 +317732,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1.1"; sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; - revision = "8"; - editedCabalFile = "162j9h6khlavyi51847s71znig1l7shj12pgp8pv76i9jr8dpm1m"; + revision = "9"; + editedCabalFile = "1grw0vh1n3nbhpypb4v4rhmidm5n2hjbr4wiyvwj79bl12bd1x49"; libraryHaskellDepends = [ base hedgehog @@ -319599,38 +318254,6 @@ self: { ) { }; heftia = callPackage ( - { - mkDerivation, - base, - data-effects, - mtl, - tasty, - tasty-discover, - tasty-hunit, - unliftio, - }: - mkDerivation { - pname = "heftia"; - version = "0.5.0.0"; - sha256 = "0y906qlpz903gk08gvgzav02adhxqz561aqy9jbrpn5wh3jqshrn"; - libraryHaskellDepends = [ - base - data-effects - mtl - unliftio - ]; - testHaskellDepends = [ - base - tasty - tasty-hunit - ]; - testToolDepends = [ tasty-discover ]; - description = "higher-order algebraic effects done right"; - license = lib.licenses.mpl20; - } - ) { }; - - heftia_0_7_0_0 = callPackage ( { mkDerivation, base, @@ -319659,7 +318282,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "higher-order algebraic effects done right"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -319671,127 +318293,8 @@ self: { co-log-core, containers, data-effects, - eff, effectful, - eveff, - extra, filepath, - freer-simple, - fused-effects, - ghc-typelits-knownnat, - heftia, - hspec, - logict, - mpeff, - mtl, - polysemy, - process, - tasty, - tasty-bench, - tasty-discover, - tasty-hspec, - text, - time, - unbounded-delays, - unliftio, - }: - mkDerivation { - pname = "heftia-effects"; - version = "0.5.0.0"; - sha256 = "0bhjj3hhvhid4vk1vfzgqpy2wpb725nwlgkc5xqy6y1ihqkf65r5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bytestring - co-log-core - containers - data-effects - ghc-typelits-knownnat - heftia - process - text - time - unbounded-delays - unliftio - ]; - executableHaskellDepends = [ - base - bytestring - co-log-core - containers - data-effects - extra - filepath - ghc-typelits-knownnat - heftia - process - text - time - unbounded-delays - unliftio - ]; - testHaskellDepends = [ - base - bytestring - co-log-core - containers - data-effects - ghc-typelits-knownnat - heftia - hspec - process - tasty - tasty-hspec - text - time - unbounded-delays - unliftio - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base - bytestring - co-log-core - containers - data-effects - eff - effectful - eveff - freer-simple - fused-effects - ghc-typelits-knownnat - heftia - logict - mpeff - mtl - polysemy - process - tasty-bench - text - time - unbounded-delays - unliftio - ]; - description = "higher-order algebraic effects done right"; - license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; - } - ) { eff = null; }; - - heftia-effects_0_7_0_0 = callPackage ( - { - mkDerivation, - base, - bytestring, - co-log-core, - containers, - data-effects, - eff, - effectful, - filepath, - freer-simple, fused-effects, heftia, hspec, @@ -319865,9 +318368,7 @@ self: { co-log-core containers data-effects - eff effectful - freer-simple fused-effects heftia logict @@ -319883,10 +318384,8 @@ self: { ]; description = "higher-order algebraic effects done right"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; } - ) { eff = null; }; + ) { }; hegg = callPackage ( { @@ -319902,8 +318401,8 @@ self: { }: mkDerivation { pname = "hegg"; - version = "0.5.0.0"; - sha256 = "0xwxmkkvx0aj8h2vqxv3n1vi94sp1kyh02yrh3mwr24d7xjq1qzs"; + version = "0.6.0.0"; + sha256 = "0xld2r3arba3lgjc4rz4gpfnvpxhhkf8cihsnb2a88a8ydjhlnav"; libraryHaskellDepends = [ base containers @@ -320405,8 +318904,8 @@ self: { }: mkDerivation { pname = "heist-extra"; - version = "0.3.0.0"; - sha256 = "11gswvr4kmrci4xnl2sq0hhfg1mmrx8hnyd8lw74zv5vwhacl00m"; + version = "0.4.0.0"; + sha256 = "0pfdrqhm84lcg7xsz8mb5cpr5j0yzzyy9p3wxx2rsww1ngl9fz18"; libraryHaskellDepends = [ base data-default @@ -321676,8 +320175,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.10.6"; - sha256 = "1mkgh544f5zxgbm6gx5dl8pnw3kpvj08b3qzh2k8vd4hlgnwhlam"; + version = "0.10.7"; + sha256 = "1d2hmhh2r0drg37cm9f3jwv5k8gjmg3mnsrsvfip0m49n09bmpqi"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -322211,8 +320710,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.3.7"; - sha256 = "1h4y8jkviiahshvky20jdda8sfmlbzpkpx313ddg9bvfqafps2mz"; + version = "0.3.8"; + sha256 = "1dkb2njp9agmawfyfsyy3sz3kx42jlv0zmbrr2b4r6zmv8v9q97h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -322322,8 +320821,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.4.0.0"; - sha256 = "1v96q27x66cdrd1mibb2cpnqiwly408ac67h1mw5dr0l1bdasvds"; + version = "0.5.0.0"; + sha256 = "0dlci548d4kpi3za59fdfd5y5p8h08rfyyvhi0a0vm4zz4jip249"; setupHaskellDepends = [ base Cabal @@ -322406,8 +320905,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.7.0"; - sha256 = "1cfkfp8n61v7wssgs4f466pb241mm9pfsqkrnrlvqrx2w6ka5svg"; + version = "0.4.0.0"; + sha256 = "0jrln90r7yg2gdd5xiwfqz8wsmzx21pfvi8bn23p30hfv5flpha8"; setupHaskellDepends = [ base Cabal @@ -322619,8 +321118,10 @@ self: { }: mkDerivation { pname = "hermes-json"; - version = "0.6.1.0"; - sha256 = "05xxc3r9gbicrdc2jfhxv556n3y46alafkcfks7dz31kq9mz619g"; + version = "0.7.0.0"; + sha256 = "1261sm969kwji4gwk474l41rk0f3i8isb5x4zd77l3y4d5hgz85b"; + revision = "1"; + editedCabalFile = "1dnk3gdhpr13m9y2j71ivjsbjkns9jvjpasf5vhlsz7w4v679zni"; libraryHaskellDepends = [ base bytestring @@ -322865,6 +321366,8 @@ self: { ]; description = "helpers for deploying to Heroku"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -323296,6 +321799,33 @@ self: { } ) { }; + heterogeneous-comparison = callPackage ( + { + mkDerivation, + base, + deepseq, + hashable, + ord-axiomata, + primitive, + stm, + }: + mkDerivation { + pname = "heterogeneous-comparison"; + version = "0.1.0.0"; + sha256 = "03gprs0c5jjn4nc0xv1529cdjdwyy4xdkzmbb2xdrl735kjnhxw0"; + libraryHaskellDepends = [ + base + deepseq + hashable + ord-axiomata + primitive + stm + ]; + description = "Comparison of distinctly typed values with evidence capture"; + license = lib.licenses.bsd3; + } + ) { }; + heterogeneous-list-literals = callPackage ( { mkDerivation, @@ -323483,6 +322013,7 @@ self: { githash, gmp, here, + hspec, libff, megaparsec, memory, @@ -323491,6 +322022,7 @@ self: { optics-core, optics-extra, optics-th, + optparse-applicative, optparse-generic, pretty-hex, process, @@ -323520,16 +322052,16 @@ self: { tree-view, unliftio-core, unordered-containers, + utf8-string, vector, witch, - with-utf8, witherable, wreq, }: mkDerivation { pname = "hevm"; - version = "0.54.2"; - sha256 = "0hbivn9008wml61bm8dchqwywc8fk0jmb4ffr18ks2qsscf2kph7"; + version = "0.55.1"; + sha256 = "15yrqf0z0phjgvr4d91qkcxh5zzhvk12nlf723hdj2qda9d3cim9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -323602,11 +322134,12 @@ self: { filepath githash optics-core + optparse-applicative optparse-generic + split text unliftio-core witch - with-utf8 ]; testHaskellDepends = [ aeson @@ -323622,6 +322155,7 @@ self: { filemanip filepath here + hspec mtl operational optics-core @@ -323630,6 +322164,7 @@ self: { QuickCheck quickcheck-instances regex + split tasty tasty-expected-failure tasty-hunit @@ -323648,10 +322183,13 @@ self: { containers filemanip filepath + here + mtl tasty tasty-bench text unliftio-core + utf8-string ]; doHaddock = false; description = "Symbolic EVM Evaluator"; @@ -323760,8 +322298,8 @@ self: { pname = "hex-text"; version = "0.1.0.9"; sha256 = "1dzv1jpjga4nsrxbwrh5nhnzv5f0mnl5i8da0blqc73vavsjhny5"; - revision = "2"; - editedCabalFile = "1ym53q8zpnl5vh049z4lki7l8154fbfvizrc5sf6wra5vqgvys35"; + revision = "3"; + editedCabalFile = "1w7hhzbnp3rjz09fxqabzchibd5snraz5b72yhb3z8xc6kkmmibp"; libraryHaskellDepends = [ base base16-bytestring @@ -325934,6 +324472,8 @@ self: { ]; description = "Haskell interface to GMP"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -326040,6 +324580,7 @@ self: { ]; description = "Tools for working on (di)graphs"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -326395,8 +324936,8 @@ self: { }: mkDerivation { pname = "hi-file-parser"; - version = "0.1.7.0"; - sha256 = "1rss6j85kj33jfp14qlafqlcbld6ibhhki2rjkdsz8ilchq32hqq"; + version = "0.1.8.0"; + sha256 = "1hyn87s4gvfmidiq8vp8wsflcy3wcyd92pqwkhs5zaq0imydhzi5"; libraryHaskellDepends = [ base binary @@ -326416,7 +324957,7 @@ self: { text vector ]; - description = "Parser for GHC's hi files"; + description = "Parser for GHC's *.hi files"; license = lib.licenses.bsd3; } ) { }; @@ -326756,10 +325297,10 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.15.0"; - sha256 = "1lih0gab4r33vyjmrfd7dq6fzwy6bzgkr2xw4cf3yxvxk3m1czaj"; + version = "0.17.0"; + sha256 = "0dgkckj73zknnhgnval0igb3v183ygyda65mfyibqmrm05phk9yi"; revision = "1"; - editedCabalFile = "1rcvcsz97y4b242mdjxlxmgv05bhb56hss1sqf4w07i9a6bjhnba"; + editedCabalFile = "1ayi02194h4fqbrd797lv0r0apzrwv368ghndyyd8s7v5qj8r928"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -327139,6 +325680,8 @@ self: { ]; description = "See README on Github for more information"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -328454,7 +326997,9 @@ self: { doHaddock = false; description = "Extensible Haskell pretty printer"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hindent"; + broken = true; } ) { }; @@ -329320,6 +327865,8 @@ self: { ]; description = "Haskell Image Processing (HIP) Library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -330114,6 +328661,8 @@ self: { ]; description = "Simple Data.Map-based histogram"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -330437,6 +328986,7 @@ self: { ]; description = "XPath-like syntax for querying JSON"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -330542,6 +329092,8 @@ self: { ]; description = "JSON parsing library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -330923,6 +329475,8 @@ self: { ]; description = "\"higher-kinded data\""; license = "(BSD-2-Clause OR Apache-2.0)"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -331289,20 +329843,23 @@ self: { hashable, haskeline, hledger-lib, + http-client, + http-types, lucid, math-functions, megaparsec, microlens, + modern-uri, mtl, process, regex-tdfa, + req, safe, shakespeare, split, tabular, tasty, temporary, - terminfo, text, text-ansi, time, @@ -331315,10 +329872,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.40"; - sha256 = "189lbp9dmg9kxik5zg7nk6jm8h5p8hpq1z01zsj8c29x8b8md7b7"; - revision = "1"; - editedCabalFile = "00vyxy5airrh388m1zvb3sq0jdqpfdzqiq3zdin8zq0r1jdyhzxc"; + version = "1.43.2"; + sha256 = "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -331338,20 +329893,23 @@ self: { hashable haskeline hledger-lib + http-client + http-types lucid math-functions megaparsec microlens + modern-uri mtl process regex-tdfa + req safe shakespeare split tabular tasty temporary - terminfo text text-ansi time @@ -331377,19 +329935,21 @@ self: { githash haskeline hledger-lib + http-client + http-types math-functions megaparsec microlens mtl process regex-tdfa + req safe shakespeare split tabular tasty temporary - terminfo text text-ansi time @@ -331415,19 +329975,21 @@ self: { githash haskeline hledger-lib + http-client + http-types math-functions megaparsec microlens mtl process regex-tdfa + req safe shakespeare split tabular tasty temporary - terminfo text text-ansi time @@ -331439,7 +330001,7 @@ self: { wizards ]; description = "Command-line interface for the hledger accounting system"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; mainProgram = "hledger"; maintainers = [ lib.maintainers.maralorn @@ -331448,7 +330010,7 @@ self: { } ) { }; - hledger_1_43_2 = callPackage ( + hledger_1_50 = callPackage ( { mkDerivation, aeson, @@ -331496,8 +330058,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.43.2"; - sha256 = "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1"; + version = "1.50"; + sha256 = "140yg0nds681dk2g4lyldvjlwcb3v8lg2dd82vi7zp5i9af2v9k8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -331862,8 +330424,8 @@ self: { pname = "hledger-iadd"; version = "1.3.21"; sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; - revision = "9"; - editedCabalFile = "0fhkk8gsqiv7mxjk8jlz43i2h0cqampr8w5f1lxcnfz9g4k0bv5l"; + revision = "10"; + editedCabalFile = "0138k01cba9xd3sab6kjh59rfxn96w2h21gjl579xqq76yvbibni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -331943,8 +330505,8 @@ self: { pname = "hledger-interest"; version = "1.6.7"; sha256 = "1jirygghw82zi8z160j45qzfcj1l89vckqr7hrv78h3f3pim6np4"; - revision = "2"; - editedCabalFile = "1inrlrz2rgk99sspm33r7rnfiycx8pllsh95ais9x05fp88cxhcf"; + revision = "3"; + editedCabalFile = "0f7aqbiy8s4137wa37awgjx5xmlj9x18zc10292hgsbyrzvnisdq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -332000,168 +330562,6 @@ self: { ) { }; hledger-lib = callPackage ( - { - mkDerivation, - aeson, - aeson-pretty, - ansi-terminal, - array, - base, - base-compat, - blaze-markup, - bytestring, - call-stack, - cassava, - cassava-megaparsec, - cmdargs, - colour, - containers, - data-default, - Decimal, - deepseq, - directory, - doclayout, - doctest, - extra, - file-embed, - filepath, - Glob, - hashtables, - lucid, - megaparsec, - microlens, - microlens-th, - mtl, - pager, - parser-combinators, - pretty-simple, - regex-tdfa, - safe, - tabular, - tasty, - tasty-hunit, - template-haskell, - terminal-size, - text, - text-ansi, - time, - timeit, - transformers, - uglymemo, - unordered-containers, - utf8-string, - }: - mkDerivation { - pname = "hledger-lib"; - version = "1.40"; - sha256 = "05kap7kgjlh3y7j6ld0jqih21ad7acxd9cv18h0gb7kbwn7qm8vi"; - revision = "1"; - editedCabalFile = "0j7z1ji5az5lmcxd3bqdv9pfkphvvl3wja2vqhhja1jf63bhml57"; - libraryHaskellDepends = [ - aeson - aeson-pretty - ansi-terminal - array - base - base-compat - blaze-markup - bytestring - call-stack - cassava - cassava-megaparsec - cmdargs - colour - containers - data-default - Decimal - deepseq - directory - doclayout - extra - file-embed - filepath - Glob - hashtables - lucid - megaparsec - microlens - microlens-th - mtl - pager - parser-combinators - pretty-simple - regex-tdfa - safe - tabular - tasty - tasty-hunit - template-haskell - terminal-size - text - text-ansi - time - timeit - transformers - uglymemo - unordered-containers - utf8-string - ]; - testHaskellDepends = [ - aeson - aeson-pretty - ansi-terminal - array - base - base-compat - blaze-markup - bytestring - call-stack - cassava - cassava-megaparsec - cmdargs - colour - containers - data-default - Decimal - deepseq - directory - doclayout - doctest - extra - file-embed - filepath - Glob - hashtables - lucid - megaparsec - microlens - microlens-th - mtl - pager - parser-combinators - pretty-simple - regex-tdfa - safe - tabular - tasty - tasty-hunit - template-haskell - terminal-size - text - text-ansi - time - timeit - transformers - uglymemo - unordered-containers - utf8-string - ]; - description = "A library providing the core functionality of hledger"; - license = lib.licenses.gpl3Only; - } - ) { }; - - hledger-lib_1_43_2 = callPackage ( { mkDerivation, aeson, @@ -332318,6 +330718,169 @@ self: { ]; description = "A library providing the core functionality of hledger"; license = lib.licenses.gpl3Plus; + } + ) { }; + + hledger-lib_1_50 = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + ansi-terminal, + array, + base, + blaze-html, + blaze-markup, + bytestring, + call-stack, + cassava, + cassava-megaparsec, + cmdargs, + colour, + containers, + data-default, + Decimal, + deepseq, + directory, + doclayout, + doctest, + encoding, + extra, + file-embed, + filepath, + Glob, + hashtables, + lucid, + megaparsec, + microlens, + microlens-th, + mtl, + parser-combinators, + pretty-simple, + process, + regex-tdfa, + safe, + tabular, + tasty, + tasty-hunit, + template-haskell, + terminal-size, + text, + these, + time, + timeit, + transformers, + uglymemo, + unordered-containers, + utf8-string, + }: + mkDerivation { + pname = "hledger-lib"; + version = "1.50"; + sha256 = "1fk579j56wbxxk3bz4m9hwfkdb02mz374y72bplbrf3y40cd2a48"; + libraryHaskellDepends = [ + aeson + aeson-pretty + ansi-terminal + array + base + blaze-html + blaze-markup + bytestring + call-stack + cassava + cassava-megaparsec + cmdargs + colour + containers + data-default + Decimal + deepseq + directory + doclayout + encoding + extra + file-embed + filepath + Glob + hashtables + lucid + megaparsec + microlens + microlens-th + mtl + parser-combinators + pretty-simple + process + regex-tdfa + safe + tabular + tasty + tasty-hunit + template-haskell + terminal-size + text + these + time + timeit + transformers + uglymemo + unordered-containers + utf8-string + ]; + testHaskellDepends = [ + aeson + aeson-pretty + ansi-terminal + array + base + blaze-html + blaze-markup + bytestring + call-stack + cassava + cassava-megaparsec + cmdargs + colour + containers + data-default + Decimal + deepseq + directory + doclayout + doctest + encoding + extra + file-embed + filepath + Glob + hashtables + lucid + megaparsec + microlens + microlens-th + mtl + parser-combinators + pretty-simple + process + regex-tdfa + safe + tabular + tasty + tasty-hunit + template-haskell + terminal-size + text + these + time + timeit + transformers + uglymemo + unordered-containers + utf8-string + ]; + description = "A library providing the core functionality of hledger"; + license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; } ) { }; @@ -332480,10 +331043,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.40"; - sha256 = "0rvijrnmkc21nllqcbkn6fh51ifp1n1p8qgmckfp5pngqg40vvnz"; - revision = "1"; - editedCabalFile = "1sj141sr23j1xajy6c9r9aqxy8gr98c9qcgx5myn78nh3420kxsm"; + version = "1.43.2"; + sha256 = "1xz5ndkg5mci689n82dnmwhhr8a08qw12czsf4b82ha7zlmbkmnv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -332520,13 +331081,13 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Terminal interface for the hledger accounting system"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; mainProgram = "hledger-ui"; maintainers = [ lib.maintainers.maralorn ]; } ) { }; - hledger-ui_1_43_2 = callPackage ( + hledger-ui_1_50 = callPackage ( { mkDerivation, ansi-terminal, @@ -332562,8 +331123,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.43.2"; - sha256 = "1xz5ndkg5mci689n82dnmwhhr8a08qw12czsf4b82ha7zlmbkmnv"; + version = "1.50"; + sha256 = "15kn2yy44jpn0ag6248z0cmp3rkbdcxbbr02am41jlg6igv9kqkq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -332662,6 +331223,7 @@ self: { Decimal, directory, extra, + file-embed, filepath, githash, hjsmin, @@ -332697,10 +331259,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.40"; - sha256 = "1dsvsgdan7f8zc0z9x4zri2q6ccajvqpjpv18zj488ihknshiwgq"; - revision = "1"; - editedCabalFile = "18aginmx6wlqk0zpf8jvisgl4hrlqd1g83wgfnqj3lrj66p0x4bd"; + version = "1.43.2"; + sha256 = "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -332720,6 +331280,7 @@ self: { Decimal directory extra + file-embed filepath githash hjsmin @@ -332756,13 +331317,13 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Web user interface for the hledger accounting system"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; mainProgram = "hledger-web"; maintainers = [ lib.maintainers.maralorn ]; } ) { }; - hledger-web_1_43_2 = callPackage ( + hledger-web_1_50 = callPackage ( { mkDerivation, aeson, @@ -332817,8 +331378,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.43.2"; - sha256 = "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd"; + version = "1.50"; + sha256 = "04zmvlyij95v31v6p9124jicpgv7mbz2141j60ci18ci17r48fd8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -333136,7 +331697,7 @@ self: { } ) { }; - hlint = callPackage ( + hlint_3_8 = callPackage ( { mkDerivation, aeson, @@ -333204,12 +331765,13 @@ self: { executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hlint"; maintainers = [ lib.maintainers.maralorn ]; } ) { }; - hlint_3_10 = callPackage ( + hlint = callPackage ( { mkDerivation, aeson, @@ -333277,7 +331839,6 @@ self: { executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hlint"; maintainers = [ lib.maintainers.maralorn ]; } @@ -333464,6 +332025,8 @@ self: { pname = "hlrdb"; version = "0.5.0.0"; sha256 = "19m4k0w8gd3p5khjy9pqjdy0mgmgibg66dxc1vw187yppl9d82an"; + revision = "1"; + editedCabalFile = "0h50jakhd57njpna5pn83rin0bcybkwby6k1i286kzqfympw6b3r"; libraryHaskellDepends = [ base base64 @@ -333501,8 +332064,8 @@ self: { pname = "hlrdb-core"; version = "0.2.0.0"; sha256 = "0hkjll4v4kxc133b19kk9k4dkrbag6qdw24gwrhikrxlk666jsbl"; - revision = "5"; - editedCabalFile = "1wd5fx9q9h8ypc1rzpgpdcdvrvmd7v9rricy0k856jl1r7blsm93"; + revision = "6"; + editedCabalFile = "0lmlxc668ndc9diyr9qrpqkxqwc8nga83kp56h8pypxq5n2xjj9w"; libraryHaskellDepends = [ base bytestring @@ -333616,8 +332179,6 @@ self: { sha256 = "11hnkbpg13zvnq69svm46zm5k55yshgz97kjjx1g3jcb9ah1brm1"; description = "Integration with the Brittany code formatter"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -333861,8 +332422,6 @@ self: { sha256 = "0jib2y256fb5b8wgsi9rjsdb3ywwpcbcnbbxmg6q3gwnglrdb1lx"; description = "Class/instance management plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -334239,8 +332798,6 @@ self: { sha256 = "1wyk88lynchhzriqj7m9ph0s2c2ivkqg1nmhgb1knkvp8ag27iik"; description = "Integration with the Floskell code formatter"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -334309,8 +332866,6 @@ self: { sha256 = "0aa602m024s3ch23np2iixmkwv6474va20bjdgiwdgc8vahg4grg"; description = "Convert to GADT syntax plugin"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -334400,8 +332955,6 @@ self: { sha256 = "0wp8hk5hwl43z5mjcas332z92y3zv9g8wrc5zhzli8pa37ab6r8x"; description = "Haddock comments plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -334413,8 +332966,6 @@ self: { sha256 = "0ix89wp8nq3iywh6d3w8j7lnfm2g3l9gks8sxkww0z0mfhfxvywc"; description = "Hlint integration plugin with Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -334812,8 +333363,6 @@ self: { sha256 = "0lqy7c3vqn832gs9z86n4clsqb6g73rhnlrvn3sg3h8hkxasfzjf"; description = "Exactprint refactorings for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -334874,8 +333423,6 @@ self: { sha256 = "15gjh7r9cc43yz1zp52q349fag4nxv25vhzn5pdma4ch366xyr4g"; description = "Rename plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -334887,8 +333434,6 @@ self: { sha256 = "11cl4q79jxl73s62ccdarp1570k95picgn3q8lgnqznc6ywdv3zh"; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -335041,72 +333586,17 @@ self: { sha256 = "00fx8rxdnmam0672vb0az2lw5inqyc22cjfrh8wiwx36i28r8zqj"; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; hls-stan-plugin = callPackage ( - { - mkDerivation, - aeson, - base, - containers, - data-default, - deepseq, - directory, - filepath, - ghc, - ghcide, - hashable, - hie-compat, - hls-plugin-api, - hls-test-utils, - lens, - lsp-types, - stan, - text, - transformers, - trial, - unordered-containers, - }: + { mkDerivation }: mkDerivation { pname = "hls-stan-plugin"; version = "2.6.0.0"; sha256 = "1zhw2ysf5ccsrz1vahff6hr683b581v4py2pyf9xfnjfay5gl0id"; - libraryHaskellDepends = [ - base - containers - data-default - deepseq - directory - ghc - ghcide - hashable - hie-compat - hls-plugin-api - lsp-types - stan - text - transformers - trial - unordered-containers - ]; - testHaskellDepends = [ - aeson - base - containers - filepath - hls-plugin-api - hls-test-utils - lens - lsp-types - text - ]; description = "Stan integration plugin with Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -335118,8 +333608,6 @@ self: { sha256 = "171068mmb7sdk14s5v794jc0n0mrrq8fkzp2z2wlrmk38mqi3773"; description = "Integration with the Stylish Haskell code formatter"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -335131,8 +333619,6 @@ self: { sha256 = "05rgapkpr3giln245aswlcgwqpfglifsjq1n8sgwgi04bn2w6vng"; description = "Wingman plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -336470,8 +334956,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.16.0"; - sha256 = "0xhvq6jfj6argpqvbqjy784cpb75lgkmlxmamngwq44knz58pp2q"; + version = "2.16.2"; + sha256 = "0n46rjl52vcwmliqaisi6jw9b4phwdcy5b60sq71k76zfhhffybn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -336971,7 +335457,7 @@ self: { } ) { }; - hnix-store-core_0_6_1_0 = callPackage ( + hnix-store-core = callPackage ( { mkDerivation, algebraic-graphs, @@ -337065,7 +335551,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki @@ -337073,7 +335558,7 @@ self: { } ) { }; - hnix-store-core = callPackage ( + hnix-store-core_0_8_0_0 = callPackage ( { mkDerivation, attoparsec, @@ -337148,6 +335633,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core types used for interacting with the Nix store"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki @@ -337202,6 +335688,8 @@ self: { testHaskellDepends = [ base ]; description = "Nix store database support"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -337872,64 +336360,6 @@ self: { ) { }; hoauth2 = callPackage ( - { - mkDerivation, - aeson, - base, - base64, - binary, - bytestring, - containers, - crypton, - data-default, - exceptions, - hspec, - hspec-discover, - http-conduit, - http-types, - memory, - microlens, - text, - transformers, - uri-bytestring, - uri-bytestring-aeson, - }: - mkDerivation { - pname = "hoauth2"; - version = "2.14.0"; - sha256 = "1gbdb01iinhcfc91iw2ld4lpvmpcvy6d9r1zl5a58jg16z5v6j8k"; - libraryHaskellDepends = [ - aeson - base - base64 - binary - bytestring - containers - crypton - data-default - exceptions - http-conduit - http-types - memory - microlens - text - transformers - uri-bytestring - uri-bytestring-aeson - ]; - testHaskellDepends = [ - aeson - base - hspec - uri-bytestring - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell OAuth2 authentication client"; - license = lib.licenses.mit; - } - ) { }; - - hoauth2_2_14_3 = callPackage ( { mkDerivation, aeson, @@ -337987,7 +336417,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell OAuth2 authentication client"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -338105,6 +336534,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "OAuth2 Identity Providers"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -339311,6 +337742,78 @@ self: { } ) { }; + home-assistant-client = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + deriving-aeson, + exceptions, + http-client, + http-client-tls, + http-types, + optparse-applicative, + servant, + servant-client, + text, + }: + mkDerivation { + pname = "home-assistant-client"; + version = "0.1.0.0"; + sha256 = "0sk233yzfrkgqhshxkrcx8wqg0yvcpqwl5ai7x5hk2fv1wlm8hs4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + deriving-aeson + exceptions + http-client + http-client-tls + http-types + servant + servant-client + text + ]; + executableHaskellDepends = [ + aeson + base + bytestring + containers + deriving-aeson + exceptions + http-client + http-client-tls + http-types + optparse-applicative + servant + servant-client + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + deriving-aeson + exceptions + http-client + http-client-tls + http-types + servant + servant-client + text + ]; + description = "Client library for the Home Assistant API"; + license = lib.licenses.bsd3; + mainProgram = "ha-client"; + } + ) { }; + homeomorphic = callPackage ( { mkDerivation, @@ -339439,6 +337942,7 @@ self: { ]; description = "Homotuple, all whose elements are the same type"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -339526,24 +338030,24 @@ self: { { mkDerivation, base, - hourglass, split, + time-hourglass, }: mkDerivation { pname = "homura-stopwatch"; - version = "0.2.0"; - sha256 = "1vxdgxqk7zrvymmvk597s5gqkn3c93q548ssm3jdvcrg4csbk551"; + version = "0.2.0.1"; + sha256 = "0vz20paj09g6ly63wd166qjmnz1x0whd05qhwmk78jv4nb0v6pbg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base - hourglass split + time-hourglass ]; executableHaskellDepends = [ base - hourglass split + time-hourglass ]; license = lib.licenses.mit; mainProgram = "homura-stopwatch"; @@ -341351,6 +339855,85 @@ self: { } ) { }; + horde-ad = callPackage ( + { + mkDerivation, + assert-failure, + atomic-counter, + base, + Boolean, + bytestring, + containers, + criterion, + data-default, + deepseq, + dependent-enummap, + dependent-sum, + enummapset, + ghc-typelits-knownnat, + ghc-typelits-natnormalise, + indexed-traversable, + inspection-testing, + mnist-idx, + orthotope, + ox-arrays, + random, + some, + tasty, + tasty-hunit, + tasty-quickcheck, + vector, + zlib, + }: + mkDerivation { + pname = "horde-ad"; + version = "0.2.0.0"; + sha256 = "0sjhczkfmjv8hcma7sm27b1qzfgzb8kxxh4vd8ybaa6pdn374yjr"; + libraryHaskellDepends = [ + assert-failure + atomic-counter + base + Boolean + bytestring + containers + criterion + data-default + deepseq + dependent-enummap + dependent-sum + enummapset + ghc-typelits-knownnat + ghc-typelits-natnormalise + indexed-traversable + inspection-testing + mnist-idx + orthotope + ox-arrays + random + some + tasty + tasty-hunit + tasty-quickcheck + vector + zlib + ]; + testHaskellDepends = [ + base + tasty + ]; + benchmarkHaskellDepends = [ + base + criterion + deepseq + random + ]; + doHaddock = false; + description = "Higher Order Reverse Derivatives Efficiently - Automatic Differentiation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + horizon = callPackage ( { mkDerivation, @@ -341633,40 +340216,6 @@ self: { ) { }; hosc = callPackage ( - { - mkDerivation, - base, - binary, - blaze-builder, - bytestring, - data-binary-ieee754, - network, - parsec, - time, - transformers, - }: - mkDerivation { - pname = "hosc"; - version = "0.20"; - sha256 = "17pvv6rgl74ymq7pazxqia19smsga53kkg5h1i1dgfpikrmq7fz9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base - binary - blaze-builder - bytestring - data-binary-ieee754 - network - parsec - time - transformers - ]; - description = "Haskell Open Sound Control"; - license = lib.licenses.gpl3Only; - } - ) { }; - - hosc_0_21_1 = callPackage ( { mkDerivation, base, @@ -341697,7 +340246,6 @@ self: { ]; description = "Haskell Open Sound Control"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -342261,6 +340809,8 @@ self: { ]; description = "Non-interactive proof assistant monad for first-order logic"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -342474,7 +341024,7 @@ self: { } ) { }; - hpack = callPackage ( + hpack_0_38_1 = callPackage ( { mkDerivation, aeson, @@ -342506,13 +341056,16 @@ self: { text, transformers, unordered-containers, + vcr, vector, yaml, }: mkDerivation { pname = "hpack"; - version = "0.37.0"; - sha256 = "0wrc3h93gxs7mkl6pdshyg1slayivglxzw2f0hkmzyyfbqip6x54"; + version = "0.38.1"; + sha256 = "03qygb51jb4r6sg2bkaz7k80h11wgjr27hgpx6h08xm8axdk2gba"; + revision = "1"; + editedCabalFile = "0dyd6pp2pk62nynp0x2j9kjddfv43p9inplk4iya7hdldyjs77k0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -342594,17 +341147,19 @@ self: { text transformers unordered-containers + vcr vector yaml ]; testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "hpack"; } ) { }; - hpack_0_38_1 = callPackage ( + hpack = callPackage ( { mkDerivation, aeson, @@ -342642,8 +341197,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.38.1"; - sha256 = "03qygb51jb4r6sg2bkaz7k80h11wgjr27hgpx6h08xm8axdk2gba"; + version = "0.38.2"; + sha256 = "1g47rf3pglfkjyk3qfz6wvjp0zh16s4qhayqyyzxg91aqq3fqqd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -342732,7 +341287,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "hpack"; } ) { }; @@ -343440,8 +341994,8 @@ self: { }: mkDerivation { pname = "hpc-codecov"; - version = "0.6.2.0"; - sha256 = "193aqvdqh730wa362l617vs8dwsan5f631477akkz4mmighf6zv6"; + version = "0.6.3.0"; + sha256 = "0ilra8ijfsk4jrh7v36g9qq22s2rs0w4islg88wcd66m95ff1djq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -343570,8 +342124,8 @@ self: { }: mkDerivation { pname = "hpc-lcov"; - version = "1.1.2"; - sha256 = "1bmm0nq1m6xmi5g5zyycrfi8xlxh6ip2mi32z8bp9pyjrn7jy9pv"; + version = "1.2.0"; + sha256 = "1v4cacn1qwhrdr2szsgqfrghjs8jdwqnr5qvqh5qd3qcn3hc7l56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -343608,66 +342162,6 @@ self: { } ) { }; - hpc-lcov_1_2_0 = callPackage ( - { - mkDerivation, - aeson, - base, - containers, - hpc, - optparse-applicative, - path, - path-io, - process, - tasty, - tasty-discover, - tasty-golden, - tasty-hunit, - text, - unordered-containers, - yaml, - }: - mkDerivation { - pname = "hpc-lcov"; - version = "1.2.0"; - sha256 = "1v4cacn1qwhrdr2szsgqfrghjs8jdwqnr5qvqh5qd3qcn3hc7l56"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - containers - hpc - ]; - executableHaskellDepends = [ - aeson - base - containers - hpc - optparse-applicative - path - path-io - process - text - unordered-containers - yaml - ]; - testHaskellDepends = [ - base - containers - hpc - tasty - tasty-discover - tasty-golden - tasty-hunit - ]; - testToolDepends = [ tasty-discover ]; - description = "Convert HPC output into LCOV format"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "hpc-lcov"; - } - ) { }; - hpc-strobe = callPackage ( { mkDerivation, @@ -344242,69 +342736,6 @@ self: { ) { }; hpqtypes-extras = callPackage ( - { - mkDerivation, - base, - base16-bytestring, - bytestring, - containers, - crypton, - deepseq, - exceptions, - extra, - hpqtypes, - log-base, - memory, - mtl, - tasty, - tasty-bench, - tasty-hunit, - text, - text-show, - uuid-types, - }: - mkDerivation { - pname = "hpqtypes-extras"; - version = "1.16.4.4"; - sha256 = "1qi17ssciafb341ihhf1nkk3xb8vh6h3f0ymx3y409w8ckfm3kg5"; - libraryHaskellDepends = [ - base - base16-bytestring - bytestring - containers - crypton - exceptions - extra - hpqtypes - log-base - memory - mtl - text - text-show - ]; - testHaskellDepends = [ - base - containers - exceptions - hpqtypes - log-base - tasty - tasty-hunit - text - uuid-types - ]; - benchmarkHaskellDepends = [ - base - deepseq - tasty-bench - ]; - description = "Extra utilities for hpqtypes library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - hpqtypes-extras_1_18_0_0 = callPackage ( { mkDerivation, base, @@ -345028,25 +343459,6 @@ self: { ) { }; hquantlib-time = callPackage ( - { - mkDerivation, - base, - time, - }: - mkDerivation { - pname = "hquantlib-time"; - version = "0.1.1"; - sha256 = "06ixjf69aadb9lpcaqz4nsaznbzazp9ym02kkkxrg382zya47h68"; - libraryHaskellDepends = [ - base - time - ]; - description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; - license = "LGPL"; - } - ) { }; - - hquantlib-time_0_1_2 = callPackage ( { mkDerivation, base, @@ -345062,7 +343474,6 @@ self: { ]; description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; license = lib.licenses.lgpl3Plus; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -345659,8 +344070,8 @@ self: { }: mkDerivation { pname = "hs-asapo"; - version = "0.9.0"; - sha256 = "0629yz0zpq6zyqxxczmpv246nz4mv2vz1nv46w72cqz4b5mbanmf"; + version = "0.9.1"; + sha256 = "0rmmmxfpx2s69jca5rd7jnxb075qjx6b6s97vnsd1gvgcjwal2li"; setupHaskellDepends = [ base cabal-doctest @@ -346015,7 +344426,9 @@ self: { ]; description = "Conllu validating parser and utils"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "hs-conllu"; + broken = true; } ) { }; @@ -346729,6 +345142,35 @@ self: { } ) { }; + hs-onnxruntime-capi = callPackage ( + { + mkDerivation, + base, + base-compat-constptr, + bytestring, + libonnxruntime, + vector, + }: + mkDerivation { + pname = "hs-onnxruntime-capi"; + version = "0.1.0.0"; + sha256 = "1sij7bpw82xg5djk0p96jlahfmdcp4spwwa1nsman8bn4i9nzkli"; + revision = "4"; + editedCabalFile = "0872p0bcx2bv1zjv6jkhw5nvq1wwn64g73b4f4c9hj0wwz7m4jxn"; + libraryHaskellDepends = [ + base + base-compat-constptr + bytestring + vector + ]; + libraryPkgconfigDepends = [ libonnxruntime ]; + description = "Low-level bindings for ONNX Runtime"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { libonnxruntime = null; }; + hs-openmoji-data = callPackage ( { mkDerivation, @@ -348352,6 +346794,65 @@ self: { } ) { }; + hs-tree-sitter = callPackage ( + { + mkDerivation, + base, + base-compat-constptr, + bytestring, + hs-tree-sitter-capi, + }: + mkDerivation { + pname = "hs-tree-sitter"; + version = "13.0.14.0"; + sha256 = "0mqxln8ci9lp1i8xpn4dp1dix0ksvqkn9fccggrgnxrwgzkydd97"; + revision = "1"; + editedCabalFile = "14ix57r4lvbx9xgvisnvvsxxdwm5fx8crknimpp6vp0pl2p5ncih"; + libraryHaskellDepends = [ + base + base-compat-constptr + bytestring + hs-tree-sitter-capi + ]; + doHaddock = false; + description = "High-level bindings for tree-sitter"; + license = lib.licenses.agpl3Only; + } + ) { }; + + hs-tree-sitter-capi = callPackage ( + { + mkDerivation, + base, + base-compat-constptr, + tasty, + tasty-hunit, + tree-sitter-while, + }: + mkDerivation { + pname = "hs-tree-sitter-capi"; + version = "13.0.14.0"; + sha256 = "0ncw6y1gcqqf4ig3calb0k6rf4rflp1a70x2231lhzbm0jn0r3pm"; + revision = "1"; + editedCabalFile = "096224gn8gi1k1l5yc0hx7hjsw772n7gjgqasnd3jbfrgw50dsfq"; + libraryHaskellDepends = [ + base + base-compat-constptr + ]; + testHaskellDepends = [ + base + base-compat-constptr + tasty + tasty-hunit + tree-sitter-while + ]; + description = "Low-level bindings for tree-sitter"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { tree-sitter-while = null; }; + hs-twitter = callPackage ( { mkDerivation, @@ -349501,60 +348002,6 @@ self: { ) { }; hsc3 = callPackage ( - { - mkDerivation, - array, - base, - binary, - bytestring, - containers, - data-binary-ieee754, - data-ordlist, - directory, - filepath, - hosc, - mtl, - murmur-hash, - network, - process, - random, - safe, - split, - transformers, - vector, - }: - mkDerivation { - pname = "hsc3"; - version = "0.20"; - sha256 = "1pi2zzcz6xrj5w0ql5g7z6qf2vbchixc871if2yqna8wndakhcc8"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array - base - binary - bytestring - containers - data-binary-ieee754 - data-ordlist - directory - filepath - hosc - mtl - murmur-hash - network - process - random - safe - split - transformers - vector - ]; - description = "Haskell SuperCollider"; - license = lib.licenses.gpl3Only; - } - ) { }; - - hsc3_0_21 = callPackage ( { mkDerivation, array, @@ -349605,7 +348052,6 @@ self: { ]; description = "Haskell SuperCollider"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -351474,8 +349920,8 @@ self: { }: mkDerivation { pname = "hsec-core"; - version = "0.1.0.0"; - sha256 = "0yf6vdv1v3r52i92pcjh7jpnxwxlax9vpchy0f2ixs0ddgsk6v83"; + version = "0.2.0.2"; + sha256 = "0aj2mv8b59vqp220b5dm1jx5xac9rhv7axj7dbmmfxgcqks3rvfz"; libraryHaskellDepends = [ base Cabal-syntax @@ -351495,7 +349941,6 @@ self: { ]; description = "Core package representing Haskell advisories"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -351506,14 +349951,14 @@ self: { base, bytestring, directory, + either, extra, - feed, filepath, hsec-core, http-client, lens, optparse-applicative, - process, + tar, tasty, tasty-hunit, temporary, @@ -351521,29 +349966,32 @@ self: { time, transformers, wreq, + zlib, }: mkDerivation { pname = "hsec-sync"; - version = "0.1.0.0"; - sha256 = "0svk3rvsf6svhy2vqr5bpxxgngjmxb9zxwj9ljx4n56yq2gvqdp9"; - revision = "1"; - editedCabalFile = "1xk4f5yh720d16gxark20cbdywg9jrlrhd20x153a74p2gka44rm"; + version = "0.2.0.2"; + sha256 = "0dcyas96pikg3zp671wcizm1n9amr6rxpxwh2pmgj1ivpa9v714j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ + aeson base + bytestring directory + either extra - feed filepath hsec-core http-client lens - process + tar + temporary text time transformers wreq + zlib ]; executableHaskellDepends = [ aeson @@ -351557,7 +350005,6 @@ self: { base directory filepath - process tasty tasty-hunit temporary @@ -351566,9 +350013,7 @@ self: { ]; description = "Synchronize with the Haskell security advisory database"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hsec-sync"; - broken = true; } ) { }; @@ -351577,67 +350022,95 @@ self: { mkDerivation, aeson, aeson-pretty, + atom-conduit, base, bytestring, Cabal-syntax, commonmark, commonmark-pandoc, + conduit, + conduit-extra, containers, cvss, + data-default, directory, extra, - feed, + file-embed, filepath, + hedgehog, hsec-core, lucid, mtl, optparse-applicative, osv, + pandoc, pandoc-types, parsec, pathwalk, + pretty, pretty-simple, + prettyprinter, process, + refined, + resourcet, safe, tasty, tasty-golden, + tasty-hedgehog, tasty-hunit, + template-haskell, text, time, toml-parser, + transformers, + uri-bytestring, validation-selective, + xml-conduit, }: mkDerivation { pname = "hsec-tools"; - version = "0.1.0.0"; - sha256 = "1q48ygbw463jm77cv3sznbncr496rqzqrablj02s1vdwihkv3h86"; + version = "0.2.0.2"; + sha256 = "02vnhw6dlp5iq7pznnljlw6ilbvf4zhz6hn96m4y6y5naxafv1iy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson + atom-conduit base + bytestring Cabal-syntax commonmark commonmark-pandoc + conduit + conduit-extra containers cvss + data-default directory extra - feed + file-embed filepath hsec-core lucid mtl osv + pandoc pandoc-types parsec pathwalk + pretty + prettyprinter process + refined + resourcet safe + template-haskell text time toml-parser + uri-bytestring validation-selective + xml-conduit ]; executableHaskellDepends = [ aeson @@ -351648,21 +350121,28 @@ self: { hsec-core optparse-applicative text + transformers validation-selective ]; testHaskellDepends = [ aeson-pretty base Cabal-syntax + containers cvss directory + hedgehog hsec-core + osv pretty-simple + prettyprinter tasty tasty-golden + tasty-hedgehog tasty-hunit text time + toml-parser ]; description = "Tools for working with the Haskell security advisory database"; license = lib.licenses.bsd3; @@ -351765,7 +350245,6 @@ self: { ]; description = "sendxmpp clone, sending XMPP messages via CLI"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hsendxmpp"; } ) { }; @@ -352070,8 +350549,8 @@ self: { }: mkDerivation { pname = "hsftp"; - version = "1.4.0"; - sha256 = "01fzgrk9w6xy7wxkpg2znw5g2wkqrcz6vj1f0pdffvg0bslfn4g0"; + version = "1.5.0"; + sha256 = "0b29yiqvy92akgq4alva4wkynl2b8b26cb2v86ixgw62af6p8ygr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -352635,6 +351114,54 @@ self: { } ) { }; + hsinstall_2_9 = callPackage ( + { + mkDerivation, + base, + Cabal, + directory, + exceptions, + filepath, + formatting, + heredoc, + optparse-applicative, + prettyprinter, + process, + safe-exceptions, + transformers, + }: + mkDerivation { + pname = "hsinstall"; + version = "2.9"; + sha256 = "0lnby8681spli3qr43mybhcj6l2klfphfzja2gnapqwcm7d894r1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + directory + filepath + ]; + executableHaskellDepends = [ + base + Cabal + directory + exceptions + filepath + formatting + heredoc + optparse-applicative + prettyprinter + process + safe-exceptions + transformers + ]; + description = "Install Haskell software"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsinstall"; + } + ) { }; + hskeleton = callPackage ( { mkDerivation, @@ -352754,14 +351281,13 @@ self: { HUnit, network, network-bsd, - old-locale, time, unix, }: mkDerivation { pname = "hslogger"; - version = "1.3.1.2"; - sha256 = "0fa52jpigkvbmb006rzvairw1syh71wnb0lrfjb46ik3dwigxdh4"; + version = "1.3.2.0"; + sha256 = "0hz6v02p89ihr0130hzya78h54lf6kw3vgf7idnxpqwy8v9a49zb"; libraryHaskellDepends = [ base bytestring @@ -352769,7 +351295,6 @@ self: { deepseq network network-bsd - old-locale time unix ]; @@ -353489,7 +352014,7 @@ self: { } ) { }; - hslua-module-system_1_2_0 = callPackage ( + hslua-module-system_1_2_3 = callPackage ( { mkDerivation, base, @@ -353497,6 +352022,7 @@ self: { directory, exceptions, hslua-core, + hslua-list, hslua-marshalling, hslua-packaging, process, @@ -353509,14 +352035,15 @@ self: { }: mkDerivation { pname = "hslua-module-system"; - version = "1.2.0"; - sha256 = "0wbbz0h33wrhdpxz40gqgijkra19jg0zyy4snmj75qxcq2cc9dw2"; + version = "1.2.3"; + sha256 = "125d50q90l9w35aqgwgbv2bdmj65zlvn7pxlwrg1nr2j4bnfmyjk"; libraryHaskellDepends = [ base bytestring directory exceptions hslua-core + hslua-list hslua-marshalling hslua-packaging process @@ -354630,8 +353157,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.3.9"; - sha256 = "0zdk4d5fsd4fbmw76bwq18y71r7zf0ky116a056f586qn9z7p9gq"; + version = "0.4.0"; + sha256 = "1j1im8y00g23gqhq4jnnq0jm9l44d8bn0zwrvswnyxr70f67hrxg"; libraryHaskellDepends = [ base bytestring @@ -356812,6 +355339,8 @@ self: { ]; description = "Multivariate polynomials and fractions of multivariate polynomials"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -357466,8 +355995,6 @@ self: { ]; description = "RELP (Reliable Event Logging Protocol) server implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -359923,37 +358450,6 @@ self: { ) { }; htree = callPackage ( - { - mkDerivation, - base, - containers, - hspec, - QuickCheck, - quickcheck-instances, - template-haskell, - th-compat, - }: - mkDerivation { - pname = "htree"; - version = "0.1.1.0"; - sha256 = "1m95win8gy5h2343pa2zjij9v092az0fdq3xc3qsfycs6f1w06id"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base - containers - hspec - QuickCheck - quickcheck-instances - template-haskell - th-compat - ]; - description = "a library to build and work with heterogeneous, type level indexed rose trees"; - license = lib.licenses.agpl3Plus; - maintainers = [ lib.maintainers.mangoiv ]; - } - ) { }; - - htree_0_2_0_0 = callPackage ( { mkDerivation, base, @@ -359980,7 +358476,6 @@ self: { ]; description = "a library to build and work with heterogeneous, type level indexed rose trees"; license = lib.licenses.agpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.mangoiv ]; } ) { }; @@ -361697,8 +360192,8 @@ self: { }: mkDerivation { pname = "http-grammar"; - version = "0.1.0.0"; - sha256 = "1x073nw7fagbj16x42n7xgyr5liv69l0g4ig1f4adzdc9p997l27"; + version = "0.1.0.4"; + sha256 = "0b2cjn228w06v4ziv04178hy1a0z4gnbd1c8h2i0wq1mgihzfnan"; libraryHaskellDepends = [ attoparsec base @@ -361706,8 +360201,6 @@ self: { ]; description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -361784,21 +360277,16 @@ self: { network, network-uri, openssl-streams, - snap, snap-core, snap-server, - system-filepath, text, - transformers, unordered-containers, xor, }: mkDerivation { pname = "http-io-streams"; - version = "0.1.7.0"; - sha256 = "14jn78jby18h0jnmpx523nq3wnpr4l65mn746rzmq6z49p513wmg"; - revision = "1"; - editedCabalFile = "0fmpilsyw805v0s6m0cgx4j47f88difadqwmz5xl7akqzbv66ap5"; + version = "0.1.7.2"; + sha256 = "12dykdafss0863401pjkh10cnf7kc33bqabsf34nbwj8hf2w60vx"; libraryHaskellDepends = [ attoparsec base @@ -361818,7 +360306,6 @@ self: { network-uri openssl-streams text - transformers xor ]; testHaskellDepends = [ @@ -361843,12 +360330,9 @@ self: { network network-uri openssl-streams - snap snap-core snap-server - system-filepath text - transformers unordered-containers ]; description = "HTTP and WebSocket client based on io-streams"; @@ -362542,8 +361026,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.6.1.0"; - sha256 = "0ijdcdd7025i4752mcqs6pd2wklv0df407v1yndl67k15phksp6c"; + version = "0.6.2.0"; + sha256 = "144jp4yz4i5an04yspzw0pnsxcqrfbhb5jq3bsfb8ji4zbhjzy8m"; libraryHaskellDepends = [ base blaze-builder @@ -363340,8 +361824,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.4.8"; - sha256 = "1sy2q6zyc68fjk03fc9pnd6sshjwr6djbyw45gningpfcrw41qv6"; + version = "0.4.9"; + sha256 = "180l7fqddgrxjvqikrg1q2s5p3s2h4a4fsf23l3bn9fvirnswf4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -363400,8 +361884,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.1.0"; - sha256 = "1ygm1a6ph24a84vsdqb7l2bn1ylzd3dl0bc6blvpqq6yhhm34cpa"; + version = "0.1.1"; + sha256 = "0bzi8w3nz6yw5ab30674p062nvps55q9f0vpxdgqgnb22jim8jyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -364080,6 +362564,56 @@ self: { } ) { }; + huihua = callPackage ( + { + mkDerivation, + adjunctions, + base, + bytestring, + containers, + deepseq, + distributive, + doctest-parallel, + flatparse, + harpie, + markup-parse, + prettyprinter, + random, + string-interpolate, + text, + these, + vector, + }: + mkDerivation { + pname = "huihua"; + version = "0.1.0.1"; + sha256 = "0jmwqd2hnd2cpv2vhykjyyba6fz15734m1fxxqz32mqmhh6zj7zw"; + libraryHaskellDepends = [ + adjunctions + base + bytestring + containers + deepseq + distributive + flatparse + harpie + markup-parse + prettyprinter + random + string-interpolate + text + these + vector + ]; + testHaskellDepends = [ + base + doctest-parallel + ]; + description = "uiua port"; + license = lib.licenses.bsd3; + } + ) { }; + hulk = callPackage ( { mkDerivation, @@ -365678,8 +364212,8 @@ self: { pname = "hw-balancedparens"; version = "0.4.1.3"; sha256 = "0cp8nzm99ap0j8qzsn15rxcvxa3k6bywqx0y5ccflpvqysd88wfc"; - revision = "1"; - editedCabalFile = "1q8kckqqnw434vaq0mx0q3ayhrzc30v8a7m758747yis8vqxrvjb"; + revision = "3"; + editedCabalFile = "1qkci3bwjd3c1kn3l9mgxvzqg0q89xmw6x7rlp1kh1qpv9vwg9d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -365804,6 +364338,7 @@ self: { ]; description = "Bit manipulation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -366480,6 +365015,8 @@ self: { testToolDepends = [ doctest-discover ]; description = "Extra hedgehog functionality"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -366562,6 +365099,7 @@ self: { ]; description = "Additional facilities for Integers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -366633,6 +365171,7 @@ self: { doHaddock = false; description = "Library for manipulating IP addresses and CIDR blocks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hw-ip"; } ) { }; @@ -366680,8 +365219,8 @@ self: { }: mkDerivation { pname = "hw-json"; - version = "1.3.3.0"; - sha256 = "1kqwz2wh0bqq91amqwljilb6grmq943z874b1avq6z1mxvxmaf9a"; + version = "1.3.3.1"; + sha256 = "06arzyxh3xrn3avd1s7fndqgg1pd99yf6syr5ha0icmwhsy9byjz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -366913,10 +365452,8 @@ self: { }: mkDerivation { pname = "hw-json-simd"; - version = "0.1.1.2"; - sha256 = "03g2gwmkp6v7b0vf4x8bh4qk91ghr0av5x3c9paj3rp3igycccd6"; - revision = "1"; - editedCabalFile = "1s06mj022lggx28hqdsd181xhbbxadqmbzrafxh4nf5q212dwkzb"; + version = "0.1.1.3"; + sha256 = "1rcmb4zpfgmxh5x04vb68lj1prgiwl5wpa4mn6w7kp7sccd4f9mi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -367210,6 +365747,7 @@ self: { ]; description = "Avro support for Kafka infrastructure"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -367893,8 +366431,8 @@ self: { pname = "hw-rankselect"; version = "0.13.4.1"; sha256 = "03nf8jwr1qpbfa20y3zlb3z6cxy8ylpdbsy0fvxdjs8q35f7bmx5"; - revision = "3"; - editedCabalFile = "1fwgjhy3wm1bbyqcq62vcf9nvha17bwzb34g2rd6z1v5qr8dm1gi"; + revision = "5"; + editedCabalFile = "0g15p5dlnfk2ggqsww8gvp877j3vz5x3vc3xvfgwqp3640sgax6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -368068,8 +366606,8 @@ self: { pname = "hw-simd"; version = "0.1.2.2"; sha256 = "0ipcrv19xwmq6znbmwmzrjahmymmcmpbs7hpx0183hrwbx2hyhqx"; - revision = "1"; - editedCabalFile = "0c0wv09q98inana4n70qnv6226506fdw4ghbw1pxqglj0ccallib"; + revision = "2"; + editedCabalFile = "05sfkgcfl94wighx2nfrp6rsvkvbch7wn701i669r88b900w56yv"; libraryHaskellDepends = [ base bits-extra @@ -368289,6 +366827,7 @@ self: { ]; description = "Primitive functions and data types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -368326,6 +366865,8 @@ self: { ]; description = "String parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -368580,6 +367121,8 @@ self: { pname = "hw-xml"; version = "0.5.1.2"; sha256 = "0zv5dwi4vbacjz3rw62g320p0iy0xya3z2xd4mf238gd9v5fnhd5"; + revision = "1"; + editedCabalFile = "1jrj3lpy76aly7pm4j7ys35s75a8rgf4mqlifasx61k1rvsiiv0s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -369972,8 +368515,8 @@ self: { }: mkDerivation { pname = "hydra"; - version = "0.8.0"; - sha256 = "1zbr11xabk4va286084wxyx49fmc3xc3wqfrx4h80mwqx9w5gr8b"; + version = "0.12.0"; + sha256 = "05pshwws8c7abbnmrfx9l646b58f567g6xs91cxvzxqs16glp87c"; libraryHaskellDepends = [ aeson aeson-pretty @@ -369983,7 +368526,6 @@ self: { directory filepath HsYAML - mtl scientific split text @@ -370009,10 +368551,8 @@ self: { vector ]; testToolDepends = [ hspec-discover ]; - description = "Type-aware transformations for data and programs"; + description = "Graph programming language"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -370656,8 +369196,8 @@ self: { pname = "hyper"; version = "0.2.1.1"; sha256 = "14p7r57g75ny8l9h4ilbm6mhdsfiysfs3rd56300dl0jkpgrh8r2"; - revision = "4"; - editedCabalFile = "1fyddc72z9vd37q5xbgfpqp3dfvqkbz1kbgwvhxhk2w5maf06ac3"; + revision = "5"; + editedCabalFile = "0dzm6qrqrrmrsmn5y1nhncy2w7kmaa4ilkf1mpi32hs9mywnl5v9"; libraryHaskellDepends = [ base blaze-html @@ -370684,8 +369224,8 @@ self: { pname = "hyper-extra"; version = "0.2.0.1"; sha256 = "13ipxwhxrndl505zzxcq7gz874l0r2g0ma1yhq14bihvlwh3qr8d"; - revision = "1"; - editedCabalFile = "0vmyidjaskca75582h3lp2wq3x0h2ii03i5fy590c9j6mq8phjdx"; + revision = "2"; + editedCabalFile = "1c3lp2wg8axcv20zyz58qcs79vcy8hzsr3gdd9d671yk9m8c7b6n"; libraryHaskellDepends = [ base diagrams-lib @@ -370720,6 +369260,8 @@ self: { pname = "hyper-haskell-server"; version = "0.2.3.1"; sha256 = "0cz1dybzgk5q051r3inv72x154q3qmf5r0hci2cxrb89ncdcszsv"; + revision = "1"; + editedCabalFile = "1vk8q06z7q20hq3cs3nnw0ap3gsa983clvykb4zlxl4fspq7rviv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -370914,6 +369456,8 @@ self: { ]; description = "Hypergeometric function of a matrix argument"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -371008,61 +369552,6 @@ self: { ) { }; hyperloglog = callPackage ( - { - mkDerivation, - approximate, - base, - binary, - bits, - bytes, - bytestring, - cereal, - cereal-vector, - comonad, - cpu, - deepseq, - distributive, - hashable, - lens, - reflection, - semigroupoids, - semigroups, - tagged, - vector, - }: - mkDerivation { - pname = "hyperloglog"; - version = "0.4.6"; - sha256 = "0zwg4dhgasa9sx7pbjjjb9kz2bnhb3r2daij2b572cszv65l91nv"; - revision = "5"; - editedCabalFile = "1acq3rhj3x019ckvvhpl4vg8islr53il9ngxd5p5k1is90hcyx97"; - libraryHaskellDepends = [ - approximate - base - binary - bits - bytes - bytestring - cereal - cereal-vector - comonad - cpu - deepseq - distributive - hashable - lens - reflection - semigroupoids - semigroups - tagged - vector - ]; - description = "An approximate streaming (constant space) unique object counter"; - license = lib.licenses.bsd3; - } - ) { }; - - hyperloglog_0_5 = callPackage ( { mkDerivation, approximate, @@ -371116,7 +369605,6 @@ self: { ]; description = "An approximate streaming (constant space) unique object counter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -371932,8 +370420,8 @@ self: { pname = "iCalendar"; version = "0.4.1.1"; sha256 = "0bdsfl108c740zn105sw765dlfw8hvpnwk7w3psy1iyn8hasl1rh"; - revision = "1"; - editedCabalFile = "09b4kqm03v6cxiq9yf0xp0sbc232gra5lg56p1rllyl2rdfq31n1"; + revision = "2"; + editedCabalFile = "1d2wwdzhfvv535v951z62a3qsd7pyk68srmb80kn46qnn33k0cvi"; libraryHaskellDepends = [ base base64-bytestring @@ -373118,6 +371606,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Deriving Applicative for sum types.. Idiomatically."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -373490,6 +371980,8 @@ self: { pname = "if-instance"; version = "0.6.0.0"; sha256 = "1pjl4dg510dp6p23hjn1rii7pf444jqn9jy6wvy6x9m8b25j2nzr"; + revision = "1"; + editedCabalFile = "0i96a850a5kb3azn40j38wi20vkcbh804b29swrz8mi60basr9rb"; libraryHaskellDepends = [ base ghc @@ -373854,128 +372346,6 @@ self: { ) { }; ihaskell = callPackage ( - { - mkDerivation, - aeson, - base, - base64-bytestring, - binary, - bytestring, - cmdargs, - containers, - directory, - exceptions, - filepath, - ghc, - ghc-boot, - ghc-parser, - ghc-paths, - ghc-syntax-highlighter, - haskeline, - hlint, - hspec, - hspec-contrib, - http-client, - http-client-tls, - HUnit, - ipython-kernel, - parsec, - process, - random, - raw-strings-qq, - setenv, - shelly, - split, - stm, - strict, - text, - time, - transformers, - unix, - unordered-containers, - utf8-string, - vector, - }: - mkDerivation { - pname = "ihaskell"; - version = "0.11.0.0"; - sha256 = "1mjjsmjvapkmj69qzp9sskgxi04fymacvy0la7lr1rcrl9z5x5hd"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson - base - base64-bytestring - binary - bytestring - cmdargs - containers - directory - exceptions - filepath - ghc - ghc-boot - ghc-parser - ghc-paths - ghc-syntax-highlighter - haskeline - hlint - http-client - http-client-tls - ipython-kernel - parsec - process - random - shelly - split - stm - strict - text - time - transformers - unix - unordered-containers - utf8-string - vector - ]; - executableHaskellDepends = [ - aeson - base - bytestring - containers - directory - ghc - ipython-kernel - process - strict - text - transformers - unix - unordered-containers - ]; - testHaskellDepends = [ - aeson - base - directory - ghc - ghc-paths - hspec - hspec-contrib - HUnit - raw-strings-qq - setenv - shelly - text - transformers - ]; - description = "A Haskell backend kernel for the Jupyter project"; - license = lib.licenses.mit; - mainProgram = "ihaskell"; - } - ) { }; - - ihaskell_0_12_0_0 = callPackage ( { mkDerivation, aeson, @@ -374093,7 +372463,6 @@ self: { ]; description = "A Haskell backend kernel for the Jupyter project"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "ihaskell"; } ) { }; @@ -374388,7 +372757,6 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -374580,6 +372948,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "IHaskell extension for making the use of Symtegration more seamless"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -374628,6 +372997,194 @@ self: { } ) { }; + ihp = callPackage ( + { + mkDerivation, + aeson, + async, + attoparsec, + base, + basic-prelude, + binary, + blaze-html, + blaze-markup, + bytestring, + case-insensitive, + cereal, + cereal-text, + classy-prelude, + clientsession, + conduit-extra, + containers, + cookie, + countable-inflections, + data-default, + deepseq, + directory, + fast-logger, + ghc-prim, + haskell-src-exts, + haskell-src-meta, + hspec, + http-client, + http-client-tls, + http-media, + http-types, + ihp-hsx, + ihp-postgresql-simple-extra, + inflections, + interpolate, + ip, + lens, + mime-mail, + mime-mail-ses, + mime-types, + minio-hs, + mono-traversable, + mtl, + neat-interpolation, + network, + network-uri, + parser-combinators, + postgresql-simple, + process, + pwstore-fast, + random, + random-strings, + regex-tdfa, + resource-pool, + resourcet, + safe-exceptions, + scientific, + smtp-mail, + split, + string-conversions, + template-haskell, + temporary, + text, + time, + transformers, + typerep-map, + unagi-chan, + unix, + unliftio, + unordered-containers, + uri-encode, + uuid, + vault, + vector, + wai, + wai-app-static, + wai-cors, + wai-extra, + wai-session, + wai-session-clientsession, + wai-util, + wai-websockets, + warp, + warp-systemd, + websockets, + with-utf8, + wreq, + }: + mkDerivation { + pname = "ihp"; + version = "1.4.0"; + sha256 = "0k962vpcarq07a0wb5rlpah15q629xi39h2x8x0vb5i8nv7xg0c3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + async + attoparsec + base + basic-prelude + binary + blaze-html + blaze-markup + bytestring + case-insensitive + cereal + cereal-text + classy-prelude + clientsession + conduit-extra + containers + cookie + countable-inflections + data-default + deepseq + directory + fast-logger + ghc-prim + haskell-src-exts + haskell-src-meta + hspec + http-client + http-client-tls + http-media + http-types + ihp-hsx + ihp-postgresql-simple-extra + inflections + interpolate + ip + lens + mime-mail + mime-mail-ses + mime-types + minio-hs + mono-traversable + mtl + neat-interpolation + network + network-uri + parser-combinators + postgresql-simple + process + pwstore-fast + random + random-strings + regex-tdfa + resource-pool + resourcet + safe-exceptions + scientific + smtp-mail + split + string-conversions + template-haskell + temporary + text + time + transformers + typerep-map + unagi-chan + unix + unliftio + unordered-containers + uri-encode + uuid + vault + vector + wai + wai-app-static + wai-cors + wai-extra + wai-session + wai-session-clientsession + wai-util + wai-websockets + warp + warp-systemd + websockets + with-utf8 + wreq + ]; + description = "Haskell Web Framework"; + license = lib.licenses.mit; + } + ) { }; + ihp-hsx = callPackage ( { mkDerivation, @@ -374638,16 +373195,19 @@ self: { containers, ghc, hspec, + lucid2, megaparsec, + mtl, string-conversions, template-haskell, text, + transformers, unordered-containers, }: mkDerivation { pname = "ihp-hsx"; - version = "1.4.1"; - sha256 = "00pq72lzdnb8dbfpaacyw2jqwz5f54cdvrbyrapd4487m2jhjc9q"; + version = "1.5.0"; + sha256 = "0r4139vkhhy71kwhiiycg5ws3w1xs46dig5iihpnx0vyjkpszmar"; libraryHaskellDepends = [ base blaze-html @@ -374655,10 +373215,12 @@ self: { bytestring containers ghc + lucid2 megaparsec string-conversions template-haskell text + transformers unordered-containers ]; testHaskellDepends = [ @@ -374667,16 +373229,227 @@ self: { bytestring containers hspec + lucid2 megaparsec + mtl + string-conversions template-haskell text + unordered-containers ]; + doHaddock = false; description = "JSX-like but for Haskell"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mpscholten ]; } ) { }; + ihp-ide = callPackage ( + { + mkDerivation, + aeson, + async, + attoparsec, + auto-update, + base, + base16-bytestring, + base64-bytestring, + basic-prelude, + blaze-html, + blaze-markup, + bytestring, + classy-prelude, + clientsession, + containers, + countable-inflections, + cryptohash, + data-default, + directory, + fsnotify, + http-types, + ihp, + ihp-hsx, + inflections, + interpolate, + megaparsec, + mono-traversable, + neat-interpolation, + network, + network-uri, + parser-combinators, + postgresql-simple, + process, + safe-exceptions, + split, + string-conversions, + text, + time, + transformers, + unagi-chan, + unix, + unliftio, + uri-encode, + uuid, + vault, + wai, + wai-app-static, + wai-extra, + wai-session, + wai-session-clientsession, + wai-util, + wai-websockets, + warp, + websockets, + with-utf8, + wreq, + }: + mkDerivation { + pname = "ihp-ide"; + version = "1.4.0"; + sha256 = "0mglqbbmk7y94avmb2z4mqhrbcwrhabzicyjd0cgd49v9mz32p5n"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + async + attoparsec + auto-update + base + base16-bytestring + basic-prelude + blaze-html + blaze-markup + bytestring + classy-prelude + clientsession + containers + countable-inflections + cryptohash + data-default + directory + fsnotify + http-types + ihp + ihp-hsx + inflections + interpolate + megaparsec + mono-traversable + neat-interpolation + network + network-uri + parser-combinators + postgresql-simple + process + safe-exceptions + split + string-conversions + text + time + transformers + unagi-chan + unix + unliftio + uri-encode + uuid + vault + wai + wai-app-static + wai-extra + wai-session + wai-session-clientsession + wai-util + wai-websockets + warp + websockets + with-utf8 + wreq + ]; + executableHaskellDepends = [ + aeson + async + attoparsec + auto-update + base + base16-bytestring + base64-bytestring + basic-prelude + blaze-html + blaze-markup + bytestring + classy-prelude + clientsession + containers + countable-inflections + cryptohash + data-default + directory + fsnotify + http-types + ihp + ihp-hsx + inflections + interpolate + megaparsec + mono-traversable + neat-interpolation + network + network-uri + parser-combinators + postgresql-simple + process + safe-exceptions + split + string-conversions + text + time + transformers + unagi-chan + unix + unliftio + uri-encode + uuid + vault + wai + wai-app-static + wai-extra + wai-session + wai-session-clientsession + wai-util + wai-websockets + warp + websockets + with-utf8 + wreq + ]; + description = "Dev tools for IHP"; + license = lib.licenses.mit; + } + ) { }; + + ihp-migrate = callPackage ( + { + mkDerivation, + ihp, + with-utf8, + }: + mkDerivation { + pname = "ihp-migrate"; + version = "1.4.0"; + sha256 = "1l4vapnqnnayfdrbrspsvjjyi2wd7jy3a081dpzyi4pwl4jdwgx8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ihp + with-utf8 + ]; + description = "Provides the IHP migrate binary"; + license = lib.licenses.mit; + mainProgram = "migrate"; + } + ) { }; + ihp-openai = callPackage ( { mkDerivation, @@ -374695,6 +373468,8 @@ self: { pname = "ihp-openai"; version = "1.3.0"; sha256 = "1736f8w1696d5db9shdhqxq1gdng1gh1mijn2rnynrh8lsnndwa4"; + revision = "1"; + editedCabalFile = "03g2mz1vfxcfv02675nh33643k4baw2chx1vc9ij6p76868l1nk7"; libraryHaskellDepends = [ aeson base @@ -374714,6 +373489,60 @@ self: { ]; description = "Call GPT4 from your Haskell apps"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + ihp-postgresql-simple-extra = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + base, + basic-prelude, + bytestring, + hspec, + hspec-discover, + ip, + postgresql-simple, + text, + time, + time-compat, + }: + mkDerivation { + pname = "ihp-postgresql-simple-extra"; + version = "1.3.0"; + sha256 = "19yann37mq9ifzqfab0xkfpbns40clvdg4qc8gmk7980z5q7p39s"; + libraryHaskellDepends = [ + aeson + attoparsec + base + basic-prelude + bytestring + ip + postgresql-simple + text + time + time-compat + ]; + testHaskellDepends = [ + aeson + attoparsec + base + basic-prelude + bytestring + hspec + hspec-discover + ip + postgresql-simple + text + time + time-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Extra data types for postgresql-simple"; + license = lib.licenses.mit; } ) { }; @@ -375737,8 +374566,8 @@ self: { }: mkDerivation { pname = "immutaball-core"; - version = "0.1.0.4.1"; - sha256 = "136vbcyywfyl2kafpygz1iwv5yahlzxhj9y07wsz3dch90x0lail"; + version = "0.1.0.5.1"; + sha256 = "12i9vxhxsmka4rlmkj4ip930h4clcbn031il39x6clj2dflj5807"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -375833,7 +374662,7 @@ self: { unbounded-delays wires ]; - description = "Immutaball platformer game"; + description = "Immutaball platformer game (prototype version)"; license = lib.licenses.bsd0; hydraPlatforms = lib.platforms.none; } @@ -376320,6 +375149,8 @@ self: { ]; description = "Helps maintain consistency of imports"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -379131,7 +377962,9 @@ self: { ]; description = "A minimalistic template engine"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "inject"; + broken = true; } ) { }; @@ -379604,7 +378437,6 @@ self: { ieee754, inline-c, mtl, - pretty, primitive, process, quickcheck-assertions, @@ -379614,25 +378446,20 @@ self: { silently, singletons, singletons-th, - strict, tasty, tasty-expected-failure, - tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell, temporary, text, - th-lift, - th-orphans, - transformers, unix, vector, }: mkDerivation { pname = "inline-r"; - version = "1.0.1"; - sha256 = "0wndjyp5y08f8m01rbcxs1dn721dp2wfcfa19k1i443r0f1wc3mf"; + version = "1.0.2"; + sha256 = "01frm1ibdpaxdpi0rik469xjcyj9nnvxjjkmf7bjfgss4slz06fd"; libraryHaskellDepends = [ aeson base @@ -379644,7 +378471,6 @@ self: { heredoc inline-c mtl - pretty primitive process reflection @@ -379654,9 +378480,6 @@ self: { template-haskell temporary text - th-lift - th-orphans - transformers unix vector ]; @@ -379673,10 +378496,8 @@ self: { quickcheck-assertions silently singletons - strict tasty tasty-expected-failure - tasty-golden tasty-hunit tasty-quickcheck template-haskell @@ -379690,15 +378511,11 @@ self: { criterion filepath primitive - process singletons template-haskell - vector ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) R; }; @@ -379919,36 +378736,6 @@ self: { ) { }; inspection-testing = callPackage ( - { - mkDerivation, - base, - containers, - ghc, - mtl, - template-haskell, - transformers, - }: - mkDerivation { - pname = "inspection-testing"; - version = "0.5.0.3"; - sha256 = "1kh6lrcdyfnj0c8fqrllb21hfmnlsrllw6jkkg4hya0f9lqf4mgi"; - revision = "3"; - editedCabalFile = "1b66i5h8vbj3d3dn99wy6sffppfz8iywpwwdivxnxvn645crywa8"; - libraryHaskellDepends = [ - base - containers - ghc - mtl - template-haskell - transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = lib.licenses.mit; - } - ) { }; - - inspection-testing_0_6_2 = callPackage ( { mkDerivation, base, @@ -379973,7 +378760,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -380661,6 +379447,8 @@ self: { ]; description = "Checked conversions between integral types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -380968,7 +379756,6 @@ self: { { mkDerivation, base, - doctest, ghc-bignum, smallcheck, tasty, @@ -380978,17 +379765,14 @@ self: { }: mkDerivation { pname = "integer-roots"; - version = "1.0.2.0"; - sha256 = "15sn3jgm8axm8f9z02aj3xdf318qwwc5qfc8b4r0n7hfr1jgrqs5"; - revision = "1"; - editedCabalFile = "1ff3w9ygyw5shshknyrcl4j7g3gbaz3dyfm8a6gwndrkg1nb7a37"; + version = "1.0.3.0"; + sha256 = "0l6pygfrlyvrbxshz6s1zd6w3q2hl1dc18y08mg0a334ky87za9k"; libraryHaskellDepends = [ base ghc-bignum ]; testHaskellDepends = [ base - doctest smallcheck tasty tasty-hunit @@ -382415,30 +381199,30 @@ self: { binary, bytestring, containers, - cryptonite, + crypton, directory, exceptions, + file-embed, filepath, - hscurses, memory, mtl, - ncurses, network-simple, random, safe, - SDL, - SDL-gfx, - SDL-mixer, - SDL-ttf, + sdl2, + sdl2-gfx, + sdl2-mixer, + sdl2-ttf, stm, + text, time, transformers, vector, }: mkDerivation { pname = "intricacy"; - version = "0.8.2.1"; - sha256 = "0aqjz6p83f79s1xwlaq6pn8581zzd669614im3j1jbn48h18bw1d"; + version = "0.9.1.0"; + sha256 = "0fw66h6k7nf8929p4kqq2wc25b5vg2hq2xhibs2bpas9maj1jijx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -382448,34 +381232,34 @@ self: { binary bytestring containers - cryptonite + crypton directory exceptions + file-embed filepath - hscurses memory mtl network-simple random safe - SDL - SDL-gfx - SDL-mixer - SDL-ttf + sdl2 + sdl2-gfx + sdl2-mixer + sdl2-ttf stm + text time transformers vector ]; - executablePkgconfigDepends = [ ncurses ]; description = "A game of competitive puzzle-design"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; mainProgram = "intricacy"; broken = true; } - ) { inherit (pkgs) ncurses; }; + ) { }; intrinsic-superclasses = callPackage ( { @@ -382919,6 +381703,8 @@ self: { ]; description = "Automatically generate a function’s inverse"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -383174,6 +381960,7 @@ self: { base, bytestring, deepseq, + ghc-internal, nothunks, primitive, QuickCheck, @@ -383192,6 +381979,7 @@ self: { base bytestring deepseq + ghc-internal nothunks primitive QuickCheck @@ -383913,8 +382701,8 @@ self: { }: mkDerivation { pname = "ip2location"; - version = "8.5.1"; - sha256 = "0x5l2rv6wq5a08f7s97cyrqfl7zsrqlsgv105s02rm8r3ifabaca"; + version = "8.6.0"; + sha256 = "0my5rnrbnrr9g8rndwd8491kwf5kn5y9y0f82lqwjzv719l66wd7"; libraryHaskellDepends = [ aeson base @@ -383948,8 +382736,8 @@ self: { }: mkDerivation { pname = "ip2location-io"; - version = "1.1.0"; - sha256 = "1hzikf2ivaxmhw8z1zlcs108vww88nfk4iv4hx85v205gdxwgpwz"; + version = "1.3.0"; + sha256 = "1425ca51il1cairnv8qabxb1m242jndsi0m2m1lpvyk5jwj3k2cv"; libraryHaskellDepends = [ aeson base @@ -384398,6 +383186,7 @@ self: { ]; description = "Tiny helper for pretty-printing values in ghci console"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -385278,8 +384067,6 @@ self: { doHaddock = false; description = "RFC-compliant universal resource identifier library (URL, URI, IRI)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -385334,7 +384121,6 @@ self: { ]; description = "Orphan instances for iri"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -389162,8 +387948,8 @@ self: { }: mkDerivation { pname = "javelin-frames"; - version = "0.1.0.1"; - sha256 = "1gw9db2jqwbnkyyxpd4wj238n34c6vd7psr909wi918d79mmlc2g"; + version = "0.1.0.2"; + sha256 = "0g4vw1qb5m8ypyjr72hh0f1dmba0r43ggkvx4zpwcv7ij3qd25bl"; libraryHaskellDepends = [ base containers @@ -390957,6 +389743,82 @@ self: { } ) { }; + jose_0_12 = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + bytestring, + concise, + containers, + crypton, + crypton-x509, + hedgehog, + hspec, + lens, + memory, + monad-time, + mtl, + network-uri, + pem, + tasty, + tasty-hedgehog, + tasty-hspec, + template-haskell, + text, + time, + }: + mkDerivation { + pname = "jose"; + version = "0.12"; + sha256 = "1wsm2r6lvhgw10blgj21v4nf2293jkjhis9yl7a6r38sdarqzc59"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + concise + containers + crypton + crypton-x509 + lens + memory + monad-time + mtl + network-uri + template-haskell + text + time + ]; + testHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + concise + containers + crypton + crypton-x509 + hedgehog + hspec + lens + mtl + network-uri + pem + tasty + tasty-hedgehog + tasty-hspec + time + ]; + description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + jose-jwt = callPackage ( { mkDerivation, @@ -391313,28 +390175,6 @@ self: { ) { }; js-jquery = callPackage ( - { - mkDerivation, - base, - HTTP, - }: - mkDerivation { - pname = "js-jquery"; - version = "3.3.1"; - sha256 = "16q68jzbs7kp07dnq8cprdcc8fd41rim38039vg0w4x11lgniq70"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base - HTTP - ]; - doCheck = false; - description = "Obtain minified jQuery code"; - license = lib.licenses.mit; - } - ) { }; - - js-jquery_3_7_1 = callPackage ( { mkDerivation, base, @@ -391353,7 +390193,6 @@ self: { doCheck = false; description = "Obtain minified jQuery code"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -391596,8 +390435,8 @@ self: { }: mkDerivation { pname = "jsaddle-wasm"; - version = "0.1.2.0"; - sha256 = "1anr6gg5900mcywwkx8s5j4wpq7hs0zgxc8b2mxf9nlagjjparfz"; + version = "0.1.2.1"; + sha256 = "1a87wi5drdvjcs621wdhmbpgqmnf6s0sd6rcik0hkmyvbhlxv37v"; libraryHaskellDepends = [ base bytestring @@ -391653,7 +390492,7 @@ self: { description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; - maintainers = [ lib.maintainers.alexfmpe ]; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -392857,7 +391696,6 @@ self: { json-query = callPackage ( { mkDerivation, - array-chunks, base, bytebuild, byteslice, @@ -392879,12 +391717,9 @@ self: { }: mkDerivation { pname = "json-query"; - version = "0.2.3.1"; - sha256 = "06j1004is5y5fji89ns9h93qayqmgmjlv9aqlq66xxvp3ijvqzmn"; - revision = "1"; - editedCabalFile = "16pkhyxyr1pmk8g22kydqakv0a2nv7lgx3b6gvvr58xwh3alrzvp"; + version = "0.3.0.0"; + sha256 = "1w1nzl4p4q3qs2b53b6kb8mp4jdc22q02q097bi97a0x0ab4avrq"; libraryHaskellDepends = [ - array-chunks base bytebuild bytestring @@ -392894,13 +391729,12 @@ self: { primitive-unlifted profunctors scientific-notation + text text-short transformers ]; testHaskellDepends = [ - array-chunks base - bytebuild byteslice bytestring hspec @@ -392912,7 +391746,6 @@ self: { tasty-hspec tasty-hunit text - text-short ]; description = "Kitchen sink for querying JSON"; license = lib.licenses.bsd3; @@ -393352,82 +392185,6 @@ self: { ) { }; json-spec-elm-servant = callPackage ( - { - mkDerivation, - aeson, - base, - binary, - bound, - bytestring, - containers, - cookie, - directory, - elm-syntax, - filepath, - hspec, - http-types, - json-spec, - json-spec-elm, - mtl, - prettyprinter, - process, - servant, - text, - time, - unordered-containers, - uuid, - }: - mkDerivation { - pname = "json-spec-elm-servant"; - version = "0.4.3.0"; - sha256 = "05vvm8ivpnp4f3sx7p1sxp2ywqlnii3mjalcwfv6fimsyjlk638w"; - libraryHaskellDepends = [ - base - bound - containers - directory - elm-syntax - filepath - http-types - json-spec - json-spec-elm - mtl - prettyprinter - process - servant - text - unordered-containers - ]; - testHaskellDepends = [ - aeson - base - binary - bound - bytestring - containers - cookie - directory - elm-syntax - filepath - hspec - http-types - json-spec - json-spec-elm - mtl - prettyprinter - process - servant - text - time - unordered-containers - uuid - ]; - description = "Generated elm code for servant APIs"; - license = lib.licenses.mit; - } - ) { }; - - json-spec-elm-servant_0_4_4_1 = callPackage ( { mkDerivation, aeson, @@ -393500,7 +392257,6 @@ self: { ]; description = "Generated elm code for servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -393519,8 +392275,8 @@ self: { }: mkDerivation { pname = "json-spec-openapi"; - version = "1.0.1.1"; - sha256 = "0vk9m76ga1706b9r4ggpfk7f11jpv22mhibqxd7vqfbi3iffm2ys"; + version = "1.0.1.3"; + sha256 = "04l5fwj5dr9rhb0b2qv2750gzc4gqvkh5dvf8vx5gh67i9skc384"; libraryHaskellDepends = [ aeson base @@ -393653,13 +392409,12 @@ self: { text, text-short, transformers, - word-compat, zigzag, }: mkDerivation { pname = "json-syntax"; - version = "0.2.7.2"; - sha256 = "0niyi6vzrl9q4xlh0d5ygdm81zvbgglkmfq5p2a44y6avzqs1sq7"; + version = "0.3.0.2"; + sha256 = "0h9adxxacg5l5ggq97syy33cnnvq3nzma6xxcgff31p2h08i098w"; libraryHaskellDepends = [ array-builder array-chunks @@ -393676,7 +392431,6 @@ self: { text text-short transformers - word-compat zigzag ]; testHaskellDepends = [ @@ -397266,8 +396020,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.8.2"; - sha256 = "12g0i1ndzzkgf0qgkxx525d742mkfnsdwb9rhi6z8jn5hc38sps4"; + version = "0.8.8.4"; + sha256 = "1n6bcr08b7vmzq1b9y0svjqx7hdpffn931yp1ka2ng4ibpcchba4"; libraryHaskellDepends = [ aeson async @@ -397458,6 +396212,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Katip integration for Effectful"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -400041,8 +398797,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "2.1.9"; - sha256 = "06kn3xrzpqnlynzq12b511r0dqr8dinvbq8fliqvjrn5cyyl9sk5"; + version = "2.1.10"; + sha256 = "1ml0c6bhdivmp2r4n3bmridwls5ik7if28235866f5k17qr4b3c9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -400125,6 +398881,250 @@ self: { } ) { }; + keter_2_2_0 = callPackage ( + { + mkDerivation, + aeson, + array, + async, + attoparsec, + base, + blaze-builder, + bytestring, + case-insensitive, + conduit, + conduit-extra, + containers, + directory, + fast-logger, + filepath, + fsnotify, + http-client, + http-conduit, + http-reverse-proxy, + http-types, + HUnit, + indexed-traversable, + lens, + lifted-base, + monad-logger, + mtl, + network, + optparse-applicative, + process, + random, + regex-tdfa, + stm, + tar, + tasty, + tasty-hunit, + template-haskell, + text, + time, + tls, + tls-session-manager, + transformers, + unix, + unix-compat, + unliftio-core, + unordered-containers, + vector, + wai, + wai-app-static, + wai-extra, + warp, + warp-tls, + wreq, + yaml, + zlib, + }: + mkDerivation { + pname = "keter"; + version = "2.2.0"; + sha256 = "0wxq5imn77si6aljhfqka782zwpvqapkaw1qyp2yhq05vy1v2hqq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + array + async + attoparsec + base + blaze-builder + bytestring + case-insensitive + conduit + conduit-extra + containers + directory + fast-logger + filepath + fsnotify + http-client + http-conduit + http-reverse-proxy + http-types + indexed-traversable + lifted-base + monad-logger + mtl + network + optparse-applicative + process + random + regex-tdfa + stm + tar + template-haskell + text + time + tls + tls-session-manager + transformers + unix + unix-compat + unliftio-core + unordered-containers + vector + wai + wai-app-static + wai-extra + warp + warp-tls + yaml + zlib + ]; + executableHaskellDepends = [ + base + filepath + ]; + testHaskellDepends = [ + base + bytestring + conduit + http-client + http-conduit + http-types + HUnit + lens + monad-logger + mtl + stm + tasty + tasty-hunit + transformers + unix + wai + warp + wreq + ]; + description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "keter"; + } + ) { }; + + keter-rate-limiting-plugin = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + cache, + case-insensitive, + clock, + containers, + cookie, + deepseq, + directory, + filepath, + focus, + hashable, + http-types, + HUnit, + iproute, + list-t, + network, + QuickCheck, + random, + stm, + stm-containers, + tasty, + tasty-hunit, + tasty-quickcheck, + temporary, + text, + time, + unordered-containers, + wai, + wai-extra, + zlib, + }: + mkDerivation { + pname = "keter-rate-limiting-plugin"; + version = "0.2.0.0"; + sha256 = "0rswbhdg3ig0c028xdwgp8nb3h6jvf0z0137akrd4d7z8glyg00x"; + libraryHaskellDepends = [ + aeson + base + bytestring + cache + case-insensitive + clock + cookie + deepseq + directory + focus + hashable + http-types + iproute + list-t + network + stm + stm-containers + text + time + unordered-containers + wai + ]; + librarySystemDepends = [ zlib ]; + testHaskellDepends = [ + aeson + async + base + bytestring + cache + case-insensitive + clock + containers + cookie + directory + filepath + hashable + http-types + HUnit + network + QuickCheck + random + stm + stm-containers + tasty + tasty-hunit + tasty-quickcheck + temporary + text + time + unordered-containers + wai + wai-extra + ]; + description = "Simple Keter rate limiting plugin"; + license = lib.licenses.mit; + } + ) { inherit (pkgs) zlib; }; + keuringsdienst = callPackage ( { mkDerivation, @@ -400136,8 +399136,8 @@ self: { }: mkDerivation { pname = "keuringsdienst"; - version = "1.0.2.2"; - sha256 = "0wg13kgzq7hvl5fipwwsbdfi53ymz7ki794bhws8jxbc92c05whd"; + version = "1.2.0.0"; + sha256 = "0fq9l63xcw42lx6dnbws6vs6bjnah9rgkz2pax8mw2dq44h2a34j"; libraryHaskellDepends = [ aeson base @@ -400151,7 +399151,7 @@ self: { HUnit text ]; - description = "Data validation in Haskell that is composable, made easy and clean"; + description = "Data validation in Haskell: composable, easy and clean"; license = lib.licenses.lgpl3Only; } ) { }; @@ -401295,8 +400295,8 @@ self: { }: mkDerivation { pname = "kind-apply"; - version = "0.4.0.0"; - sha256 = "0bw41crzif6rdsfpskb8yanhzkcwn7hqwjawzifgi6jz3mvqqaha"; + version = "0.4.0.1"; + sha256 = "0j3aswwf5afvg1h3f6wv6yd253ynkzcbfq1fznsgi94dx90inkjy"; libraryHaskellDepends = [ base first-class-families @@ -401366,6 +400366,8 @@ self: { pname = "kind-generics-th"; version = "0.2.3.3"; sha256 = "1jilhnjqgcnaip9i8n6mff0zs91m4b8aciy1a0pi9jvqz2jdaxrz"; + revision = "1"; + editedCabalFile = "0qhcdm88rn8iradkk8xqlsdiy2rz0xwiclss3y4vknmhdl8q0cn5"; libraryHaskellDepends = [ base fcf-family @@ -401862,6 +400864,8 @@ self: { pname = "knead"; version = "1.0.1.1"; sha256 = "1sd391wpnyzcyp2d7w4xfmmafsxkhcn7wfhpwdglvxzpv0sbixrd"; + revision = "1"; + editedCabalFile = "17gx9wzva1zl7i7fk4bhadv60x9la3ralh58iv1v4hi52hx5b7bg"; libraryHaskellDepends = [ base bool8 @@ -401889,7 +400893,6 @@ self: { ]; description = "Repa-like array processing using LLVM JIT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -402230,67 +401233,6 @@ self: { ) { }; koji-tool = callPackage ( - { - mkDerivation, - base, - directory, - extra, - filepath, - formatting, - Glob, - http-conduit, - http-directory, - koji, - pretty-simple, - rpm-nvr, - safe, - simple-cmd, - simple-cmd-args, - simple-prompt, - text, - time, - utf8-string, - xdg-userdirs, - }: - mkDerivation { - pname = "koji-tool"; - version = "1.2"; - sha256 = "0kv1r4d4j9a5snj2g810b6fav3fbgw818dpzsvnfwys8xj792m6m"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base - directory - extra - filepath - formatting - Glob - http-conduit - http-directory - koji - pretty-simple - rpm-nvr - safe - simple-cmd - simple-cmd-args - simple-prompt - text - time - utf8-string - xdg-userdirs - ]; - testHaskellDepends = [ - base - simple-cmd - ]; - description = "Koji CLI tool for querying tasks and installing builds"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "koji-tool"; - } - ) { }; - - koji-tool_1_3 = callPackage ( { mkDerivation, base, @@ -402836,7 +401778,9 @@ self: { ]; description = "Krank checks issue tracker link status in your source code"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "krank"; + broken = true; } ) { }; @@ -403804,6 +402748,7 @@ self: { ]; description = "Key/Value Indexed Table container and formatting library"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -405428,7 +404373,9 @@ self: { ]; description = "Lambdabot plugin for XMPP (Jabber) protocol"; license = "unknown"; + hydraPlatforms = lib.platforms.none; mainProgram = "lambdabot-xmpp"; + broken = true; } ) { }; @@ -406511,7 +405458,6 @@ self: { ]; description = "Haskell implementation of Langchain"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -406765,6 +405711,7 @@ self: { ]; description = "Language definition and parser for AVRO files"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -407388,63 +406335,6 @@ self: { ) { }; language-docker = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - data-default, - data-default-class, - hspec, - hspec-discover, - hspec-megaparsec, - HUnit, - megaparsec, - prettyprinter, - QuickCheck, - split, - text, - time, - }: - mkDerivation { - pname = "language-docker"; - version = "13.0.0"; - sha256 = "16ywhy8bah81x9agckqbkad0h7k6gzxgds5frbj4nvs7x8xp6vh8"; - libraryHaskellDepends = [ - base - bytestring - containers - data-default - data-default-class - megaparsec - prettyprinter - split - text - time - ]; - testHaskellDepends = [ - base - bytestring - containers - data-default - data-default-class - hspec - hspec-megaparsec - HUnit - megaparsec - prettyprinter - QuickCheck - split - text - time - ]; - testToolDepends = [ hspec-discover ]; - description = "Dockerfile parser, pretty-printer and embedded DSL"; - license = lib.licenses.gpl3Only; - } - ) { }; - - language-docker_14_0_1 = callPackage ( { mkDerivation, base, @@ -407498,7 +406388,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -408396,6 +407285,8 @@ self: { ]; description = "Lua parser and pretty-printer"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -409612,6 +408503,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Parser and pretty printer for the Thrift IDL format"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -409679,8 +408572,8 @@ self: { }: mkDerivation { pname = "language-toolkit"; - version = "1.2.0.1"; - sha256 = "0ar2h4ch0rk4ify3rd4p414qx9gn6jv61ig1jainn2p92p0hnhni"; + version = "1.3.0.0"; + sha256 = "0zfa0lzj0gvzzfgvs97ajfd3zy1sz3m37j508la8swkjvh83s6sm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -410080,7 +408973,6 @@ self: { bytestring, containers, deepseq, - fourmolu, ghc, ghc-tcplugin-api, hashable, @@ -410090,7 +408982,6 @@ self: { parsec, primitive, QuickCheck, - record-dot-preprocessor, record-hasfield, sop-core, Stream, @@ -410105,10 +408996,10 @@ self: { }: mkDerivation { pname = "large-anon"; - version = "0.3.2"; - sha256 = "0lj23kv7p9ax8gs7mgb37cq1x4jd3zmbz4v6fvvd1mwnkrjsnvvd"; - isLibrary = true; - isExecutable = true; + version = "0.3.3"; + sha256 = "1xwl72d217i10va21cf61nfjvw85zdajhff57qhpbf15my187a3h"; + revision = "1"; + editedCabalFile = "0lqv9f4hq8f1cfgg763inqi05pc7kr08qdkmhrsmrqz24xan9wir"; libraryHaskellDepends = [ aeson base @@ -410127,11 +409018,6 @@ self: { tagged typelet ]; - executableHaskellDepends = [ - base - fourmolu - text - ]; testHaskellDepends = [ aeson aeson-pretty @@ -410144,7 +409030,6 @@ self: { optics-core parsec QuickCheck - record-dot-preprocessor record-hasfield sop-core Stream @@ -410158,7 +409043,6 @@ self: { description = "Scalable anonymous records"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "large-anon-testsuite-fourmolu-preprocessor"; broken = true; } ) { }; @@ -410182,10 +409066,8 @@ self: { }: mkDerivation { pname = "large-generics"; - version = "0.2.2"; - sha256 = "1mvlyhna4s0997pzfkbhgg3v4l5fqj7rpx5nqjpgy7af5zp2mdgn"; - revision = "1"; - editedCabalFile = "1ly8qwzy3myvfsdp0dlgr80mnys6mi6b17xgh457r642qhig9cc4"; + version = "0.2.3"; + sha256 = "0sxgw2aajh79sm9pd66i7ml7z9k7vs38aarpf39yh98bppci6sgk"; libraryHaskellDepends = [ aeson base @@ -410330,8 +409212,8 @@ self: { }: mkDerivation { pname = "large-records"; - version = "0.4.2"; - sha256 = "1z61v8vi3ax2pjw0d4k3vznbiziwflgraralrkxv12s3s3kq0pm5"; + version = "0.4.3"; + sha256 = "0byhs4dr86l0shqhhj3nnwcfqb8a08363w212gjqnm3kbvh18nsy"; libraryHaskellDepends = [ base containers @@ -411359,6 +410241,60 @@ self: { } ) { }; + lawful-conversions_0_3_0_1 = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + hashable, + primitive, + profunctors, + QuickCheck, + quickcheck-instances, + rebase, + tasty, + tasty-quickcheck, + text, + time, + unordered-containers, + uuid-types, + vector, + }: + mkDerivation { + pname = "lawful-conversions"; + version = "0.3.0.1"; + sha256 = "1n4ix4gjsankh2hxzzgk7ijv1dnmb5vcyl3mlh2rsx6gva19qwdn"; + libraryHaskellDepends = [ + base + bytestring + containers + hashable + primitive + profunctors + QuickCheck + text + time + unordered-containers + uuid-types + vector + ]; + testHaskellDepends = [ + bytestring + primitive + QuickCheck + quickcheck-instances + rebase + tasty + tasty-quickcheck + text + ]; + description = "Lawful typeclasses for bidirectional conversion between types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + lawless-concurrent-machines = callPackage ( { mkDerivation, @@ -411851,6 +410787,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library for caching IO action that leverages on GHC RTS implementation"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -412024,6 +410962,57 @@ self: { } ) { }; + lazy-scope = callPackage ( + { + mkDerivation, + base, + bytestring, + deepseq, + directory, + filepath, + mtl, + relude, + tasty, + tasty-discover, + tasty-hunit, + tasty-quickcheck, + trace-embrace, + transformers, + unliftio, + }: + mkDerivation { + pname = "lazy-scope"; + version = "0.0.1"; + sha256 = "1mg61w6jlv8218d3ps5blidbdfwrybyb60qr6vnappla7yixbj9v"; + libraryHaskellDepends = [ + base + bytestring + deepseq + directory + filepath + mtl + relude + trace-embrace + transformers + unliftio + ]; + testHaskellDepends = [ + base + bytestring + directory + relude + tasty + tasty-discover + tasty-hunit + tasty-quickcheck + unliftio + ]; + testToolDepends = [ tasty-discover ]; + description = "Alternative lazy ByteString and ST-like IO Handle"; + license = lib.licenses.bsd3; + } + ) { }; + lazy-search = callPackage ( { mkDerivation, @@ -412170,6 +411159,8 @@ self: { ]; description = "Lazy Probabilistic Programming Library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -412780,8 +411771,8 @@ self: { }: mkDerivation { pname = "leancheck"; - version = "1.0.2"; - sha256 = "0sp2rvz4h7mbra5jmn71ds3xz0934hhmsssbhsfgvkifgk8vcb0i"; + version = "1.0.4"; + sha256 = "15fg0bnrh7apla4y2c47gxb4jrkrvrcb3swrl3mva2lymnnxzhbd"; libraryHaskellDepends = [ base template-haskell @@ -415776,8 +414767,10 @@ self: { ]; description = "Preprocessor for typesetting Haskell sources with LaTeX"; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "lhs2TeX"; maintainers = [ lib.maintainers.nomeata ]; + broken = true; } ) { }; @@ -416389,6 +415382,8 @@ self: { ]; description = "Provides shared functionality between iserv and iserv-proxy"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -416889,8 +415884,8 @@ self: { }: mkDerivation { pname = "libmodbus"; - version = "1.1.3"; - sha256 = "1lpdpa01b43i5x4s0qfvb86dqvh8rhn5pn19yh34hf8fa693cqck"; + version = "1.1.4"; + sha256 = "1lrczzjwvkia4g3kv5jiilp1b8x8q1rj9mwcbyca48cyl7l90523"; libraryHaskellDepends = [ base bytestring @@ -417796,7 +416791,9 @@ self: { ]; description = "libremidi bindings for haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "libremidi-exe"; + broken = true; } ) { @@ -418112,8 +417109,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.mpscholten ]; } ) { inherit (pkgs) libssh2; }; @@ -418143,7 +417139,6 @@ self: { ]; description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -418341,23 +417336,41 @@ self: { base, bytestring, c10, + Cabal, containers, + directory, + filepath, hspec, + http-conduit, inline-c, inline-c-cpp, libtorch-ffi-helper, optparse-applicative, + process, safe-exceptions, sysinfo, template-haskell, + temporary, text, torch, torch_cpu, + zip-archive, }: mkDerivation { pname = "libtorch-ffi"; - version = "2.0.1.5"; - sha256 = "0qk8wdfp2c3xwn8ydszxn5zpifcgbp5ns75rinyyqybz0rls1xk8"; + version = "2.0.1.8"; + sha256 = "0aghzvhjdnqb7hx75ga2fls0waw8xwsnqqizj8407iq9n915r0yy"; + setupHaskellDepends = [ + base + bytestring + Cabal + directory + filepath + http-conduit + process + temporary + zip-archive + ]; libraryHaskellDepends = [ async base @@ -419097,6 +418110,54 @@ self: { } ) { }; + lifted-async_0_11_0 = callPackage ( + { + mkDerivation, + async, + base, + constraints, + lifted-base, + monad-control, + mtl, + tasty, + tasty-bench, + tasty-expected-failure, + tasty-hunit, + tasty-th, + transformers-base, + }: + mkDerivation { + pname = "lifted-async"; + version = "0.11.0"; + sha256 = "121j10146py2hl1lrywhbaqqghhh0lbafnljmq7qb2jfnjbyjlif"; + libraryHaskellDepends = [ + async + base + constraints + lifted-base + monad-control + transformers-base + ]; + testHaskellDepends = [ + base + lifted-base + mtl + tasty + tasty-expected-failure + tasty-hunit + tasty-th + ]; + benchmarkHaskellDepends = [ + async + base + tasty-bench + ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + lifted-base = callPackage ( { mkDerivation, @@ -419736,6 +418797,8 @@ self: { ]; description = "Convert between Haskell, Markdown, Literate Haskell, TeX"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -419767,6 +418830,8 @@ self: { ]; description = "representation of Integer Linear Programs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -420380,81 +419445,6 @@ self: { ) { }; linear-base = callPackage ( - { - mkDerivation, - base, - containers, - deepseq, - ghc-prim, - hashable, - hashtables, - hedgehog, - inspection-testing, - linear-generics, - mmorph, - MonadRandom, - primitive, - random, - random-shuffle, - storable-tuple, - tasty, - tasty-bench, - tasty-hedgehog, - tasty-inspection-testing, - text, - transformers, - unordered-containers, - vector, - }: - mkDerivation { - pname = "linear-base"; - version = "0.4.0"; - sha256 = "092xnbn29829zz1nq96h2fcw3qpkanzrhw09cjs90f19xhcs1vxw"; - libraryHaskellDepends = [ - base - containers - ghc-prim - hashable - linear-generics - primitive - storable-tuple - text - transformers - vector - ]; - testHaskellDepends = [ - base - containers - hedgehog - inspection-testing - linear-generics - mmorph - storable-tuple - tasty - tasty-hedgehog - tasty-inspection-testing - text - vector - ]; - benchmarkHaskellDepends = [ - base - containers - deepseq - hashable - hashtables - MonadRandom - random - random-shuffle - tasty-bench - unordered-containers - vector - ]; - description = "Standard library for linear types"; - license = lib.licenses.mit; - } - ) { }; - - linear-base_0_5_0 = callPackage ( { mkDerivation, base, @@ -420527,7 +419517,6 @@ self: { doHaddock = false; description = "Standard library for linear types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -420633,6 +419622,35 @@ self: { } ) { }; + linear-free = callPackage ( + { + mkDerivation, + base, + containers, + hspec, + linear-base, + QuickCheck, + }: + mkDerivation { + pname = "linear-free"; + version = "0.1.0.0"; + sha256 = "1j0g3zc3gaiz93c1zirhkh1rgj14ym12z1z3w19fr7ilknn86aw4"; + libraryHaskellDepends = [ + base + linear-base + ]; + testHaskellDepends = [ + base + containers + hspec + linear-base + QuickCheck + ]; + description = "Linear free monads"; + license = lib.licenses.mit; + } + ) { }; + linear-generics = callPackage ( { mkDerivation, @@ -421998,29 +421016,6 @@ self: { ) { }; linux-namespaces = callPackage ( - { - mkDerivation, - base, - bytestring, - unix, - }: - mkDerivation { - pname = "linux-namespaces"; - version = "0.1.3.1"; - sha256 = "1h0ar1jqgip5k5b7c2v452jk62ig1pfgpw587faw8z0ai51yrl9a"; - libraryHaskellDepends = [ - base - bytestring - unix - ]; - description = "Work with linux namespaces: create new or enter existing ones"; - license = lib.licenses.bsd3; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.alexfmpe ]; - } - ) { }; - - linux-namespaces_0_2_0_1 = callPackage ( { mkDerivation, base, @@ -422039,7 +421034,6 @@ self: { description = "Work with linux namespaces: create new or enter existing ones"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -422579,6 +421573,125 @@ self: { ) { }; liquid-fixpoint = callPackage ( + { + mkDerivation, + aeson, + ansi-terminal, + array, + ascii-progress, + async, + attoparsec, + base, + binary, + boxes, + bytestring, + cereal, + cmdargs, + containers, + deepseq, + directory, + fgl, + filepath, + hashable, + intern, + lens-family, + megaparsec, + mtl, + optparse-applicative, + parallel, + parser-combinators, + pretty, + process, + rest-rewrite, + smtlib-backends, + smtlib-backends-process, + stm, + store, + syb, + tagged, + tasty, + tasty-ant-xml, + tasty-hunit, + tasty-quickcheck, + tasty-rerun, + text, + transformers, + unordered-containers, + vector, + }: + mkDerivation { + pname = "liquid-fixpoint"; + version = "0.9.6.3.2"; + sha256 = "1anf30y3xvlhwbph2wy0iysgr28044q99knz5fzqa7hfzi9vy62n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + ansi-terminal + array + ascii-progress + async + attoparsec + base + binary + boxes + bytestring + cereal + cmdargs + containers + deepseq + directory + fgl + filepath + hashable + intern + lens-family + megaparsec + mtl + parallel + parser-combinators + pretty + process + rest-rewrite + smtlib-backends + smtlib-backends-process + stm + store + syb + text + transformers + unordered-containers + vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base + containers + directory + filepath + hashable + mtl + optparse-applicative + process + stm + tagged + tasty + tasty-ant-xml + tasty-hunit + tasty-quickcheck + tasty-rerun + text + transformers + unordered-containers + ]; + description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; + license = lib.licenses.bsd3; + mainProgram = "fixpoint"; + maintainers = [ lib.maintainers.artem ]; + } + ) { }; + + liquid-fixpoint_0_9_6_3_3 = callPackage ( { mkDerivation, aeson, @@ -422694,7 +421807,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "fixpoint"; - broken = true; + maintainers = [ lib.maintainers.artem ]; } ) { }; @@ -422725,6 +421838,7 @@ self: { description = "Drop-in ghc-prim replacement for LH"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -422754,6 +421868,7 @@ self: { description = "LiquidHaskell specs for the parallel package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -422822,6 +421937,7 @@ self: { description = "General utility modules for LiquidHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -422851,10 +421967,47 @@ self: { description = "LiquidHaskell specs for the vector package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; liquidhaskell = callPackage ( + { + mkDerivation, + base, + bytestring, + Cabal, + containers, + ghc-prim, + liquidhaskell-boot, + z3, + }: + mkDerivation { + pname = "liquidhaskell"; + version = "0.9.10.1.2"; + sha256 = "16bv11zi54z5c6lh8ynpmlcdhp4v1qdpi90hlg15m4926p2cbna5"; + revision = "1"; + editedCabalFile = "115rawks2y1w2bk5qdd6yb8a5slm5ks19w0kj4smcp915hgq68qp"; + setupHaskellDepends = [ + base + Cabal + liquidhaskell-boot + ]; + libraryHaskellDepends = [ + base + bytestring + containers + ghc-prim + liquidhaskell-boot + ]; + testSystemDepends = [ z3 ]; + description = "Liquid Types for Haskell"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; + } + ) { inherit (pkgs) z3; }; + + liquidhaskell_0_9_12_2 = callPackage ( { mkDerivation, base, @@ -422885,10 +422038,130 @@ self: { description = "Liquid Types for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.artem ]; } ) { inherit (pkgs) z3; }; liquidhaskell-boot = callPackage ( + { + mkDerivation, + aeson, + array, + base, + binary, + bytestring, + Cabal, + cereal, + cmdargs, + containers, + deepseq, + Diff, + directory, + exceptions, + extra, + filepath, + fingertree, + free, + ghc, + ghc-boot, + ghc-internal, + ghc-paths, + ghc-prim, + githash, + gitrev, + hashable, + hscolour, + liquid-fixpoint, + megaparsec, + mtl, + optparse-applicative, + pretty, + split, + syb, + tasty, + tasty-ant-xml, + tasty-hunit, + template-haskell, + temporary, + text, + th-compat, + time, + transformers, + unordered-containers, + vector, + }: + mkDerivation { + pname = "liquidhaskell-boot"; + version = "0.9.10.1.2"; + sha256 = "0kckh95w3y1gjfhy8k2fyg9mmqq3vq8gcbacyywwsmr2mx752k5z"; + revision = "1"; + editedCabalFile = "00yxwj9x4fi4yxvv87l1fqz2wnpihvdaakv79d885vsfi9nfqxk1"; + libraryHaskellDepends = [ + aeson + array + base + binary + bytestring + Cabal + cereal + cmdargs + containers + deepseq + Diff + directory + exceptions + extra + filepath + fingertree + free + ghc + ghc-boot + ghc-prim + githash + gitrev + hashable + hscolour + liquid-fixpoint + megaparsec + mtl + optparse-applicative + pretty + split + syb + template-haskell + temporary + text + th-compat + time + transformers + unordered-containers + vector + ]; + testHaskellDepends = [ + base + directory + filepath + ghc + ghc-internal + ghc-paths + ghc-prim + liquid-fixpoint + megaparsec + syb + tasty + tasty-ant-xml + tasty-hunit + template-haskell + time + unordered-containers + ]; + description = "Liquid Types for Haskell"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; + } + ) { }; + + liquidhaskell-boot_0_9_12_2 = callPackage ( { mkDerivation, aeson, @@ -422940,6 +422213,8 @@ self: { pname = "liquidhaskell-boot"; version = "0.9.12.2"; sha256 = "1gfphzqpj36valrmsbwijac12nr5b3fkgfxbkgq8dlws983hbadr"; + revision = "1"; + editedCabalFile = "0mywy0kck9q1rldzwi7r505a6zfbwaj6fjqq230x6abbqkba7rj6"; libraryHaskellDepends = [ aeson array @@ -423002,6 +422277,7 @@ self: { description = "Liquid Types for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.artem ]; } ) { }; @@ -423159,6 +422435,8 @@ self: { ]; description = "testing list fusion for success"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -423666,6 +422944,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "List-like operations for tuples"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -423768,8 +423047,6 @@ self: { ]; description = "A list zipper"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -424063,6 +423340,18 @@ self: { } ) { }; + literally = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "literally"; + version = "0.2025.9.10"; + sha256 = "14g4m2qkaq6aanan8wrxawd44c8b6br0kcmhwrwk6k531564bjng"; + libraryHaskellDepends = [ base ]; + description = "Type-safe conversion of type literals into runtime values"; + license = lib.licenses.bsd0; + } + ) { }; + literals = callPackage ( { mkDerivation, base }: mkDerivation { @@ -424078,59 +423367,6 @@ self: { ) { }; literatex = callPackage ( - { - mkDerivation, - ansi-wl-pprint, - base, - bytestring, - conduit, - filepath, - optparse-applicative, - tasty, - tasty-hunit, - text, - ttc, - unliftio, - }: - mkDerivation { - pname = "literatex"; - version = "0.3.0.0"; - sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "8"; - editedCabalFile = "0wg9kshyn0s8f65pchyl69i97qdk39lr8fzp9c4zb7d2lv1cgn8c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bytestring - conduit - text - ttc - unliftio - ]; - executableHaskellDepends = [ - ansi-wl-pprint - base - optparse-applicative - ttc - ]; - testHaskellDepends = [ - base - bytestring - filepath - tasty - tasty-hunit - text - ttc - unliftio - ]; - description = "transform literate source code to Markdown"; - license = lib.licenses.mit; - mainProgram = "literatex"; - } - ) { }; - - literatex_0_4_0_0 = callPackage ( { mkDerivation, ansi-wl-pprint, @@ -424179,7 +423415,6 @@ self: { ]; description = "transform literate source code to Markdown"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "literatex"; } ) { }; @@ -424473,24 +423708,54 @@ self: { { mkDerivation, aeson, + attoparsec, base, + bytestring, + conduit, + conduit-extra, + exceptions, + http-client, http-conduit, http-types, + optparse-generic, text, }: mkDerivation { pname = "llama-cpp-haskell"; - version = "0.1.0.2"; - sha256 = "11g5v696mj0rcl8w2bjd6wvklrl25xk97s5hlzqc2hazwpzfgdwk"; + version = "0.2.1"; + sha256 = "0a20i46j2hmk3nv0jq9gpp4mf0fcpqb3dzv5cygas0lhq6r862kh"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson + attoparsec base + bytestring + conduit + conduit-extra + exceptions + http-client http-conduit http-types text ]; - description = "Haskell bindings for the llama.cpp llama-server"; + executableHaskellDepends = [ + aeson + attoparsec + base + bytestring + conduit + conduit-extra + exceptions + http-client + http-conduit + http-types + optparse-generic + text + ]; + description = "Haskell bindings for the llama.cpp llama-server and a simple CLI"; license = lib.licenses.agpl3Only; + mainProgram = "llamacall"; } ) { }; @@ -424939,6 +424204,8 @@ self: { pname = "llvm-dsl"; version = "0.1.2"; sha256 = "1ynldbzdlr5i08174s85nzi8iwaic0zr10x8zccvl127d9d3264q"; + revision = "1"; + editedCabalFile = "1jihb8c0jg7xby9ql3cxf7l7nkrppg5n5xhfdhfnqn53msb9bp9w"; libraryHaskellDepends = [ base bool8 @@ -424964,7 +424231,6 @@ self: { ]; description = "Support for writing an EDSL with LLVM-JIT as target"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -425032,8 +424298,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.12.1"; - sha256 = "0i8209qf00fbl1wmfin27ym0ampa4ijxr8ymhqvcvkq8xg1y2ayy"; + version = "0.13"; + sha256 = "0j87l1d6ypg1lm5bjfimgrnygr160rw7igr34kaj33mh0lry6jcr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -425066,8 +424332,6 @@ self: { doHaddock = false; description = "Utility functions for the llvm interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -425076,24 +424340,24 @@ self: { mkDerivation, base, enumset, - LLVM-21git, + LLVM, }: mkDerivation { pname = "llvm-ffi"; - version = "21.0"; - sha256 = "1dfl6zxcghhyyp49lgkknlq8nkvii7aag7y8b38ny93cpcczgx0g"; + version = "21.0.0.2"; + sha256 = "0siiz33d3wnx0pqn8np098xv16bg76pg49zkppijixqqcglxa8j3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; - librarySystemDepends = [ LLVM-21git ]; + librarySystemDepends = [ LLVM ]; description = "FFI bindings to the LLVM compiler toolkit"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.thielema ]; } - ) { LLVM-21git = null; }; + ) { LLVM = null; }; llvm-ffi-tools = callPackage ( { @@ -425119,6 +424383,8 @@ self: { ]; description = "Tools for maintaining the llvm-ffi package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -425568,10 +424834,8 @@ self: { }: mkDerivation { pname = "llvm-pkg-config"; - version = "0.0.2"; - sha256 = "1p4ww8ylhr4ag1dfz4sffkg2qsyjj4zxccda3nr50k3c26pmmdz1"; - revision = "1"; - editedCabalFile = "0wd3vvcas446skkmp2w3jp7f3d1cbl7b58kikwgrmlqa6ddzyzlk"; + version = "0.0.3"; + sha256 = "0cjjn2q3i87bnlqi81nfy5fjbin98k8lanv21qigzbnxv2m9l4q9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -427740,10 +427004,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.4.0"; - sha256 = "0ff794800pn4gxdig85nr2svajph01rdg3sm0vjpfa71q67wlq0q"; - revision = "1"; - editedCabalFile = "0yjlwlc4rybygpbksclid3wskp5ng8gwwwrh8frq6vl08d1rwmf7"; + version = "1.4.1"; + sha256 = "1w8al4wlrda7qdifs86zqvlqdzzpd0awjn1nvcln7ax2yd5ncwnp"; libraryHaskellDepends = [ async base @@ -429005,6 +428267,8 @@ self: { ]; description = "FFI bindings for C long double"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -429155,6 +428419,8 @@ self: { ]; description = "A simple text parser with decent errors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -430127,6 +429393,8 @@ self: { ]; description = "LRU cache"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -430316,175 +429584,198 @@ self: { } ) { }; - lsp_2_1_0_0 = callPackage ( + lsm-tree = callPackage ( { mkDerivation, - aeson, + ansi-terminal, async, - attoparsec, + barbies, base, + binary, + bitvec, + blockio, + bloomfilter-blocked, bytestring, - co-log-core, + cborg, + clock, + constraints, containers, - data-default, + contra-tracer, + crc32c, + criterion, + cryptohash-sha256, + data-elevator, + deepseq, directory, - exceptions, filepath, - hashable, - hspec, - hspec-discover, - lens, - lsp-types, + fs-api, + fs-sim, + heaps, + indexed-traversable, + io-classes, + io-sim, mtl, - prettyprinter, + nonempty-containers, + nothunks, + optparse-applicative, + pretty-show, + primes, + primitive, + QuickCheck, + quickcheck-classes, + quickcheck-dynamic, + quickcheck-instances, + quickcheck-lockstep, random, - row-types, - sorted-list, - stm, + rocksdb, + safe-wild-cards, + semialign, + serialise, + split, + splitmix, + tasty, + tasty-bench, + tasty-golden, + tasty-hunit, + tasty-quickcheck, temporary, text, - text-rope, + these, + time, transformers, - unliftio-core, - unordered-containers, - uuid, + utf8-string, + vector, + vector-algorithms, + wide-word, }: mkDerivation { - pname = "lsp"; - version = "2.1.0.0"; - sha256 = "03gk98fgf32blywdds0fc5351bmcbbfrnqwlg33l2ih75nwa59y8"; - isLibrary = true; - isExecutable = true; + pname = "lsm-tree"; + version = "1.0.0.0"; + sha256 = "1vm9314pa5b8w3kwyncmnh1kqq61kxfidcw52iv6728456dda4m4"; libraryHaskellDepends = [ - aeson - async - attoparsec base + binary + bitvec + blockio + bloomfilter-blocked bytestring - co-log-core + cborg containers - data-default - directory - exceptions + contra-tracer + crc32c + data-elevator + deepseq filepath - hashable - lens - lsp-types - mtl - prettyprinter + fs-api + fs-sim + indexed-traversable + io-classes + nonempty-containers + nothunks + primes + primitive + QuickCheck + quickcheck-instances random - row-types - sorted-list - stm - temporary + serialise text - text-rope transformers - unliftio-core - unordered-containers - uuid + utf8-string + vector + vector-algorithms + wide-word ]; + librarySystemDepends = [ rocksdb ]; testHaskellDepends = [ + ansi-terminal + barbies base - containers - hspec - row-types - sorted-list - text - text-rope - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - lsp_2_4_0_0 = callPackage ( - { - mkDerivation, - aeson, - async, - attoparsec, - base, - bytestring, - co-log-core, - containers, - data-default, - directory, - exceptions, - filepath, - hashable, - hspec, - hspec-discover, - lens, - lens-aeson, - lsp-types, - mtl, - prettyprinter, - random, - row-types, - sorted-list, - stm, - text, - text-rope, - transformers, - unliftio-core, - unordered-containers, - uuid, - }: - mkDerivation { - pname = "lsp"; - version = "2.4.0.0"; - sha256 = "1ggfw2wp9g9fpg9x3kj9zh6l6p2yiw4q0v1gzxjg0mcmvp4aad8w"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - async - attoparsec - base + bitvec + blockio + bloomfilter-blocked bytestring - co-log-core + cborg + constraints containers - data-default + contra-tracer + crc32c + cryptohash-sha256 + deepseq directory - exceptions filepath - hashable - lens - lens-aeson - lsp-types + fs-api + fs-sim + heaps + io-classes + io-sim mtl - prettyprinter + nothunks + primitive + QuickCheck + quickcheck-classes + quickcheck-dynamic + quickcheck-instances + quickcheck-lockstep random - row-types - sorted-list - stm + safe-wild-cards + semialign + split + splitmix + tasty + tasty-bench + tasty-golden + tasty-hunit + tasty-quickcheck + temporary text - text-rope + these transformers - unliftio-core - unordered-containers - uuid + vector + vector-algorithms + wide-word ]; - testHaskellDepends = [ + benchmarkHaskellDepends = [ + async base + binary + blockio + bloomfilter-blocked + bytestring + clock containers - hspec - row-types - sorted-list - text - text-rope - unordered-containers + contra-tracer + criterion + cryptohash-sha256 + deepseq + directory + fs-api + heaps + io-classes + mtl + optparse-applicative + pretty-show + primitive + QuickCheck + random + split + splitmix + tasty + tasty-bench + tasty-hunit + tasty-quickcheck + temporary + time + transformers + vector + vector-algorithms + wide-word ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; + doHaddock = false; + description = "Log-structured merge-trees"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } - ) { }; + ) { inherit (pkgs) rocksdb; }; lsp = callPackage ( { @@ -430522,6 +429813,8 @@ self: { pname = "lsp"; version = "2.7.0.1"; sha256 = "1z3kc0vpgijzg56n70vmbi9draxzk02fifz83kgjq73rjc2scp7w"; + revision = "1"; + editedCabalFile = "1lq1gs8b47k3fv79lwz6a9zfkkywp95jy7xzxh0sb5k21x5yy7m9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -430747,109 +430040,6 @@ self: { } ) { }; - lsp-types_2_1_1_0 = callPackage ( - { - mkDerivation, - aeson, - base, - binary, - containers, - data-default, - deepseq, - Diff, - directory, - dlist, - exceptions, - file-embed, - filepath, - generic-arbitrary, - hashable, - hspec, - hspec-discover, - indexed-traversable, - indexed-traversable-instances, - lens, - lens-aeson, - mod, - mtl, - network-uri, - prettyprinter, - QuickCheck, - quickcheck-instances, - regex, - row-types, - safe, - some, - template-haskell, - text, - }: - mkDerivation { - pname = "lsp-types"; - version = "2.1.1.0"; - sha256 = "0gsr0v11xfav7dnq4d433y9ca0snmqaax4pp5sgmf33zl8qhi6s0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - base - binary - containers - data-default - deepseq - Diff - dlist - exceptions - file-embed - filepath - generic-arbitrary - hashable - indexed-traversable - indexed-traversable-instances - lens - lens-aeson - mod - mtl - network-uri - prettyprinter - QuickCheck - quickcheck-instances - row-types - safe - some - template-haskell - text - ]; - executableHaskellDepends = [ - base - containers - directory - filepath - mtl - prettyprinter - regex - text - ]; - testHaskellDepends = [ - aeson - base - filepath - hspec - lens - network-uri - QuickCheck - quickcheck-instances - row-types - text - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - mainProgram = "generator"; - } - ) { }; - lsp-types = callPackage ( { mkDerivation, @@ -430979,7 +430169,9 @@ self: { executableHaskellDepends = [ base ]; description = "A tool for CSV files data querying from the shell with short queries"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "lsql-csv"; + broken = true; } ) { }; @@ -432194,8 +431386,8 @@ self: { pname = "lumberjack"; version = "1.0.3.0"; sha256 = "05a4gvc47448crb0yn0fwi3y9bwdqlmnch839hljwpyamqvqwi8q"; - revision = "2"; - editedCabalFile = "1szaa11cdmdb8i2hpj0hl8cpwhkbk7s2iwq0hpck75as0xiqk36z"; + revision = "3"; + editedCabalFile = "16nq7699s30bs896brfpm1ssh39730ba9a3zizjg81xl9hqh8z5g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -432360,18 +431552,14 @@ self: { { mkDerivation, base, - containers, - relude, stm, }: mkDerivation { pname = "lvar"; - version = "0.1.0.0"; - sha256 = "1hllvr4nsjv3c3x5aybp05wr9pdvwlw101vq7c37ydnb91hbfdv4"; + version = "0.2.0.0"; + sha256 = "1wp4yi6c7d893hjgwnpdla8hwiqp7gg8190fmji5gn0vbihl6csb"; libraryHaskellDepends = [ base - containers - relude stm ]; description = "TMVar that can be listened to"; @@ -436568,6 +435756,7 @@ self: { ]; description = "Convert C++ type signatures to their mangled form"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "mangle"; } ) { }; @@ -437123,58 +436312,6 @@ self: { ) { }; mappings = callPackage ( - { - mkDerivation, - base, - cond, - containers, - formatting, - hspec, - hspec-discover, - indexed-traversable, - partialord, - }: - mkDerivation { - pname = "mappings"; - version = "0.3.1.0"; - sha256 = "1yf6qvsipjfq8s9z9lk7q29m3dkpa5kgvjpkm4wap5vawp2rzqyd"; - revision = "1"; - editedCabalFile = "1xg13149rlb00gb8bmnwwy7hncsjsw961mwfffwj99a1ki2ym5qw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - cond - containers - formatting - indexed-traversable - partialord - ]; - executableHaskellDepends = [ - base - cond - containers - formatting - indexed-traversable - partialord - ]; - testHaskellDepends = [ - base - cond - containers - formatting - hspec - indexed-traversable - partialord - ]; - testToolDepends = [ hspec-discover ]; - description = "Types which represent functions k -> v"; - license = lib.licenses.bsd3; - mainProgram = "view"; - } - ) { }; - - mappings_0_3_2_0 = callPackage ( { mkDerivation, base, @@ -437220,7 +436357,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Types which represent functions k -> v"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "view"; } ) { }; @@ -437321,6 +436457,8 @@ self: { ]; description = "library for MIDI control of hardware"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -437893,51 +437031,6 @@ self: { ) { }; markup-parse = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - deepseq, - doctest-parallel, - flatparse, - string-interpolate, - tasty, - tasty-golden, - these, - tree-diff, - }: - mkDerivation { - pname = "markup-parse"; - version = "0.1.1.1"; - sha256 = "0k9ga485l7nvhny0kqjb6s4q407a1mnfpcsy90892qgj42dkkdb4"; - libraryHaskellDepends = [ - base - bytestring - containers - deepseq - flatparse - string-interpolate - tasty - tasty-golden - these - tree-diff - ]; - testHaskellDepends = [ - base - bytestring - doctest-parallel - string-interpolate - tasty - tasty-golden - tree-diff - ]; - description = "A markup parser"; - license = lib.licenses.bsd3; - } - ) { }; - - markup-parse_0_2_0_0 = callPackage ( { mkDerivation, base, @@ -437954,8 +437047,8 @@ self: { }: mkDerivation { pname = "markup-parse"; - version = "0.2.0.0"; - sha256 = "1z08d3chvgl9zk9y2crfjih0crh5dv7pih6x0n7af38l6lhsgkhz"; + version = "0.2.1.0"; + sha256 = "0g80sx8naqbzk21pb8msz7sr9z09brkdr2nkwx1qc3b2g41j5fd9"; libraryHaskellDepends = [ base bytestring @@ -437975,7 +437068,6 @@ self: { ]; description = "A markup parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -438963,41 +438055,6 @@ self: { ) { }; matchable = callPackage ( - { - mkDerivation, - base, - containers, - hashable, - hspec, - tagged, - unordered-containers, - vector, - }: - mkDerivation { - pname = "matchable"; - version = "0.1.2.1"; - sha256 = "0vpjqw9hkx8ck1x56fbjmhhgmdmxzjbxiqdq1i3kqsh8p67dnshq"; - revision = "1"; - editedCabalFile = "0gawa35cnb7qv7fgjpxn1x8ljzx93blw9bnfmpzazlij61cw6lq4"; - libraryHaskellDepends = [ - base - containers - hashable - tagged - unordered-containers - vector - ]; - testHaskellDepends = [ - base - containers - hspec - ]; - description = "A type class for Matchable Functors"; - license = lib.licenses.bsd3; - } - ) { }; - - matchable_0_2 = callPackage ( { mkDerivation, base, @@ -439034,7 +438091,6 @@ self: { ]; description = "A type class for Matchable Functors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -441466,8 +440522,8 @@ self: { }: mkDerivation { pname = "mcp-server"; - version = "0.1.0.14"; - sha256 = "0lyr19sg5cjsgiq16v0cfkf1rkwgvyacz4siflf4wapllrkr82fz"; + version = "0.1.0.15"; + sha256 = "0wmrjgd7sabkb9y2dx0bjdxabm2qply5rnfhnskbrshzx72rnrj7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -441502,8 +440558,6 @@ self: { ]; description = "Library for building Model Context Protocol (MCP) servers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -441773,23 +440827,33 @@ self: { mkDerivation, adjunctions, base, + clock, containers, + deepseq, doctest-parallel, + formatn, harpie, harpie-numhask, + mtl, mwc-probability, numhask, + optics-core, + optparse-applicative, + perf, primitive, profunctors, tdigest, text, + time, vector, vector-algorithms, }: mkDerivation { pname = "mealy"; - version = "0.5.0.0"; - sha256 = "0cijjmi3wqi7z3vbhm0ya8va9397rlkr3wkri6kf94qqr1vimgxy"; + version = "0.5.0.1"; + sha256 = "095rqkb2skzj5sizj1f8l3d37brqmws4jx2pi004gkff2czawdzz"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ adjunctions base @@ -441805,12 +440869,29 @@ self: { vector vector-algorithms ]; + executableHaskellDepends = [ + base + clock + containers + deepseq + formatn + harpie + harpie-numhask + mtl + optics-core + optparse-applicative + perf + tdigest + text + time + ]; testHaskellDepends = [ base doctest-parallel ]; description = "Mealy machines for processing time-series and ordered data"; license = lib.licenses.bsd3; + mainProgram = "mealy-perf"; } ) { }; @@ -441928,8 +441009,8 @@ self: { pname = "med-module"; version = "0.1.3"; sha256 = "04p1aj85hsr3wpnnfg4nxbqsgq41ga63mrg2w39d8ls8ljvajvna"; - revision = "2"; - editedCabalFile = "0b557rrqki2rjb922s1yqkd7gbm9cjhzg52f0h5mp19v53nds3vz"; + revision = "4"; + editedCabalFile = "19a96nn7dpmvq4g1n7zg00xk3y98p39r509acz5zl3smpn6pbspr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -442649,52 +441730,6 @@ self: { ) { }; megaparsec = callPackage ( - { - mkDerivation, - base, - bytestring, - case-insensitive, - containers, - criterion, - deepseq, - mtl, - parser-combinators, - scientific, - text, - transformers, - weigh, - }: - mkDerivation { - pname = "megaparsec"; - version = "9.6.1"; - sha256 = "1zyb1mqa2mjjig5aggndifh6zqlwbw8sn4nm4an73gkxhjz5f8m3"; - libraryHaskellDepends = [ - base - bytestring - case-insensitive - containers - deepseq - mtl - parser-combinators - scientific - text - transformers - ]; - benchmarkHaskellDepends = [ - base - bytestring - containers - criterion - deepseq - text - weigh - ]; - description = "Monadic parser combinators"; - license = lib.licenses.bsd2; - } - ) { }; - - megaparsec_9_7_0 = callPackage ( { mkDerivation, array, @@ -442739,7 +441774,6 @@ self: { ]; description = "Monadic parser combinators"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -442763,10 +441797,10 @@ self: { }: mkDerivation { pname = "megaparsec-tests"; - version = "9.6.1"; - sha256 = "1l3rmg4ymw4czqkkb3502g322ijdg11c1img9l4p6ipy7hdzw52n"; + version = "9.7.0"; + sha256 = "17jwz62f8lnrfmmfrsv1jcvn9wmpk4jlhmxjwk5qqx2iyijnrpb1"; revision = "1"; - editedCabalFile = "0vycmn3c32z1bk19612277df41in55rkyk23gk3m007drsaq3xdl"; + editedCabalFile = "108nv4c045xg3ks0v7c0figqrl7v90l87cahhmn5mc24vdpxhkrj"; libraryHaskellDepends = [ base bytestring @@ -442797,67 +441831,83 @@ self: { testToolDepends = [ hspec-discover ]; description = "Test utilities and the test suite of Megaparsec"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; - megaparsec-tests_9_7_0 = callPackage ( + megaparsec-time = callPackage ( { mkDerivation, base, - bytestring, - case-insensitive, - containers, hspec, hspec-discover, - hspec-megaparsec, megaparsec, - mtl, + megaparsec-utils, + parser-combinators, QuickCheck, - scientific, - temporary, - text, - transformers, + time, }: mkDerivation { - pname = "megaparsec-tests"; - version = "9.7.0"; - sha256 = "17jwz62f8lnrfmmfrsv1jcvn9wmpk4jlhmxjwk5qqx2iyijnrpb1"; - revision = "1"; - editedCabalFile = "108nv4c045xg3ks0v7c0figqrl7v90l87cahhmn5mc24vdpxhkrj"; + pname = "megaparsec-time"; + version = "0.2.0.1"; + sha256 = "0w5br2skph6ylbf1fdb1r8z4kpqr571dr5jzf6hdmm4f18k57v1v"; libraryHaskellDepends = [ base - bytestring - containers + megaparsec + megaparsec-utils + parser-combinators + time + ]; + testHaskellDepends = [ + base hspec - hspec-megaparsec megaparsec - mtl + megaparsec-utils + parser-combinators QuickCheck + time + ]; + testToolDepends = [ hspec-discover ]; + description = "Parsers and utilities for the Megaparsec library"; + license = lib.licenses.gpl3Only; + } + ) { }; + + megaparsec-utils = callPackage ( + { + mkDerivation, + aeson, + base, + hspec, + megaparsec, + parser-combinators, + QuickCheck, + text, + uuid, + }: + mkDerivation { + pname = "megaparsec-utils"; + version = "0.1.1.3"; + sha256 = "15hygajcslwxfyk37s9hzgxk8a207ylbbisps3jv8b1dm2f60md5"; + libraryHaskellDepends = [ + aeson + base + megaparsec + parser-combinators text - transformers + uuid ]; testHaskellDepends = [ + aeson base - bytestring - case-insensitive - containers hspec - hspec-megaparsec megaparsec - mtl + parser-combinators QuickCheck - scientific - temporary text - transformers + uuid ]; - testToolDepends = [ hspec-discover ]; - description = "Test utilities and the test suite of Megaparsec"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; + description = "Parsers and utilities for the Megaparsec library"; + license = lib.licenses.gpl3Only; } ) { }; @@ -443312,67 +442362,6 @@ self: { ) { }; mem-info = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - directory, - filepath, - fmt, - genvalidity, - genvalidity-hspec, - genvalidity-text, - hashable, - hspec, - optparse-applicative, - QuickCheck, - text, - unix, - validity, - validity-text, - }: - mkDerivation { - pname = "mem-info"; - version = "0.3.1.0"; - sha256 = "032r34swgdmb6xh3ralcpb0223i2gqfixxgly7v9da0w76cj6g7y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bytestring - containers - directory - filepath - fmt - hashable - optparse-applicative - text - unix - validity - validity-text - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base - fmt - genvalidity - genvalidity-hspec - genvalidity-text - hashable - hspec - optparse-applicative - QuickCheck - text - unix - ]; - description = "Print the core memory usage of programs"; - license = lib.licenses.bsd3; - mainProgram = "printmem"; - } - ) { }; - - mem-info_0_4_1_1 = callPackage ( { mkDerivation, base, @@ -443436,7 +442425,6 @@ self: { ]; description = "Print the core memory usage of programs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "printmem"; } ) { }; @@ -445616,6 +444604,7 @@ self: { ]; description = "A simple tcp and udp socket server framework"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -445653,6 +444642,7 @@ self: { ]; description = "Socket transport for metro"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -445692,6 +444682,7 @@ self: { ]; description = "Crypto transport for metro"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -445750,6 +444741,7 @@ self: { ]; description = "Websockets transport for metro"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -445773,6 +444765,7 @@ self: { ]; description = "XOR transport for metro"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -446101,42 +445094,32 @@ self: { bytestring, containers, deepseq, - fail, - QuickCheck, quickcheck-instances, tasty, tasty-quickcheck, text, - unordered-containers, vector, }: mkDerivation { pname = "microaeson"; - version = "0.1.0.2"; - sha256 = "025vnzs4j2nmkin5x8h5hbrj25spamqppg68wfqlnbrr1519lxfz"; - revision = "2"; - editedCabalFile = "04kq6sh1fl0xgkai0d055s7hkwf21vlksgqizh4xfvsb2xbakgiz"; + version = "0.1.0.3"; + sha256 = "04sngljny67zcs4271b4f1yvcjlahmn55yh30nwjpmwjybwahg66"; libraryHaskellDepends = [ array base bytestring containers deepseq - fail text ]; libraryToolDepends = [ alex ]; testHaskellDepends = [ aeson base - bytestring containers - QuickCheck quickcheck-instances tasty tasty-quickcheck - text - unordered-containers vector ]; description = "A tiny JSON library with light dependency footprint"; @@ -446303,8 +445286,8 @@ self: { }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.2.2"; - sha256 = "0r1j0ky2kqc1qkvdhmcxxjwc7gplmsr0pdra2fc0xb0k7ccb2hvc"; + version = "1.0.2.3"; + sha256 = "0b2cvf8z8hylgcmxfql9rchkfi4cnhjzy3awv6jrjy6gzyq3y9kr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -446354,8 +445337,6 @@ self: { ]; description = "A Microformats 2 parser"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -446415,20 +445396,6 @@ self: { ) { }; microlens = callPackage ( - { mkDerivation, base }: - mkDerivation { - pname = "microlens"; - version = "0.4.13.1"; - sha256 = "1z6ph89sgdhgdf8sqaw9g978mlnvlc4k8y50pssaxxplizpanm0a"; - revision = "1"; - editedCabalFile = "07d5lm0p98aly7wfm1ishm8dy6ccgg2mklrxkgry9s3qblmnw9gw"; - libraryHaskellDepends = [ base ]; - description = "A tiny lens library with no dependencies"; - license = lib.licenses.bsd3; - } - ) { }; - - microlens_0_4_14_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "microlens"; @@ -446437,7 +445404,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -446530,33 +445496,6 @@ self: { ) { }; microlens-ghc = callPackage ( - { - mkDerivation, - array, - base, - bytestring, - containers, - microlens, - transformers, - }: - mkDerivation { - pname = "microlens-ghc"; - version = "0.4.14.3"; - sha256 = "13sczn286n6yjjhnf3nsjq1l43rgxawr61ma1f4pmwd4aj1ihdcp"; - libraryHaskellDepends = [ - array - base - bytestring - containers - microlens - transformers - ]; - description = "microlens + array, bytestring, containers, transformers"; - license = lib.licenses.bsd3; - } - ) { }; - - microlens-ghc_0_4_15_1 = callPackage ( { mkDerivation, array, @@ -446580,38 +445519,10 @@ self: { ]; description = "microlens + array, bytestring, containers, transformers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; microlens-mtl = callPackage ( - { - mkDerivation, - base, - microlens, - mtl, - transformers, - transformers-compat, - }: - mkDerivation { - pname = "microlens-mtl"; - version = "0.2.0.3"; - sha256 = "1ilz0zyyk9f6h97gjsaqq65njfs23fk3wxhigvj4z0brf7rnlssd"; - revision = "1"; - editedCabalFile = "0xw3hjsfdg0hz12bk9yh2zqs2xi4jxaspwkd968ajxq13rmygxlj"; - libraryHaskellDepends = [ - base - microlens - mtl - transformers - transformers-compat - ]; - description = "microlens support for Reader/Writer/State from mtl"; - license = lib.licenses.bsd3; - } - ) { }; - - microlens-mtl_0_2_1_0 = callPackage ( { mkDerivation, base, @@ -446633,44 +445544,10 @@ self: { ]; description = "microlens support for Reader/Writer/State from mtl"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; microlens-platform = callPackage ( - { - mkDerivation, - base, - hashable, - microlens, - microlens-ghc, - microlens-mtl, - microlens-th, - text, - unordered-containers, - vector, - }: - mkDerivation { - pname = "microlens-platform"; - version = "0.4.3.6"; - sha256 = "0bbskwm9lh2lmk54a0hwc4aq9fpw4zpq5089nd7w2w0m9rny9jka"; - libraryHaskellDepends = [ - base - hashable - microlens - microlens-ghc - microlens-mtl - microlens-th - text - unordered-containers - vector - ]; - description = "microlens + all batteries included (best for apps)"; - license = lib.licenses.bsd3; - } - ) { }; - - microlens-platform_0_4_4_1 = callPackage ( { mkDerivation, base, @@ -446700,7 +445577,6 @@ self: { ]; description = "microlens + all batteries included (best for apps)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -447304,6 +446180,8 @@ self: { ]; description = "Utility functions for processing MIDI files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -447844,8 +446722,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "High performance web server on WAI/warp"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.sternenseemann ]; } ) { }; @@ -448494,6 +447371,8 @@ self: { ]; description = "Double-ended priority queues"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -449632,16 +448511,16 @@ self: { mkDerivation, async, base, + system-cxx-std-lib, }: mkDerivation { pname = "minisat"; - version = "0.1.3"; - sha256 = "172l1zn3ls0s55llnp4z1kgf388bs5vq4a8qys2x7dqk9zmgpbqb"; - revision = "1"; - editedCabalFile = "1h5p30fmkgn8d2rl9cjd7ggwph2bhhiziz9zdi5caasnklsr1cvk"; + version = "0.1.4"; + sha256 = "0v696v733hvllp2gfa9dp0nsw8d1836wjdirih912zap4igralfq"; libraryHaskellDepends = [ async base + system-cxx-std-lib ]; description = "A Haskell bundle of the Minisat SAT solver"; license = lib.licenses.bsd3; @@ -451880,6 +450759,35 @@ self: { } ) { }; + mmzk-env = callPackage ( + { + mkDerivation, + base, + containers, + gigaparsec, + hspec, + }: + mkDerivation { + pname = "mmzk-env"; + version = "0.1.0.0"; + sha256 = "1lrm2cp0xl5qbas91rij940c169jv29n2iyjv6nx2873yqa3ig37"; + libraryHaskellDepends = [ + base + containers + gigaparsec + ]; + testHaskellDepends = [ + base + containers + gigaparsec + hspec + ]; + description = "Read environment variables into a user-defined data type"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + mmzk-typeid = callPackage ( { mkDerivation, @@ -452282,8 +451190,8 @@ self: { }: mkDerivation { pname = "mod"; - version = "0.2.0.1"; - sha256 = "0wp8623f8i10l73yagnz0ivyfm35j08jkw3xsly0jic5x3jghqra"; + version = "0.2.1.0"; + sha256 = "1fgkiczhvn2w23jyn571c5cbhnl3v1yhai9sfqg0brxrba7kqjyq"; libraryHaskellDepends = [ base deepseq @@ -453948,35 +452856,6 @@ self: { ) { }; monad-chronicle = callPackage ( - { - mkDerivation, - base, - data-default-class, - mtl, - semigroupoids, - these, - transformers, - transformers-compat, - }: - mkDerivation { - pname = "monad-chronicle"; - version = "1.0.2"; - sha256 = "1mmp2r75b3j9l0rvxjvl1znlr7x4d8baj6ykffdsbnf9v59h0dcx"; - libraryHaskellDepends = [ - base - data-default-class - mtl - semigroupoids - these - transformers - transformers-compat - ]; - description = "These as a transformer, ChronicleT"; - license = lib.licenses.bsd3; - } - ) { }; - - monad-chronicle_1_1 = callPackage ( { mkDerivation, base, @@ -454000,7 +452879,6 @@ self: { ]; description = "These as a transformer, ChronicleT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -454786,8 +453664,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.4.1.3"; - sha256 = "13w60v9kadvdcvwf5p376yvxsf7ifh86b94z0hyzvrq0l4d9p73v"; + version = "0.4.1.4"; + sha256 = "0gfzp22c4my130wxk1q9xzigl7kn30f203f7d53mgcrmg43kvnbq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -454821,7 +453699,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "JSON logging using monad-logger interface"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "readme-example"; + broken = true; } ) { }; @@ -456823,43 +455703,6 @@ self: { ) { }; monadology = callPackage ( - { - mkDerivation, - base, - constraints, - invariant, - tasty, - tasty-hunit, - text, - transformers, - type-rig, - witness, - }: - mkDerivation { - pname = "monadology"; - version = "0.3"; - sha256 = "1nfx9hl6vimqwr7dv3nlvf0c5brjppznjzrqr0kqdxjz7mvjmvy1"; - libraryHaskellDepends = [ - base - constraints - invariant - transformers - type-rig - witness - ]; - testHaskellDepends = [ - base - tasty - tasty-hunit - text - transformers - ]; - description = "The best ideas in monad-related classes and types"; - license = lib.licenses.bsd2; - } - ) { }; - - monadology_0_4 = callPackage ( { mkDerivation, base, @@ -456892,7 +455735,6 @@ self: { ]; description = "The best ideas in monad-related classes and types"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -457593,6 +456435,8 @@ self: { ]; description = "Type-classes for interacting with monomorphic containers with a key"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -457677,34 +456521,6 @@ self: { ) { }; monoid-extras = callPackage ( - { - mkDerivation, - base, - criterion, - groups, - semigroupoids, - semigroups, - }: - mkDerivation { - pname = "monoid-extras"; - version = "0.6.5"; - sha256 = "00snvxpah65dx14652dljfz8xyv1dijm38yhx81pjzz8qzsnk14f"; - libraryHaskellDepends = [ - base - groups - semigroupoids - ]; - benchmarkHaskellDepends = [ - base - criterion - semigroups - ]; - description = "Various extra monoid-related definitions and utilities"; - license = lib.licenses.bsd3; - } - ) { }; - - monoid-extras_0_7 = callPackage ( { mkDerivation, base, @@ -457729,7 +456545,6 @@ self: { ]; description = "Various extra monoid-related definitions and utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -457856,6 +456671,8 @@ self: { ]; description = "Monoids for calculation of statistics of sample"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -458012,69 +456829,6 @@ self: { ) { }; monoidmap = callPackage ( - { - mkDerivation, - base, - containers, - deepseq, - groups, - hspec, - hspec-discover, - monoid-subclasses, - nothunks, - pretty-show, - QuickCheck, - quickcheck-classes, - quickcheck-groups, - quickcheck-monoid-subclasses, - quickcheck-quid, - tasty-bench, - tasty-hunit, - text, - }: - mkDerivation { - pname = "monoidmap"; - version = "0.0.4.3"; - sha256 = "1f8fk22l1929ryb672db3z0jqgm7nkpm0mqk6a0g1wl5nm5swwmq"; - libraryHaskellDepends = [ - base - containers - deepseq - groups - monoid-subclasses - nothunks - ]; - testHaskellDepends = [ - base - containers - groups - hspec - monoid-subclasses - pretty-show - QuickCheck - quickcheck-classes - quickcheck-groups - quickcheck-monoid-subclasses - quickcheck-quid - text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base - containers - deepseq - tasty-bench - tasty-hunit - ]; - doHaddock = false; - description = "Monoidal map type"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; - } - ) { }; - - monoidmap_0_0_4_4 = callPackage ( { mkDerivation, base, @@ -458100,8 +456854,6 @@ self: { ]; description = "Monoidal map type"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -458148,7 +456900,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "JSON support for monoidmap"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -458182,7 +456933,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Examples for monoidmap"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -458268,7 +457018,6 @@ self: { ]; description = "QuickCheck support for monoidmap"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -458457,6 +457206,7 @@ self: { ]; description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "dev-test-app"; } ) { inherit (pkgs) glew; }; @@ -458559,6 +457309,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A datagrid widget for the Monomer library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -458809,8 +457560,6 @@ self: { ]; description = "MonthName"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -459838,6 +458587,7 @@ self: { ]; description = "Morpheus GraphQL"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -460101,7 +458851,9 @@ self: { ]; description = "Morpheus GraphQL CLI"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "morpheus"; + broken = true; } ) { }; @@ -461673,6 +460425,7 @@ self: { ]; description = "Datastructures to describe TCP and MPTCP connections"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -463395,6 +462148,25 @@ self: { } ) { }; + mtl-mhs = callPackage ( + { + mkDerivation, + base, + transformers, + }: + mkDerivation { + pname = "mtl-mhs"; + version = "2.3.1"; + sha256 = "15hxl9n6lb4d4cn5wgkhy6yya1haq3f69l6klbjmwajhb7wlx8pd"; + libraryHaskellDepends = [ + base + transformers + ]; + description = "Monad classes for transformers, using functional dependencies"; + license = lib.licenses.bsd3; + } + ) { }; + mtl-misc-yj = callPackage ( { mkDerivation, @@ -464486,6 +463258,8 @@ self: { pname = "muesli"; version = "0.1.1.0"; sha256 = "0cysqy3g9zgvbzj9gnwlpqk63inkm26dvhhqx8qlzp1lan6f125w"; + revision = "1"; + editedCabalFile = "05gfs4lh5qm5sy7swdgf4qq3bfyc4b2n90jf17xiswaw3w1spwqg"; libraryHaskellDepends = [ base bytestring @@ -464761,6 +463535,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A few multimap variants"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -466134,6 +464910,40 @@ self: { } ) { Vector = null; }; + multiverse-debugging = callPackage ( + { + mkDerivation, + base, + containers, + haskeline, + }: + mkDerivation { + pname = "multiverse-debugging"; + version = "0.2.0.1"; + sha256 = "1hkjiqikg27s2azh76klg2j85y7nfxqgn1r8jxn2xm2h20kak0jv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + haskeline + ]; + executableHaskellDepends = [ + base + containers + haskeline + ]; + testHaskellDepends = [ + base + containers + haskeline + ]; + description = "A framework for multiverse debugging"; + license = lib.licenses.bsd3; + mainProgram = "multiverse-debugging-exe"; + } + ) { }; + multiwalk = callPackage ( { mkDerivation, @@ -466252,7 +465062,6 @@ self: { ]; description = "MUtually Recursive Definitions Explicitly Represented"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -467914,6 +466723,7 @@ self: { ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -468711,7 +467521,6 @@ self: { bytestring, bytestring-lexing, case-insensitive, - containers, criterion, crypton, crypton-x509, @@ -468732,6 +467541,7 @@ self: { scanner, scientific, tasty, + tasty-expected-failure, tasty-hunit, tasty-quickcheck, text, @@ -468743,8 +467553,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "1.1.6"; - sha256 = "1dzin4xk5d6dn1grqh6dagmcwj2q1rycxfsi2l23kbapm26a7m0b"; + version = "1.1.7"; + sha256 = "0798v6ybbknfp0xxq8wc8ladisrnnn8yhh1k6z5ya62gppp5v48m"; libraryHaskellDepends = [ base binary @@ -468774,8 +467584,6 @@ self: { base binary bytestring - bytestring-lexing - containers deepseq directory filepath @@ -468785,6 +467593,7 @@ self: { quickcheck-instances scientific tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text @@ -470228,6 +469037,7 @@ self: { ]; description = "A parameterized named text type and associated functionality"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -470525,17 +469335,14 @@ self: { criterion, nanomsg, QuickCheck, - test-framework, - test-framework-quickcheck2, - test-framework-th, + tasty, + tasty-quickcheck, zeromq4-haskell, }: mkDerivation { pname = "nanomsg-haskell"; - version = "0.2.4"; - sha256 = "00941a7vp6y4gzxpjlr4516ic96l5892w0akqajq3jyh5601jqg3"; - revision = "1"; - editedCabalFile = "02ahbmda51j7ayvda9nwvkbw8wnd1gm9kqa3lqdqh8s587wl4wm7"; + version = "0.2.5"; + sha256 = "17qqb9bqjzl8whylwc784ksv69zw5dyx5gvjjjfi68qnafx9fka5"; libraryHaskellDepends = [ base binary @@ -470544,12 +469351,10 @@ self: { librarySystemDepends = [ nanomsg ]; testHaskellDepends = [ base - binary bytestring QuickCheck - test-framework - test-framework-quickcheck2 - test-framework-th + tasty + tasty-quickcheck ]; benchmarkHaskellDepends = [ base @@ -470559,8 +469364,6 @@ self: { ]; description = "Bindings to the nanomsg library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) nanomsg; }; @@ -470735,6 +469538,8 @@ self: { ]; description = "Haskell bindings for nanovg"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { @@ -470959,6 +469764,8 @@ self: { ]; description = "Refinement types for natural numbers with an optics interface"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -472274,8 +471081,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Nerd Font Icons for use in haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -472885,6 +471690,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -472919,6 +471726,7 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -472966,6 +471774,7 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "mqtt-rpc"; } ) { }; @@ -473739,8 +472548,8 @@ self: { }: mkDerivation { pname = "netrc"; - version = "0.2.0.1"; - sha256 = "0scp0y4l5cmj8jkf64rjd0sw51nv8ndk43fg6fwkij37z7pcy42l"; + version = "0.2.0.2"; + sha256 = "0dhy1l41yprqn0n6m0gy8aqj2byxjq0qqlap66zvz14kczj7ly5w"; libraryHaskellDepends = [ base bytestring @@ -474235,8 +473044,8 @@ self: { }: mkDerivation { pname = "network"; - version = "3.2.7.0"; - sha256 = "12vjx5nr65x7wz5napj85cvp60l8rh4gwcqc4fdw18rj0rk8wm38"; + version = "3.2.8.0"; + sha256 = "1j2zbjqpnrwkhi5673by8z1dp92mh3glik8a4r7jcxvxxdg8wy2i"; libraryHaskellDepends = [ base bytestring @@ -476696,6 +475505,45 @@ self: { } ) { }; + network-wait_0_4_0_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + exceptions, + network, + network-simple, + retry, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "network-wait"; + version = "0.4.0.0"; + sha256 = "16pc8d6byma1srkljz02wbp0kwfskybq0d1rb01q3c17l0dqqp61"; + libraryHaskellDepends = [ + base + bytestring + exceptions + network + retry + ]; + testHaskellDepends = [ + base + bytestring + exceptions + network + network-simple + retry + tasty + tasty-hunit + ]; + description = "Lightweight library for waiting on networked services to become available"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + network-websocket = callPackage ( { mkDerivation, @@ -477613,8 +476461,8 @@ self: { pname = "newtype-generics"; version = "0.6.2"; sha256 = "0km7cp041bgdgrxrbrawz611mcylxp943880a2yg228a09961b51"; - revision = "4"; - editedCabalFile = "1489zmir2l591y7k9rik6khj6vf9zjnkxyhnpmpr4djpdzk6pcin"; + revision = "5"; + editedCabalFile = "0arlqrq482ai3j6cwgb8kc34zc8y3ghg8fgrxxcnw752hzrl1g71"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -478843,8 +477691,8 @@ self: { pname = "nix-derivation"; version = "1.1.3"; sha256 = "11drhg3zjhwbvdw25k0icvbkcpqilx0m9qw60k7snfaz1iadfkdb"; - revision = "1"; - editedCabalFile = "1w84h665dls927g1zwzyfp91jyk97dy0ccii8m07y1prp007ccxa"; + revision = "2"; + editedCabalFile = "0vh21lq7wishsv6wysi1yrmij1iq7kafyrv02nr06sdgfwh0vzan"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -478917,6 +477765,8 @@ self: { pname = "nix-diff"; version = "1.0.21"; sha256 = "0c9v9n75p1zfr546l2h2n0d42whyr1xm5whq86a22inmjqrbbq4y"; + revision = "1"; + editedCabalFile = "0j7xk1v0rq7k3d0yh02173nilws6iwrbgkn134px84rn9fcwq3vg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -479293,8 +478143,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.7.2.1"; - sha256 = "0j31dl1jv1219cpbgp2gixqdhpdgxi19gvlwbf9wamxwbdiml133"; + version = "0.7.2.2"; + sha256 = "1p78bvj7d8by69bnfma9lgj58vd6r471cr40v097hl4l3y9a6am7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -479592,6 +478442,8 @@ self: { pname = "nixfmt"; version = "0.6.0"; sha256 = "0jgg8cp2q6ip15cjw10zk2ff4avqc5nwd8amkrrqm0zka41pc0jz"; + revision = "1"; + editedCabalFile = "0bfc9pg4s6xhq2spm32xxg9ivmrcbang4pm62wwkq8rhby6yszwr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -481357,12 +480209,16 @@ self: { hspec, hspec-core, hspec-discover, + template-haskell, }: mkDerivation { pname = "nonempty-wrapper"; - version = "0.1.0.0"; - sha256 = "057c0ry3p4z1x2br6v5gm4c044i0z868kk5jihyf8s0r821zfzxj"; - libraryHaskellDepends = [ base ]; + version = "0.1.1.0"; + sha256 = "0pd8hid5a7m7v7vgcf0gvp2321aim03jq57pcgpj5v99lf3545cg"; + libraryHaskellDepends = [ + base + template-haskell + ]; testHaskellDepends = [ base hspec @@ -481388,8 +480244,8 @@ self: { }: mkDerivation { pname = "nonempty-wrapper-aeson"; - version = "0.1.0.0"; - sha256 = "0qg0xl93vl4nkm2aqsfqnwgk7vsaxvbib302n4ap6m5vks84b8fg"; + version = "0.1.0.1"; + sha256 = "0rc78k8mig3l2s7xzr71rnsf795q0p3f2nmdi9gnf5s1v77rli5i"; libraryHaskellDepends = [ aeson base @@ -481419,8 +480275,8 @@ self: { }: mkDerivation { pname = "nonempty-wrapper-quickcheck"; - version = "0.1.0.0"; - sha256 = "1k0bb0ir5k9cmgv261s1l86yd0sfrl0m9h0dfc2qhq9qzz9k2lvz"; + version = "0.1.0.1"; + sha256 = "1c86ggam7ay381cw5yhi74bbab5nmm0vjd0xg25m5as87agycj7k"; libraryHaskellDepends = [ base nonempty-wrapper @@ -481441,8 +480297,8 @@ self: { }: mkDerivation { pname = "nonempty-wrapper-text"; - version = "0.1.0.0"; - sha256 = "1v2my0dcy7frmnnhf46rqsiqi5mfsk7d1fi28agcg9qva73qiw4q"; + version = "0.1.1.0"; + sha256 = "04g43biz6vc8d6b61p53xs02vs2jwk216sn2clzkaljzmljzcycl"; libraryHaskellDepends = [ base bytestring @@ -481983,10 +480839,10 @@ self: { }: mkDerivation { pname = "nothunks"; - version = "0.3.0.0"; - sha256 = "0fnwad49mv0q46wrnapkqh4hm4rm43gw0papppqrg0z96r658yc4"; + version = "0.3.1"; + sha256 = "0pcpgv4pp0likra1rxyf70w48qn0nyqqghagym1x73j4zr9gk0rp"; revision = "1"; - editedCabalFile = "08w1sgh8z7i24623bx7lkhap80zmfhs4kfxgylsvz0zb8hbg7gvp"; + editedCabalFile = "1qsabpyjcwkm75jh7pa6yv2aza0z50rpn0q27sxjxmhw1gbv0rja"; libraryHaskellDepends = [ base bytestring @@ -484368,30 +483224,8 @@ self: { }: mkDerivation { pname = "numhask"; - version = "0.12.1.0"; - sha256 = "1709f96j4jk81cqadb2lngr35j7jv7rixjx1i7qcccqr80dxhbq6"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base - doctest-parallel - QuickCheck - ]; - description = "A numeric class hierarchy"; - license = lib.licenses.bsd3; - } - ) { }; - - numhask_0_13_0_0 = callPackage ( - { - mkDerivation, - base, - doctest-parallel, - QuickCheck, - }: - mkDerivation { - pname = "numhask"; - version = "0.13.0.0"; - sha256 = "13174w30c9pmmfjc5gn9yfzvlyr6ljm0diyh0q0gysiq0wspx2ni"; + version = "0.13.1.0"; + sha256 = "0l326qwhra12ryjq9xmssl6pphfa4c5rhhbg1rm47rklclahwcy5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -484400,7 +483234,6 @@ self: { ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -484426,6 +483259,8 @@ self: { ]; description = "Multi-dimensional arrays"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -484594,43 +483429,6 @@ self: { ) { }; numhask-space = callPackage ( - { - mkDerivation, - adjunctions, - base, - containers, - distributive, - numhask, - random, - semigroupoids, - tdigest, - text, - time, - vector, - }: - mkDerivation { - pname = "numhask-space"; - version = "0.11.1.0"; - sha256 = "0hl6f91c86i0yv9pv97m4kqyx3mb6kzixcxianxvgmv10gbn2c82"; - libraryHaskellDepends = [ - adjunctions - base - containers - distributive - numhask - random - semigroupoids - tdigest - text - time - vector - ]; - description = "Numerical spaces"; - license = lib.licenses.bsd3; - } - ) { }; - - numhask-space_0_13_0_0 = callPackage ( { mkDerivation, adjunctions, @@ -484647,8 +483445,8 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.13.0.0"; - sha256 = "0nhjj99b170axz8fncxvsshxvf9z57gyas2qnwyr53kawandl49j"; + version = "0.13.1.0"; + sha256 = "145jb3vcy1n1i0xfhsnz4bm9fl2wnvikrazavv6x5yxjnba1m24m"; libraryHaskellDepends = [ adjunctions base @@ -484667,7 +483465,6 @@ self: { ]; description = "Numerical spaces"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -484833,7 +483630,9 @@ self: { text ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "nuxeo"; + broken = true; } ) { }; @@ -485532,7 +484331,9 @@ self: { ]; description = "Type-safe time library"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "play-o-clock"; + broken = true; } ) { }; @@ -486124,7 +484925,6 @@ self: { doHaddock = false; description = "Oberon0 Compiler"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -487081,10 +485881,8 @@ self: { }: mkDerivation { pname = "ods2csv"; - version = "0.1.0.1"; - sha256 = "1a1qrknqh24hgv5v46vnxnaqcnx3n92rcwgh3b6h6k27kassx4xa"; - revision = "1"; - editedCabalFile = "0sb7k4sw64ld5jdsx1g522q911d4z9c92mh0vfjb0p7h4r1h71hm"; + version = "0.1.0.2"; + sha256 = "0smbbyn74khs1ldfh7cax7drhv383pyfq1j5ljwzlx3fj5b0hlh1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -487281,6 +486079,50 @@ self: { } ) { }; + ogma-cli_1_9_0 = callPackage ( + { + mkDerivation, + aeson, + base, + HUnit, + microstache, + ogma-core, + optparse-applicative, + process, + test-framework, + test-framework-hunit, + text, + unix, + }: + mkDerivation { + pname = "ogma-cli"; + version = "1.9.0"; + sha256 = "0br6rv5bli12xhbr8igxgwrp3j4cbm8mxqhva6mxykg6s2s19wab"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson + base + microstache + ogma-core + optparse-applicative + text + ]; + testHaskellDepends = [ + base + HUnit + process + test-framework + test-framework-hunit + unix + ]; + description = "Ogma: Helper tool to interoperate between Copilot and other languages"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + mainProgram = "ogma"; + } + ) { }; + ogma-core = callPackage ( { mkDerivation, @@ -487353,6 +486195,79 @@ self: { } ) { }; + ogma-core_1_9_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + directory, + filepath, + graphviz, + HUnit, + megaparsec, + mtl, + ogma-extra, + ogma-language-c, + ogma-language-copilot, + ogma-language-csv, + ogma-language-jsonspec, + ogma-language-lustre, + ogma-language-smv, + ogma-language-xlsx, + ogma-language-xmlspec, + ogma-spec, + process, + QuickCheck, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + text, + }: + mkDerivation { + pname = "ogma-core"; + version = "1.9.0"; + sha256 = "1nh0qnb84sy0qwks1fpyvz7i7sini5sqk1a7na82axw5jkhjdhrg"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + directory + filepath + graphviz + megaparsec + mtl + ogma-extra + ogma-language-c + ogma-language-copilot + ogma-language-csv + ogma-language-jsonspec + ogma-language-lustre + ogma-language-smv + ogma-language-xlsx + ogma-language-xmlspec + ogma-spec + process + text + ]; + testHaskellDepends = [ + base + directory + HUnit + QuickCheck + test-framework + test-framework-hunit + test-framework-quickcheck2 + ]; + description = "Ogma: Helper tool to interoperate between Copilot and other languages"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-extra = callPackage ( { mkDerivation, @@ -487393,6 +486308,47 @@ self: { } ) { }; + ogma-extra_1_9_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + Cabal, + directory, + filepath, + microstache, + QuickCheck, + test-framework, + test-framework-quickcheck2, + text, + }: + mkDerivation { + pname = "ogma-extra"; + version = "1.9.0"; + sha256 = "0cl4gfkkms75p1yl137dlpfivqqgc491dmh55iwagqszkgaix0lg"; + libraryHaskellDepends = [ + aeson + base + bytestring + Cabal + directory + filepath + microstache + text + ]; + testHaskellDepends = [ + base + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "Ogma: Helper tool to interoperate between Copilot and other languages"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-language-c = callPackage ( { mkDerivation, @@ -487436,6 +486392,50 @@ self: { } ) { }; + ogma-language-c_1_9_0 = callPackage ( + { + mkDerivation, + alex, + array, + base, + BNFC, + Cabal, + happy, + process, + QuickCheck, + test-framework, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "ogma-language-c"; + version = "1.9.0"; + sha256 = "1s6acmdbvqzhdjd67vlsc0y5ld4s7z0w5g35ka3d6sqk4sj0j795"; + setupHaskellDepends = [ + base + Cabal + process + ]; + libraryHaskellDepends = [ + array + base + ]; + libraryToolDepends = [ + alex + BNFC + happy + ]; + testHaskellDepends = [ + base + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "Ogma: Runtime Monitor translator: C Language Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-language-cocospec = callPackage ( { mkDerivation, @@ -487487,6 +486487,19 @@ self: { } ) { }; + ogma-language-copilot_1_9_0 = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "ogma-language-copilot"; + version = "1.9.0"; + sha256 = "0sl2n2m1nkllmzrb2av6s1q1iq7jz9zrjh5mxczriwk3c1jv7x2c"; + libraryHaskellDepends = [ base ]; + description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-language-csv = callPackage ( { mkDerivation, @@ -487516,6 +486529,36 @@ self: { } ) { }; + ogma-language-csv_1_9_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + cassava, + mtl, + ogma-spec, + text, + vector, + }: + mkDerivation { + pname = "ogma-language-csv"; + version = "1.9.0"; + sha256 = "0mkkbgia5dvnpqy11pqxvikjvgck0zq7cx1alnsh6hi9j1qj75ad"; + libraryHaskellDepends = [ + base + bytestring + cassava + mtl + ogma-spec + text + vector + ]; + description = "Ogma: Runtime Monitor translator: CSV Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-language-fret-cs = callPackage ( { mkDerivation, @@ -487621,6 +486664,38 @@ self: { } ) { }; + ogma-language-jsonspec_1_9_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + jsonpath, + megaparsec, + mtl, + ogma-spec, + text, + }: + mkDerivation { + pname = "ogma-language-jsonspec"; + version = "1.9.0"; + sha256 = "0wlkl13gg0jbi8fvszk4z1l0c4l7b0n68gnhnmn93srcn14iinkn"; + libraryHaskellDepends = [ + aeson + base + bytestring + jsonpath + megaparsec + mtl + ogma-spec + text + ]; + description = "Ogma: Runtime Monitor translator: JSON Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-language-lustre = callPackage ( { mkDerivation, @@ -487664,6 +486739,50 @@ self: { } ) { }; + ogma-language-lustre_1_9_0 = callPackage ( + { + mkDerivation, + alex, + array, + base, + BNFC, + Cabal, + happy, + process, + QuickCheck, + test-framework, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "ogma-language-lustre"; + version = "1.9.0"; + sha256 = "0rb22md683flgxkg08jzga4q7fynykzh25k1gcr6rsj0kaaxi4fj"; + setupHaskellDepends = [ + base + Cabal + process + ]; + libraryHaskellDepends = [ + array + base + ]; + libraryToolDepends = [ + alex + BNFC + happy + ]; + testHaskellDepends = [ + base + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "Ogma: Runtime Monitor translator: Lustre Language Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-language-smv = callPackage ( { mkDerivation, @@ -487707,6 +486826,50 @@ self: { } ) { }; + ogma-language-smv_1_9_0 = callPackage ( + { + mkDerivation, + alex, + array, + base, + BNFC, + Cabal, + happy, + process, + QuickCheck, + test-framework, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "ogma-language-smv"; + version = "1.9.0"; + sha256 = "15dsh5j6iaapaxi6i05z44shvbxvs5945r93046d6shxvxz5q5gb"; + setupHaskellDepends = [ + base + Cabal + process + ]; + libraryHaskellDepends = [ + array + base + ]; + libraryToolDepends = [ + alex + BNFC + happy + ]; + testHaskellDepends = [ + base + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "Ogma: Runtime Monitor translator: SMV Language Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-language-xlsx = callPackage ( { mkDerivation, @@ -487732,6 +486895,32 @@ self: { } ) { }; + ogma-language-xlsx_1_9_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + ogma-spec, + text, + xlsx, + }: + mkDerivation { + pname = "ogma-language-xlsx"; + version = "1.9.0"; + sha256 = "191s4kc2gicgrdl3jzw9j31l0yncaradii2vz7h3gqg2rz63qfsv"; + libraryHaskellDepends = [ + base + bytestring + ogma-spec + text + xlsx + ]; + description = "Ogma: Runtime Monitor translator: XLSX Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-language-xmlspec = callPackage ( { mkDerivation, @@ -487761,6 +486950,36 @@ self: { } ) { }; + ogma-language-xmlspec_1_9_0 = callPackage ( + { + mkDerivation, + base, + hxt, + hxt-regex-xmlschema, + hxt-xpath, + mtl, + ogma-spec, + pretty, + }: + mkDerivation { + pname = "ogma-language-xmlspec"; + version = "1.9.0"; + sha256 = "07cp3d543pnbmb7qma8l9v1zfnh3nn41azl1clv8p9bsfgm5a86j"; + libraryHaskellDepends = [ + base + hxt + hxt-regex-xmlschema + hxt-xpath + mtl + ogma-spec + pretty + ]; + description = "Ogma: Runtime Monitor translator: XML Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogma-spec = callPackage ( { mkDerivation, base }: mkDerivation { @@ -487773,6 +486992,19 @@ self: { } ) { }; + ogma-spec_1_9_0 = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "ogma-spec"; + version = "1.9.0"; + sha256 = "1vg67wg2px1lp89m29h1dyy4cqgpxq5yfsdq6kg63b0i8dlv71g8"; + libraryHaskellDepends = [ base ]; + description = "Ogma: Runtime Monitor translator: JSON Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ogmarkup = callPackage ( { mkDerivation, @@ -488164,64 +487396,6 @@ self: { ) { }; ollama-haskell = callPackage ( - { - mkDerivation, - aeson, - base, - base64-bytestring, - bytestring, - containers, - directory, - filepath, - http-client, - http-types, - silently, - tasty, - tasty-hunit, - text, - time, - }: - mkDerivation { - pname = "ollama-haskell"; - version = "0.1.3.0"; - sha256 = "1ds9hkjhmkaw7mgxbpbq83df30iwjmnxi343f2sbm8xl8hhc8c1g"; - libraryHaskellDepends = [ - aeson - base - base64-bytestring - bytestring - containers - directory - filepath - http-client - http-types - text - time - ]; - testHaskellDepends = [ - aeson - base - base64-bytestring - bytestring - containers - directory - filepath - http-client - http-types - silently - tasty - tasty-hunit - text - time - ]; - description = "Haskell bindings for ollama"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - } - ) { }; - - ollama-haskell_0_2_0_0 = callPackage ( { mkDerivation, aeson, @@ -488285,8 +487459,6 @@ self: { ]; description = "Haskell client for ollama"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -488318,7 +487490,6 @@ self: { ]; description = "A typed-hole plugin that uses LLMs to generate valid hole-fits"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -488414,8 +487585,8 @@ self: { }: mkDerivation { pname = "om-doh"; - version = "0.1.0.3"; - sha256 = "0zk87kycigpzycrr898xgn5lzazmfcqcghf7qacj0cgzqsw62xww"; + version = "0.1.0.4"; + sha256 = "12n3qap371fkwdkpm4fjr42xqnfs3kk3pmikzxxkx9zfvxk7zw58"; libraryHaskellDepends = [ base base64 @@ -488449,8 +487620,8 @@ self: { }: mkDerivation { pname = "om-elm"; - version = "2.0.1.0"; - sha256 = "0gi6frmdlv2sqhy63jjvswiahppxmapsrf1z66y3hdxi8dwhv2gm"; + version = "2.0.1.1"; + sha256 = "0vxyy8izj5rdqr7hm690mph34ag111pynn5gfkvjkwyjnv3q39hz"; libraryHaskellDepends = [ base bytestring @@ -488597,6 +487768,69 @@ self: { } ) { }; + om-http_0_6_0_0 = callPackage ( + { + mkDerivation, + aeson, + async, + base, + base64, + bytestring, + case-insensitive, + containers, + directory, + filepath, + http-types, + mime-types, + monad-logger-aeson, + network, + om-show, + safe-exceptions, + servant, + template-haskell, + text, + time, + unix, + uuid, + wai, + warp, + }: + mkDerivation { + pname = "om-http"; + version = "0.6.0.0"; + sha256 = "05szwhsd4pyxnlq215n584hnxck09grsqypdh7im9gkfx8mmqxkg"; + libraryHaskellDepends = [ + aeson + async + base + base64 + bytestring + case-insensitive + containers + directory + filepath + http-types + mime-types + monad-logger-aeson + network + om-show + safe-exceptions + servant + template-haskell + text + time + unix + uuid + wai + warp + ]; + description = "Http utilities"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + om-http-logging = callPackage ( { mkDerivation, @@ -488707,8 +487941,8 @@ self: { }: mkDerivation { pname = "om-legion"; - version = "6.9.0.7"; - sha256 = "0cpmk7qi50d1az4sdq0qdishs7pp58pxv85mq3x8qmmrmiz4qs8l"; + version = "6.9.0.8"; + sha256 = "0n5angaqy7q4s2krapgvlwd5ss0j1xwrayfii3w75hfd65gw3frj"; libraryHaskellDepends = [ aeson async @@ -489229,6 +488463,8 @@ self: { ]; description = "HTML-parsing primitives for Parsec"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -489295,6 +488531,8 @@ self: { ]; description = "Pretty-printing short Aeson values as text"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -489800,8 +489038,10 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.5.0"; - sha256 = "0vp0k043a22l18hi54grn7drpp2486r43k90my59ymqyy79blh68"; + version = "0.10.7.0"; + sha256 = "0giy1g65lsvfhqqczxf0gqd4vbpb9n5van583jdlrd9w3vyf388b"; + revision = "1"; + editedCabalFile = "1mmbwdrslh4gfcc370cssv51yfjlfya9fwvxdh3254amzgh1232v"; libraryHaskellDepends = [ aeson base @@ -490171,27 +489411,6 @@ self: { ) { }; open-browser = callPackage ( - { - mkDerivation, - base, - process, - }: - mkDerivation { - pname = "open-browser"; - version = "0.2.1.1"; - sha256 = "013qjlvx2rm1hr907ls3wqw3av0alw8q7gql05bb2ccf4g1h3ay2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - process - ]; - description = "Open a web browser from Haskell"; - license = lib.licenses.bsd3; - } - ) { }; - - open-browser_0_4_0_0 = callPackage ( { mkDerivation, base, @@ -490209,7 +489428,6 @@ self: { ]; description = "Open a web browser from Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -490413,45 +489631,6 @@ self: { ) { }; open-witness = callPackage ( - { - mkDerivation, - base, - constraints, - hashable, - mtl, - random, - tasty, - tasty-hunit, - template-haskell, - transformers, - witness, - }: - mkDerivation { - pname = "open-witness"; - version = "0.6"; - sha256 = "0zysnzp7zdmv9d03xnlcqdsnwjrw934gkz6ngahwaqpbx4pp1zmb"; - libraryHaskellDepends = [ - base - constraints - hashable - random - template-haskell - transformers - witness - ]; - testHaskellDepends = [ - base - mtl - tasty - tasty-hunit - witness - ]; - description = "open witnesses"; - license = lib.licenses.bsd2; - } - ) { }; - - open-witness_0_7 = callPackage ( { mkDerivation, base, @@ -490485,7 +489664,6 @@ self: { ]; description = "open witnesses"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -490512,8 +489690,8 @@ self: { }: mkDerivation { pname = "openai"; - version = "1.1.0"; - sha256 = "1kja27qbdy5zxczswrn53k1lgxf2y9hw77pj4jlc7arkpl6nndai"; + version = "1.1.1"; + sha256 = "18ny5r06nfs7px4bgr9k930w1v5ksbzc1vslx75y4bb1lndg3ipd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -490523,6 +489701,7 @@ self: { containers filepath http-api-data + http-client http-client-tls servant servant-client @@ -490533,8 +489712,11 @@ self: { vector ]; executableHaskellDepends = [ + aeson base + bytestring text + vector ]; testHaskellDepends = [ aeson @@ -490549,7 +489731,6 @@ self: { description = "Servant bindings to OpenAI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "openai-example"; broken = true; } ) { }; @@ -491157,8 +490338,8 @@ self: { }: mkDerivation { pname = "opencascade-hs"; - version = "0.5.1.0"; - sha256 = "12c77xnh0h0h2sw23q5v891iddnmsq5j1853b90wypm6p18kpnsw"; + version = "0.6.0.0"; + sha256 = "0bi2hyz863hmrw06qjlxmwkncmzbqf5kq54cfy5ky2f3p8r0kdx9"; libraryHaskellDepends = [ base resourcet @@ -493773,57 +492954,6 @@ self: { ) { }; opt-env-conf = callPackage ( - { - mkDerivation, - aeson, - autodocodec, - autodocodec-nix, - autodocodec-schema, - autodocodec-yaml, - base, - containers, - hashable, - mtl, - path, - path-io, - safe-coloured-text, - safe-coloured-text-layout, - safe-coloured-text-terminfo, - selective, - text, - validity, - validity-containers, - }: - mkDerivation { - pname = "opt-env-conf"; - version = "0.8.0.0"; - sha256 = "0wfayv1k0xxl033knm4fjfc77ffijvh75xpg0g5f0bvc5i7kvgyc"; - libraryHaskellDepends = [ - aeson - autodocodec - autodocodec-nix - autodocodec-schema - autodocodec-yaml - base - containers - hashable - mtl - path - path-io - safe-coloured-text - safe-coloured-text-layout - safe-coloured-text-terminfo - selective - text - validity - validity-containers - ]; - description = "Settings parsing for Haskell: command-line arguments, environment variables, and configuration values"; - license = lib.licenses.lgpl3Only; - } - ) { }; - - opt-env-conf_0_9_0_0 = callPackage ( { mkDerivation, aeson, @@ -493871,7 +493001,6 @@ self: { ]; description = "Settings parsing for Haskell: command-line arguments, environment variables, and configuration values"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -494180,38 +493309,6 @@ self: { ) { }; optima = callPackage ( - { - mkDerivation, - attoparsec, - attoparsec-data, - base, - optparse-applicative, - rerebase, - text, - text-builder, - }: - mkDerivation { - pname = "optima"; - version = "0.4.0.5"; - sha256 = "0wdlnfl39zaq9mv7xxaljxq851hp4xzmblkfpfvg4qdfhk4hn7k6"; - libraryHaskellDepends = [ - attoparsec - attoparsec-data - base - optparse-applicative - text - text-builder - ]; - testHaskellDepends = [ - attoparsec-data - rerebase - ]; - description = "Simple command line interface arguments parser"; - license = lib.licenses.mit; - } - ) { }; - - optima_0_4_0_7 = callPackage ( { mkDerivation, attoparsec, @@ -494240,7 +493337,6 @@ self: { ]; description = "Simple command line interface arguments parser"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -494611,6 +493707,29 @@ self: { } ) { }; + optparse-applicative-dex = callPackage ( + { + mkDerivation, + base, + optparse-applicative, + prettyprinter, + text, + }: + mkDerivation { + pname = "optparse-applicative-dex"; + version = "1.0.1"; + sha256 = "0r3m43l21bn5j6sj2njkjjmh44xxnwhaah05h21866wr5vf82h0p"; + libraryHaskellDepends = [ + base + optparse-applicative + prettyprinter + text + ]; + description = "Extra functions for working with optparse-applicative"; + license = lib.licenses.isc; + } + ) { }; + optparse-applicative-simple = callPackage ( { mkDerivation, @@ -494710,8 +493829,8 @@ self: { pname = "optparse-generic"; version = "1.5.2"; sha256 = "0dca5q57jv4b8l1af4ywimaiw9rfrysambcghfmll4il5prm3d67"; - revision = "1"; - editedCabalFile = "190nlp7dh878232ia2nsl75q6bzr62szl1vcyinz528lmdbnbpdc"; + revision = "3"; + editedCabalFile = "0rmfwb4plak9vymdcf553ml7b5kpx81arjszwk4fsswx3mry6kif"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -495240,6 +494359,18 @@ self: { } ) { }; + ord-axiomata = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "ord-axiomata"; + version = "0.1.0.0"; + sha256 = "1fgzxlz2rynscnic1jawvrymhp70wxq04lpvp0ls84ky90zyzak8"; + libraryHaskellDepends = [ base ]; + description = "Axiomata & lemmata for easier use of Data.Type.Ord"; + license = lib.licenses.bsd3; + } + ) { }; + order-maintenance = callPackage ( { mkDerivation, @@ -495504,7 +494635,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert numbers to words in different languages"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ordinal"; + broken = true; } ) { }; @@ -496312,7 +495445,7 @@ self: { } ) { }; - ormolu = callPackage ( + ormolu_0_7_4_0 = callPackage ( { mkDerivation, ansi-terminal, @@ -496401,108 +495534,12 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; - mainProgram = "ormolu"; - } - ) { }; - - ormolu_0_7_7_0 = callPackage ( - { - mkDerivation, - ansi-terminal, - array, - base, - binary, - bytestring, - Cabal-syntax, - choice, - containers, - deepseq, - Diff, - directory, - file-embed, - filepath, - ghc-lib-parser, - hspec, - hspec-discover, - hspec-megaparsec, - megaparsec, - MemoTrie, - mtl, - optparse-applicative, - path, - path-io, - QuickCheck, - syb, - temporary, - text, - th-env, - }: - mkDerivation { - pname = "ormolu"; - version = "0.7.7.0"; - sha256 = "1069j7cldvqqazmfrpfc6wy816227c5vz7fbq860yfb5h9ycv5ns"; - revision = "1"; - editedCabalFile = "1v8n4kf8wskyizn868k1662rqsd8myhvrjkchb9hiysw9lgja79c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal - array - base - binary - bytestring - Cabal-syntax - choice - containers - deepseq - Diff - directory - file-embed - filepath - ghc-lib-parser - megaparsec - MemoTrie - mtl - syb - text - ]; - executableHaskellDepends = [ - base - Cabal-syntax - containers - directory - filepath - ghc-lib-parser - optparse-applicative - text - th-env - ]; - testHaskellDepends = [ - base - Cabal-syntax - choice - containers - directory - filepath - ghc-lib-parser - hspec - hspec-megaparsec - megaparsec - path - path-io - QuickCheck - temporary - text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "ormolu"; } ) { }; - ormolu_0_8_0_0 = callPackage ( + ormolu = callPackage ( { mkDerivation, ansi-terminal, @@ -496536,8 +495573,8 @@ self: { }: mkDerivation { pname = "ormolu"; - version = "0.8.0.0"; - sha256 = "1drs1ks12wcydpdk4px1bfd2397isds7w3blhf74jg8cqwbkzms9"; + version = "0.8.0.1"; + sha256 = "12ix16zvz0i1i8yyhbfbv4r0735r2i2darkbz3jh7lfd1fgh6zs3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -496592,7 +495629,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ormolu"; } ) { }; @@ -496613,8 +495649,8 @@ self: { }: mkDerivation { pname = "orthotope"; - version = "0.1.7.0"; - sha256 = "1ciii3sfs7zm22gp4ymsk30ngcv2fkgp7qfr1msqd7lj500f5hrw"; + version = "0.1.7.1"; + sha256 = "1g2hh8q035mnb7zwfhhsj2la8j96aab52lns6iqlj5ds6rmpvzrg"; libraryHaskellDepends = [ base deepseq @@ -496678,13 +495714,14 @@ self: { text, time, transformers, + unliftio, unliftio-core, uuid, }: mkDerivation { pname = "orville-postgresql"; - version = "1.0.0.0"; - sha256 = "1gri9224fsznbfz4ijawjbn32y88wfnry005dk45qg8mdd5gkn33"; + version = "1.1.0.0"; + sha256 = "11yax49l861qkx22nqphdch1w1gg1yp01m6kb2dcrgn50clbxqql"; libraryHaskellDepends = [ attoparsec base @@ -496713,6 +495750,8 @@ self: { safe-exceptions text time + transformers + unliftio uuid ]; description = "A Haskell library for PostgreSQL"; @@ -496915,7 +495954,21 @@ self: { } ) { }; - os-string = callPackage ( + os-string_1_0_0 = callPackage ( + { mkDerivation, filepath }: + mkDerivation { + pname = "os-string"; + version = "1.0.0"; + sha256 = "0znnp88cgbj3r858r2w6mlf2sjg3lxfajyih4bdshs0vgy1dyhr6"; + libraryHaskellDepends = [ filepath ]; + doHaddock = false; + description = "Library for manipulating Operating system strings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + os-string_2_0_8 = callPackage ( { mkDerivation, base, @@ -496930,10 +495983,8 @@ self: { }: mkDerivation { pname = "os-string"; - version = "2.0.7"; - sha256 = "186b4swiga0nk05np512iw50pz9w88l3bqz47pr241997bykb71k"; - revision = "1"; - editedCabalFile = "0504jf7wa84z3a8gd60cx7df6232xq31wqc532jcxrxh3hl0hm6b"; + version = "2.0.8"; + sha256 = "11i62ysdlqjzajj5s7s6n696mqhflpfn1a251mxjwa1hvmwl4y82"; libraryHaskellDepends = [ base bytestring @@ -496957,6 +496008,7 @@ self: { ]; description = "Library for manipulating Operating system strings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -497267,6 +496319,7 @@ self: { aeson, base, cvss, + purl, tasty, tasty-hunit, text, @@ -497274,12 +496327,13 @@ self: { }: mkDerivation { pname = "osv"; - version = "0.1.0.0"; - sha256 = "11w2x76ifx4sf6z5gz116pky4w4qv3l8nj2z57x61802l9ckrlqd"; + version = "0.2.0.0"; + sha256 = "09lbnl3piba0195b55pvl174l7lxnlimqwvi6mmv4c7kymzyrfgh"; libraryHaskellDepends = [ aeson base cvss + purl text time ]; @@ -497290,8 +496344,6 @@ self: { ]; description = "Open Source Vulnerability format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -498275,8 +497327,6 @@ self: { base, bytestring, deepseq, - doctest, - env-guard, hedgehog, tasty, tasty-hedgehog, @@ -498286,10 +497336,8 @@ self: { }: mkDerivation { pname = "package-version"; - version = "0.4"; - sha256 = "00ack16vq6c1pqrnm5pl8m0p5dx0rgrzk2ylsl22l9fj70v730a6"; - revision = "1"; - editedCabalFile = "0yi88ilxyppyjpybladc5vf5kzvi1jhacpsgiw8y5xk634rwr6gn"; + version = "0.4.1"; + sha256 = "116r62wk0pyp1cqhsfjsp0jchyqf5638by6vl7k3c7ylac6ki45c"; libraryHaskellDepends = [ base bytestring @@ -498299,8 +497347,6 @@ self: { ]; testHaskellDepends = [ base - doctest - env-guard hedgehog tasty tasty-hedgehog @@ -499854,8 +498900,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.6"; - sha256 = "1f7rjwgxlhhzpxcm29kgc1c4bzb827vidxh48qvd2bw597ykp5ns"; + version = "3.7.0.2"; + sha256 = "1l33amh5dkbxbgicvk4hh231b8x36fb90jlpxmgqwfqldk7j3lmz"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -499973,7 +499019,7 @@ self: { } ) { }; - pandoc_3_7_0_2 = callPackage ( + pandoc_3_8 = callPackage ( { mkDerivation, aeson, @@ -500046,6 +499092,7 @@ self: { tls, typst, unicode-collation, + unicode-data, unicode-transforms, unix, vector, @@ -500058,8 +499105,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.7.0.2"; - sha256 = "1l33amh5dkbxbgicvk4hh231b8x36fb90jlpxmgqwfqldk7j3lmz"; + version = "3.8"; + sha256 = "1yj2v60acr1v0x82jqvikdw30qs216g1975kkdxr7hbcrazd7agn"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -500127,6 +499174,7 @@ self: { tls typst unicode-collation + unicode-data unicode-transforms unix vector @@ -500365,8 +499413,8 @@ self: { }: mkDerivation { pname = "pandoc-cli"; - version = "3.6"; - sha256 = "0crqm20rl95g557biqvlsm0yjgn31sfhm5sa9s65sbpzi81cvp07"; + version = "3.7.0.2"; + sha256 = "0g9x7h2aimiffnv03pcvai64kpwxykz18kd126x92lpsdjwclkgz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -500388,7 +499436,7 @@ self: { } ) { }; - pandoc-cli_3_7_0_2 = callPackage ( + pandoc-cli_3_8 = callPackage ( { mkDerivation, base, @@ -500404,8 +499452,8 @@ self: { }: mkDerivation { pname = "pandoc-cli"; - version = "3.7.0.2"; - sha256 = "0g9x7h2aimiffnv03pcvai64kpwxykz18kd126x92lpsdjwclkgz"; + version = "3.8"; + sha256 = "0zhlsbj3k1dgxy382gxsdjnzg6p34llfs8y9v3ahxvyxsgfv5hwq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -500488,8 +499536,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.19"; - sha256 = "0zzdnv8prz1jkksrmfr3gz23483mkbj1vkjpxda97qld3n8zkdhb"; + version = "0.3.21"; + sha256 = "1srfkh987jx3ha8p5yrvy4pxkkypcajb4wvzbnf8sbd4wc2vichh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -500531,99 +499579,7 @@ self: { filepath hspec microlens - mtl - pandoc - pandoc-types - text - ]; - testToolDepends = [ pandoc-cli ]; - benchmarkHaskellDepends = [ - base - criterion - pandoc - pandoc-types - text - ]; - doHaddock = false; - description = "Pandoc filter for cross-references"; - license = lib.licenses.gpl2Only; - mainProgram = "pandoc-crossref"; - } - ) { }; - - pandoc-crossref_0_3_20 = callPackage ( - { - mkDerivation, - base, - containers, - criterion, - data-default, - deepseq, - directory, - filepath, - gitrev, - hspec, - microlens, - microlens-ghc, - microlens-mtl, - microlens-th, - mtl, - open-browser, - optparse-applicative, - pandoc, - pandoc-cli, - pandoc-types, - syb, - template-haskell, - temporary, - text, - utility-ht, - }: - mkDerivation { - pname = "pandoc-crossref"; - version = "0.3.20"; - sha256 = "10fgmddlyva8yyqh9m5c8d417bcyxvfqgw9l0q77lp6b161593ya"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base - containers - data-default - directory - filepath - microlens - microlens-ghc microlens-mtl - microlens-th - mtl - pandoc - pandoc-types - syb - template-haskell - text - utility-ht - ]; - executableHaskellDepends = [ - base - deepseq - gitrev - open-browser - optparse-applicative - pandoc - pandoc-types - template-haskell - temporary - text - ]; - testHaskellDepends = [ - base - containers - data-default - directory - filepath - hspec - microlens mtl pandoc pandoc-types @@ -500640,7 +499596,6 @@ self: { doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "pandoc-crossref"; } ) { }; @@ -500704,6 +499659,8 @@ self: { ]; description = "Decodes pandoc to dhall"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -501100,8 +500057,8 @@ self: { }: mkDerivation { pname = "pandoc-lens"; - version = "0.7.0"; - sha256 = "0prc0wv808l1l7m6rg78r6alwqgajj0h2yn3w7sgxmsvxdr8aj1w"; + version = "0.8.0"; + sha256 = "0vkprbma7jmy7vzplbdv49vwj5fi8snf4n6nl8j72dyis3836dki"; libraryHaskellDepends = [ base containers @@ -501111,8 +500068,6 @@ self: { ]; description = "Lenses for Pandoc documents"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -501242,8 +500197,10 @@ self: { }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.4.1.1"; - sha256 = "1nxk3ban38bc4avqjjwisk40licxkr217dgjm991ny2kny28r4rf"; + version = "0.4.3"; + sha256 = "1s5g1mvl13pa411kyd2jp5jz0lw8alxqpv984nnfnq17d2nj4mkw"; + revision = "2"; + editedCabalFile = "0a00gmr5ymp5jl6dp6f1qcmyxcqz1nqp2d4y6x1342zhqsi1zs8s"; libraryHaskellDepends = [ aeson base @@ -501292,7 +500249,7 @@ self: { } ) { }; - pandoc-lua-engine_0_4_3 = callPackage ( + pandoc-lua-engine_0_5 = callPackage ( { mkDerivation, aeson, @@ -501329,8 +500286,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.4.3"; - sha256 = "1s5g1mvl13pa411kyd2jp5jz0lw8alxqpv984nnfnq17d2nj4mkw"; + version = "0.5"; + sha256 = "0za5xp1q996bpydkz73779gp5mxlq1a5spk4cz5rsckc18cf11xc"; libraryHaskellDepends = [ aeson base @@ -501869,6 +500826,52 @@ self: { } ) { }; + pandoc-server_0_1_1 = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + bytestring, + containers, + data-default, + doctemplates, + pandoc, + pandoc-types, + servant-server, + skylighting, + text, + unicode-collation, + wai, + wai-cors, + }: + mkDerivation { + pname = "pandoc-server"; + version = "0.1.1"; + sha256 = "0xpz73k93zxy0yflbqi4b1vvzjfbzl3w4vrnvaac8xadyfd7605c"; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + data-default + doctemplates + pandoc + pandoc-types + servant-server + skylighting + text + unicode-collation + wai + wai-cors + ]; + description = "Pandoc document conversion as an HTTP servant-server"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + } + ) { }; + pandoc-sidenote = callPackage ( { mkDerivation, @@ -502808,6 +501811,186 @@ self: { } ) { }; + pantry_0_11_1 = callPackage ( + { + mkDerivation, + aeson, + aeson-warning-parser, + ansi-terminal, + base, + bytestring, + Cabal, + casa-client, + casa-types, + companion, + conduit, + conduit-extra, + containers, + crypton, + crypton-conduit, + digest, + exceptions, + filelock, + generic-deriving, + hackage-security, + hedgehog, + hpack, + hspec, + hspec-discover, + http-client, + http-client-tls, + http-conduit, + http-download, + http-types, + memory, + mtl, + network-uri, + path, + path-io, + persistent, + persistent-sqlite, + persistent-template, + primitive, + QuickCheck, + raw-strings-qq, + resourcet, + rio, + rio-orphans, + rio-prettyprint, + static-bytes, + tar-conduit, + text, + text-metrics, + time, + transformers, + unix-compat, + unliftio, + unordered-containers, + vector, + yaml, + zip-archive, + }: + mkDerivation { + pname = "pantry"; + version = "0.11.1"; + sha256 = "1qgmxfv74qqyn26x06gnx71ms8k0fiijlpz55k08yn8bcr05phzr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + aeson-warning-parser + ansi-terminal + base + bytestring + Cabal + casa-client + casa-types + companion + conduit + conduit-extra + containers + crypton + crypton-conduit + digest + filelock + generic-deriving + hackage-security + hpack + http-client + http-client-tls + http-conduit + http-download + http-types + memory + mtl + network-uri + path + path-io + persistent + persistent-sqlite + persistent-template + primitive + resourcet + rio + rio-orphans + rio-prettyprint + static-bytes + tar-conduit + text + text-metrics + time + transformers + unix-compat + unliftio + unordered-containers + vector + yaml + zip-archive + ]; + testHaskellDepends = [ + aeson + aeson-warning-parser + ansi-terminal + base + bytestring + Cabal + casa-client + casa-types + companion + conduit + conduit-extra + containers + crypton + crypton-conduit + digest + exceptions + filelock + generic-deriving + hackage-security + hedgehog + hpack + hspec + http-client + http-client-tls + http-conduit + http-download + http-types + memory + mtl + network-uri + path + path-io + persistent + persistent-sqlite + persistent-template + primitive + QuickCheck + raw-strings-qq + resourcet + rio + rio-orphans + rio-prettyprint + static-bytes + tar-conduit + text + text-metrics + time + transformers + unix-compat + unliftio + unordered-containers + vector + yaml + zip-archive + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + pantry-tmp = callPackage ( { mkDerivation, @@ -503950,8 +503133,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "9"; - editedCabalFile = "109xh71lzvivyvfypflibav8zmrvli41v8zc69vzch3rafn38ywx"; + revision = "10"; + editedCabalFile = "0rm92b8ny5qxalhg83dk2i4b4ca455vrbnqad905waz18z16xx1x"; libraryHaskellDepends = [ array base @@ -506173,6 +505356,8 @@ self: { ]; description = "Provides typeclass suitable for types admitting a partial order"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -506280,31 +505465,6 @@ self: { ) { }; partialord = callPackage ( - { - mkDerivation, - base, - containers, - hspec, - }: - mkDerivation { - pname = "partialord"; - version = "0.0.2"; - sha256 = "1cnsjn3s154ar439gcphblm1pwvqn6w88c1hyvin7xapnssrg32g"; - libraryHaskellDepends = [ - base - containers - ]; - testHaskellDepends = [ - base - containers - hspec - ]; - description = "Data structure supporting partial orders"; - license = lib.licenses.bsd3; - } - ) { }; - - partialord_0_1_1 = callPackage ( { mkDerivation, base, @@ -506326,7 +505486,6 @@ self: { ]; description = "Data structure supporting partial orders"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -507029,6 +506188,7 @@ self: { base, base64-bytestring, bytestring, + case-insensitive, colour, containers, directory, @@ -507059,8 +506219,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.15.1.0"; - sha256 = "1n8yprcb8s26wc5k0c3r8fm01bs8jayi27p50ffvvy103l1ia2rr"; + version = "0.15.2.0"; + sha256 = "0r9bx8f7q1h56mf8bvz6jaqrgl9iczac9qffmaqqsnqlvzn85wfi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -507071,6 +506231,7 @@ self: { base base64-bytestring bytestring + case-insensitive colour containers directory @@ -507215,8 +506376,8 @@ self: { pname = "patch-image"; version = "0.3.3.2"; sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; - revision = "3"; - editedCabalFile = "1y3fv802jvnrc08qpmh4vvk2h83lbdkv12g6rckhcl4ppgrzc5lz"; + revision = "4"; + editedCabalFile = "0li4lra7d79vkmlzbgrdr19szvhdm5ifsszk54l5w3pkrijiqv5k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -507293,7 +506454,7 @@ self: { } ) { }; - path = callPackage ( + path_0_9_5 = callPackage ( { mkDerivation, aeson, @@ -507343,10 +506504,11 @@ self: { ]; description = "Support for well-typed paths"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; - path_0_9_6 = callPackage ( + path = callPackage ( { mkDerivation, aeson, @@ -507396,7 +506558,6 @@ self: { doHaddock = false; description = "Support for well-typed paths"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -507970,62 +507131,6 @@ self: { ) { }; patrol = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - case-insensitive, - containers, - exceptions, - hspec, - http-client, - http-client-tls, - http-types, - network-uri, - text, - time, - uuid, - }: - mkDerivation { - pname = "patrol"; - version = "1.0.1.0"; - sha256 = "1yk90shi4idxdzf82mvxpsbgslx3psrwpxgwhnqpcl0kj4sdblf1"; - libraryHaskellDepends = [ - aeson - base - bytestring - case-insensitive - containers - exceptions - http-client - http-client-tls - http-types - network-uri - text - time - uuid - ]; - testHaskellDepends = [ - aeson - base - bytestring - case-insensitive - containers - hspec - http-client - http-types - network-uri - text - time - uuid - ]; - description = "Sentry SDK"; - license = lib.licenses.mit; - } - ) { }; - - patrol_1_1_0_0 = callPackage ( { mkDerivation, aeson, @@ -508079,7 +507184,6 @@ self: { ]; description = "Sentry SDK"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -508155,6 +507259,8 @@ self: { ]; description = "A library for compiling pattern-matching to decision trees"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -509892,8 +508998,8 @@ self: { }: mkDerivation { pname = "peano"; - version = "0.1.0.2"; - sha256 = "0qa2qxm492c4bac8il2riw17djk9pbjymng16dhilnxsimqyi3wa"; + version = "0.1.0.3"; + sha256 = "0hfxxfs0ds28p8mm7v5bmn176za3q13znl6b52pfqr3yr7r5jygx"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base @@ -510839,6 +509945,7 @@ self: { benchmarkToolDepends = [ cpphs ]; description = "Find duplicate images"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "phash"; } ) { }; @@ -510964,57 +510071,6 @@ self: { ) { }; perf = callPackage ( - { - mkDerivation, - base, - clock, - containers, - deepseq, - formatn, - mtl, - numhask-space, - optparse-applicative, - recursion-schemes, - text, - vector, - }: - mkDerivation { - pname = "perf"; - version = "0.13.0.0"; - sha256 = "0xqwg42cl9f1s9niyc2r9py75w26bp7rlax04ifjjbbq5y9aw2gb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - clock - containers - deepseq - formatn - mtl - numhask-space - optparse-applicative - recursion-schemes - text - vector - ]; - executableHaskellDepends = [ - base - clock - containers - deepseq - formatn - mtl - optparse-applicative - text - ]; - benchmarkHaskellDepends = [ base ]; - description = "Performance methods and monad"; - license = lib.licenses.bsd3; - mainProgram = "perf-explore"; - } - ) { }; - - perf_0_14_0_2 = callPackage ( { mkDerivation, base, @@ -511038,8 +510094,8 @@ self: { }: mkDerivation { pname = "perf"; - version = "0.14.0.2"; - sha256 = "0xwfny9y389v9kalzj0dshbmzv6nyacxa7vvdwp2ax12vl0pnp00"; + version = "0.14.0.3"; + sha256 = "1w8svzwgxmspaigys1pkr6ba7xr0cl158c1gsw244jda0zr47qjj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -511074,7 +510130,6 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Performance methods and monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "perf-explore"; } ) { }; @@ -511824,8 +510879,8 @@ self: { }: mkDerivation { pname = "persist"; - version = "0.1.1.5"; - sha256 = "19s0jpbcas6c64lzl9plhp1b3qk89g3jrqhj2ljxvkzk81dbr2r3"; + version = "1.0.0.0"; + sha256 = "1waqnc96f8bnrlkcqk79b28p75pyczbbgw3nfbkb2n5bgwq62mc0"; libraryHaskellDepends = [ base bytestring @@ -511999,131 +511054,6 @@ self: { ) { }; persistent = callPackage ( - { - mkDerivation, - aeson, - attoparsec, - attoparsec-aeson, - base, - base64-bytestring, - blaze-html, - bytestring, - conduit, - containers, - criterion, - deepseq, - fast-logger, - file-embed, - hspec, - http-api-data, - lift-type, - monad-logger, - mtl, - path-pieces, - QuickCheck, - quickcheck-instances, - resource-pool, - resourcet, - scientific, - shakespeare, - silently, - template-haskell, - text, - th-lift-instances, - time, - transformers, - unliftio, - unliftio-core, - unordered-containers, - vault, - vector, - }: - mkDerivation { - pname = "persistent"; - version = "2.14.6.3"; - sha256 = "1nqmd1ml1s4cm9hwfz9cz5qj4i9zm8ip69gmgysfgbs0h64f7w2d"; - revision = "1"; - editedCabalFile = "1rx07qblwxaq9fcl8z66lvmqd48widnlqcg3hgdd8ni9yrvwfmxi"; - libraryHaskellDepends = [ - aeson - attoparsec - attoparsec-aeson - base - base64-bytestring - blaze-html - bytestring - conduit - containers - deepseq - fast-logger - http-api-data - lift-type - monad-logger - mtl - path-pieces - resource-pool - resourcet - scientific - silently - template-haskell - text - th-lift-instances - time - transformers - unliftio - unliftio-core - unordered-containers - vault - vector - ]; - testHaskellDepends = [ - aeson - attoparsec - base - base64-bytestring - blaze-html - bytestring - conduit - containers - deepseq - fast-logger - hspec - http-api-data - monad-logger - mtl - path-pieces - QuickCheck - quickcheck-instances - resource-pool - resourcet - scientific - shakespeare - silently - template-haskell - text - th-lift-instances - time - transformers - unliftio - unliftio-core - unordered-containers - vector - ]; - benchmarkHaskellDepends = [ - base - criterion - deepseq - file-embed - template-haskell - text - ]; - description = "Type-safe, multi-backend data serialization"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.psibi ]; - } - ) { }; - - persistent_2_17_0_0 = callPackage ( { mkDerivation, aeson, @@ -512168,8 +511098,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.17.0.0"; - sha256 = "0y0rmg4xfqmkndckz2a8ndl8djmdc9zab36qb56g9as1zpm91wfn"; + version = "2.17.1.0"; + sha256 = "0c3kz36nv9n8xd21z7hgk8djj2ldvzfmy3qrmxhr8p617s18182g"; libraryHaskellDepends = [ aeson attoparsec @@ -512249,7 +511179,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; } ) { }; @@ -512721,6 +511650,8 @@ self: { ]; description = "Code for using the ip package with yesod"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -512962,83 +511893,6 @@ self: { ) { }; persistent-mtl = callPackage ( - { - mkDerivation, - base, - bytestring, - conduit, - containers, - esqueleto, - exceptions, - explainable-predicates, - monad-logger, - mtl, - persistent, - persistent-postgresql, - persistent-sqlite, - resource-pool, - resourcet, - tasty, - tasty-autocollect, - tasty-golden, - tasty-hunit, - text, - transformers, - unliftio, - unliftio-core, - unliftio-pool, - }: - mkDerivation { - pname = "persistent-mtl"; - version = "0.5.1"; - sha256 = "13sz2j3g5vyvfhs97xzmzcb5a83lg4wlzmqnbmwg6l419jpj23fq"; - revision = "1"; - editedCabalFile = "0frfp7hifii11sk85j44rbd4ic0inp2gzzpfdylkbrbpfw32s54d"; - libraryHaskellDepends = [ - base - conduit - containers - exceptions - monad-logger - mtl - persistent - resource-pool - resourcet - text - transformers - unliftio - unliftio-core - unliftio-pool - ]; - testHaskellDepends = [ - base - bytestring - conduit - containers - esqueleto - explainable-predicates - monad-logger - persistent - persistent-postgresql - persistent-sqlite - resource-pool - resourcet - tasty - tasty-autocollect - tasty-golden - tasty-hunit - text - unliftio - ]; - testToolDepends = [ tasty-autocollect ]; - description = "Monad transformer for the persistent API"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - } - ) { }; - - persistent-mtl_0_5_2 = callPackage ( { mkDerivation, base, @@ -513494,106 +512348,6 @@ self: { ) { }; persistent-postgresql = callPackage ( - { - mkDerivation, - aeson, - attoparsec, - base, - blaze-builder, - bytestring, - conduit, - containers, - fast-logger, - hspec, - hspec-expectations, - hspec-expectations-lifted, - http-api-data, - HUnit, - monad-logger, - mtl, - path-pieces, - persistent, - persistent-qq, - persistent-test, - postgresql-libpq, - postgresql-simple, - QuickCheck, - quickcheck-instances, - resource-pool, - resourcet, - string-conversions, - text, - time, - transformers, - unliftio, - unliftio-core, - unordered-containers, - vault, - vector, - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.13.6.2"; - sha256 = "1z6cy54qnxpml86b6dr67kin6ww0dfn9vg3bzb3iw5s9srf7zwn2"; - revision = "1"; - editedCabalFile = "1a58a602nnwrb3s72q12piw18r458w3ha9nfjmpz5na566ndqmgl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - attoparsec - base - blaze-builder - bytestring - conduit - containers - monad-logger - mtl - persistent - postgresql-libpq - postgresql-simple - resource-pool - resourcet - string-conversions - text - time - transformers - unliftio-core - vault - ]; - testHaskellDepends = [ - aeson - base - bytestring - containers - fast-logger - hspec - hspec-expectations - hspec-expectations-lifted - http-api-data - HUnit - monad-logger - path-pieces - persistent - persistent-qq - persistent-test - QuickCheck - quickcheck-instances - resourcet - text - time - transformers - unliftio - unliftio-core - unordered-containers - vector - ]; - description = "Backend for the persistent library using postgresql"; - license = lib.licenses.mit; - } - ) { }; - - persistent-postgresql_2_13_7_0 = callPackage ( { mkDerivation, aeson, @@ -513688,6 +512442,107 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; + } + ) { }; + + persistent-postgresql_2_14_0_0 = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + base, + blaze-builder, + bytestring, + conduit, + containers, + fast-logger, + hspec, + hspec-expectations, + hspec-expectations-lifted, + http-api-data, + HUnit, + monad-logger, + mtl, + path-pieces, + persistent, + persistent-qq, + persistent-test, + postgresql-libpq, + postgresql-simple, + postgresql-simple-interval, + QuickCheck, + quickcheck-instances, + resource-pool, + resourcet, + string-conversions, + text, + time, + transformers, + unliftio, + unliftio-core, + unordered-containers, + vault, + vector, + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.14.0.0"; + sha256 = "0fxqg4ia73m9cv9qk4l4nr4y8x0a14wc0kpbj3b2nrwnrbiwyffc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + attoparsec + base + blaze-builder + bytestring + conduit + containers + monad-logger + mtl + persistent + postgresql-libpq + postgresql-simple + postgresql-simple-interval + resource-pool + resourcet + string-conversions + text + time + transformers + unliftio-core + vault + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + fast-logger + hspec + hspec-expectations + hspec-expectations-lifted + http-api-data + HUnit + monad-logger + path-pieces + persistent + persistent-qq + persistent-test + postgresql-simple-interval + QuickCheck + quickcheck-instances + resourcet + text + time + transformers + unliftio + unliftio-core + unordered-containers + vector + ]; + description = "Backend for the persistent library using postgresql"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; } ) { }; @@ -513780,8 +512635,8 @@ self: { }: mkDerivation { pname = "persistent-qq"; - version = "2.12.0.6"; - sha256 = "1z017xb7mq3npbz1jw7d9b2x8ylwr4qcpi7d87pi6dw89nwqcwwd"; + version = "2.12.0.7"; + sha256 = "1swbhc1gqn2njc4ycpizqbkl77xrz7a8sizlcb6lcizb9zaakkf4"; libraryHaskellDepends = [ base haskell-src-meta @@ -514041,8 +512896,8 @@ self: { }: mkDerivation { pname = "persistent-sql-lifted"; - version = "0.4.3.1"; - sha256 = "1lcr99d84pyvcz7b0vln2q1ai98g8n44afp0xb0zfgmhal2zidic"; + version = "0.4.4.0"; + sha256 = "07jl90fwv4cnjzrgnimbz1n8nqjf7y56kknr9pn8q1rb77w8g6r0"; libraryHaskellDepends = [ annotated-exception base @@ -514057,99 +512912,10 @@ self: { ]; description = "Monad classes for running queries with Persistent and Esqueleto"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; persistent-sqlite = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - conduit, - containers, - exceptions, - fast-logger, - hspec, - HUnit, - microlens, - microlens-th, - monad-logger, - mtl, - persistent, - persistent-test, - QuickCheck, - resource-pool, - resourcet, - sqlite, - system-fileio, - system-filepath, - temporary, - text, - time, - transformers, - unliftio-core, - unordered-containers, - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.13.3.0"; - sha256 = "014ibary358yq2shi72ry56xfqzqj173al33nsmcp5z13j8m5hdx"; - configureFlags = [ "-fsystemlib" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - base - bytestring - conduit - containers - microlens-th - monad-logger - mtl - persistent - resource-pool - resourcet - text - time - transformers - unliftio-core - unordered-containers - ]; - librarySystemDepends = [ sqlite ]; - testHaskellDepends = [ - base - bytestring - conduit - containers - exceptions - fast-logger - hspec - HUnit - microlens - monad-logger - mtl - persistent - persistent-test - QuickCheck - resourcet - system-fileio - system-filepath - temporary - text - time - transformers - unliftio-core - ]; - description = "Backend for the persistent library using sqlite3"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.psibi ]; - } - ) { inherit (pkgs) sqlite; }; - - persistent-sqlite_2_13_3_1 = callPackage ( { mkDerivation, aeson, @@ -514232,7 +512998,6 @@ self: { ]; description = "Backend for the persistent library using sqlite3"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; } ) { inherit (pkgs) sqlite; }; @@ -514371,8 +513136,8 @@ self: { }: mkDerivation { pname = "persistent-test"; - version = "2.13.1.3"; - sha256 = "0qqv00nlqpnfx4h3kkd8k0y41a8dfmgj0rc0smdf6p4kl2g1hrdl"; + version = "2.13.2.0"; + sha256 = "0mzj2k07yhbx8674c1yh6brl8clncqc7ci8295hjazrmr528rc2x"; libraryHaskellDepends = [ aeson base @@ -514407,78 +513172,6 @@ self: { } ) { }; - persistent-test_2_13_1_4 = callPackage ( - { - mkDerivation, - aeson, - base, - blaze-html, - bytestring, - conduit, - containers, - exceptions, - hspec, - hspec-expectations, - http-api-data, - HUnit, - monad-control, - monad-logger, - mtl, - path-pieces, - persistent, - QuickCheck, - quickcheck-instances, - random, - resourcet, - text, - time, - transformers, - transformers-base, - unliftio, - unliftio-core, - unordered-containers, - }: - mkDerivation { - pname = "persistent-test"; - version = "2.13.1.4"; - sha256 = "1k2wq6ag4jvqr1krdjfx84mmx0mg09hy38w569zxwdrd03ffcjpy"; - revision = "1"; - editedCabalFile = "1kzqhvs4h8xpx2x153gh64rc006mvjxv6fzsyxvnfknmqcx8xn19"; - libraryHaskellDepends = [ - aeson - base - blaze-html - bytestring - conduit - containers - exceptions - hspec - hspec-expectations - http-api-data - HUnit - monad-control - monad-logger - mtl - path-pieces - persistent - QuickCheck - quickcheck-instances - random - resourcet - text - time - transformers - transformers-base - unliftio - unliftio-core - unordered-containers - ]; - description = "Tests for Persistent"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - } - ) { }; - persistent-typed-db = callPackage ( { mkDerivation, @@ -515951,6 +514644,7 @@ self: { ]; description = "FAT filesystem sort utility"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -515958,6 +514652,7 @@ self: { { mkDerivation, aeson, + array, base, binary-ieee754, bytestring, @@ -515973,10 +514668,12 @@ self: { prettyprinter, process, random, + regex-pcre-builtin, scientific, silently, text, time, + transformers, utf8-string, vector, xml-conduit, @@ -515984,12 +514681,13 @@ self: { }: mkDerivation { pname = "phino"; - version = "0.0.0.14"; - sha256 = "1nl2n0y636bdppxc29p4zyxlyra2zjiy3a1s6xw2yin64q3gqrim"; + version = "0.0.0.40"; + sha256 = "0hrnh8l6z9y1a096ddcpqhmcxxcql2al388z7chfvl0mj8w9g77m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson + array base binary-ieee754 bytestring @@ -516001,9 +514699,11 @@ self: { optparse-applicative prettyprinter random + regex-pcre-builtin scientific text time + transformers utf8-string vector xml-conduit @@ -517553,59 +516253,64 @@ self: { photoname = callPackage ( { mkDerivation, - ansi-wl-pprint, + ansi-terminal, base, + co-log-simple, containers, directory, filepath, formatting, heredoc, hsexif, - hslogger, mtl, optparse-applicative, parsec, + prettyprinter, process, regex-posix, tasty, tasty-hunit, tasty-quickcheck, + text, time, unix, }: mkDerivation { pname = "photoname"; - version = "5.4"; - sha256 = "01gd6rl1qnidgd8i65syxli0iqv5fsdyp909s1gd2bvya11k7k6h"; + version = "5.5"; + sha256 = "1v6fk94f62djchbmkpacb04cll8i65z3x1x20lc08hsybsgha32h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ + ansi-terminal base + co-log-simple containers directory filepath formatting hsexif - hslogger mtl parsec process + text time unix ]; executableHaskellDepends = [ - ansi-wl-pprint base + co-log-simple directory filepath formatting heredoc - hslogger optparse-applicative + prettyprinter unix ]; testHaskellDepends = [ base + co-log-simple directory filepath process @@ -518702,8 +517407,8 @@ self: { }: mkDerivation { pname = "pinboard-notes-backup"; - version = "1.0.7"; - sha256 = "0mbfp81ak9i7nwnwycd1bhjhhlpwidy2n1n3wbx50snaanmx7v22"; + version = "1.0.7.1"; + sha256 = "1pybnfyqig3vy4appkzjmvs179jljnrjnihqsli1qm34f12w8ax1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -519019,6 +517724,7 @@ self: { ]; description = "icmp echo requests"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -519120,8 +517826,8 @@ self: { }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.2.0"; - sha256 = "1wgjiqfv56iaqzv6brp0c8ni13zvn8sgx6iifm5zzlq3p20q62cm"; + version = "0.1.3.0"; + sha256 = "1ya45nm85rdrgdcxx8iycs5r9rh0zkzc6i0y6x58vsy3mnq9qn37"; libraryHaskellDepends = [ base bytestring @@ -519850,6 +518556,7 @@ self: { description = "Pipes for Noise-secured network connections"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -520648,6 +519355,8 @@ self: { ]; description = "Interleave and merge streams of elements"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -520865,7 +519574,9 @@ self: { ]; description = "LZMA compressors and decompressors for the Pipes package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "pipes-lzma-unxz"; + broken = true; } ) { }; @@ -524410,7 +523121,9 @@ self: { async-pool, base, data-default, + directory, fast-logger, + filepath, hspec, hspec-discover, lens, @@ -524425,15 +523138,17 @@ self: { }: mkDerivation { pname = "pms-application-service"; - version = "0.0.4.0"; - sha256 = "0a91pa5rs2vplixky8bap4gl8i8mm3j7454w7s4pihyf4h7wfhpl"; + version = "0.0.8.0"; + sha256 = "05j7p58wi7vjrcpgs0zd3br74jprbyn1w0xf0llj5rkl5mhnr4hj"; libraryHaskellDepends = [ aeson async async-pool base data-default + directory fast-logger + filepath lens monad-logger mtl @@ -524485,10 +523200,11 @@ self: { }: mkDerivation { pname = "pms-domain-model"; - version = "0.0.5.0"; - sha256 = "0z0a04j6x4jrq6xpfdd6jnbq7q7p71y51gar6i6g0apfliiydq9w"; + version = "0.1.0.0"; + sha256 = "0y6xi7mqrvl1fp87nxyrx7jfbh8rwmgm5wmcvw9am7mqc7kz2scy"; libraryHaskellDepends = [ aeson + async base bytestring data-default @@ -524553,8 +523269,8 @@ self: { }: mkDerivation { pname = "pms-domain-service"; - version = "0.0.4.0"; - sha256 = "1akacdrh2ngyvik46sjhag8kp9hyyr7rv9grswx7i3ngy6pk64yn"; + version = "0.0.9.0"; + sha256 = "1icxrid4a1slsz6vpfzm78mljjmvylji68wwl7i1xpha1fgw10a1"; libraryHaskellDepends = [ aeson base @@ -524623,8 +523339,8 @@ self: { }: mkDerivation { pname = "pms-infra-cmdrun"; - version = "0.0.2.0"; - sha256 = "0c4jhci5im04ks49if7ncbqipbln2ixw2f262qw64ir5a5hdygzy"; + version = "0.0.7.0"; + sha256 = "1cmyxcvbx7637p96psklpm0vip1998kcl0v4mxvlbb2yjddrb1q2"; libraryHaskellDepends = [ aeson async @@ -524691,8 +523407,8 @@ self: { }: mkDerivation { pname = "pms-infra-procspawn"; - version = "0.0.1.0"; - sha256 = "1wg0508h2svl0pk9yrwrnmssrqnm2vnlws9w9nm5ydqlqibdr282"; + version = "0.0.7.0"; + sha256 = "09bhgq681pj2jn24wrmh38mb6574qvj77719cp8sm8aws0sanclx"; libraryHaskellDepends = [ aeson async @@ -524732,6 +523448,80 @@ self: { } ) { }; + pms-infra-serial = callPackage ( + { + mkDerivation, + aeson, + async, + base, + base16-bytestring, + bytestring, + conduit, + data-default, + directory, + fast-logger, + filepath, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + network, + pms-domain-model, + process, + safe-exceptions, + serialport, + stm, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-infra-serial"; + version = "0.0.4.0"; + sha256 = "14nxa1pb2hv5vclp9qix7wqm9r0m9infjmcjxg4a6zs0cq42kx43"; + libraryHaskellDepends = [ + aeson + async + base + base16-bytestring + bytestring + conduit + data-default + directory + fast-logger + filepath + lens + monad-logger + mtl + network + pms-domain-model + process + safe-exceptions + serialport + stm + text + transformers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-infra-serial"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + pms-infra-socket = callPackage ( { mkDerivation, @@ -524761,8 +523551,8 @@ self: { }: mkDerivation { pname = "pms-infra-socket"; - version = "0.0.1.0"; - sha256 = "01iz8ws1wc04k52djy37wrlyrr8g33n7zvd03md06wjycahhrri5"; + version = "0.0.6.0"; + sha256 = "1blwia1j9wc840r45dcwhm51i6813zfksy563bk42ifp644kc8pk"; libraryHaskellDepends = [ aeson async @@ -524832,8 +523622,8 @@ self: { }: mkDerivation { pname = "pms-infra-watch"; - version = "0.0.3.0"; - sha256 = "0lwiydxf9p7pvri6s3p0wg0lya9imp6rpggb2mrpb49nqknnpxpx"; + version = "0.0.5.0"; + sha256 = "1y1gqi6mfx5v6j0syh4p2za3p7a2v402qj1zrq5z6r8c677b96jf"; libraryHaskellDepends = [ aeson async @@ -524904,8 +523694,8 @@ self: { }: mkDerivation { pname = "pms-infrastructure"; - version = "0.0.4.0"; - sha256 = "1vawlgs6i1rpw2266zbzxwykjsf5p61w88vi2lyj69dgl3dd0kiz"; + version = "0.0.8.0"; + sha256 = "1z7xaainrb4dhhgzkgnj24ix9f28j3isx4ghhf9szfz0cq0zxq58"; libraryHaskellDepends = [ aeson async @@ -524972,8 +523762,8 @@ self: { }: mkDerivation { pname = "pms-ui-notification"; - version = "0.0.3.0"; - sha256 = "1fq1kasqmghbic59v815032spcl9wahm9wqjyjmg93di92xz8mm3"; + version = "0.0.4.0"; + sha256 = "0nhsm3l15wi73mi1rqs1qwnrp18a773zv1z3pis2c9vx9bap6b66"; libraryHaskellDepends = [ aeson base @@ -525033,8 +523823,8 @@ self: { }: mkDerivation { pname = "pms-ui-request"; - version = "0.0.4.0"; - sha256 = "1yg42dy0jrv0xhz657kys41i0prr2xn417ji2p6wahgnlfkiy6am"; + version = "0.0.6.0"; + sha256 = "1whhi2npja49xifkqhlfmm1j4snw3vhs4vw39205sypvp6irq8ny"; libraryHaskellDepends = [ aeson base @@ -525094,8 +523884,8 @@ self: { }: mkDerivation { pname = "pms-ui-response"; - version = "0.0.4.0"; - sha256 = "0045ddj3v34aycvnh72fvy9159iv4vad1jghd1ndslhphav1d91b"; + version = "0.0.5.0"; + sha256 = "05p16wb90wlj15h442wqfmnypks9bk8pynmfhydyg0f2rbrn6dsa"; libraryHaskellDepends = [ aeson base @@ -526508,7 +525298,6 @@ self: { ]; description = "Polykinded extensible records"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -526765,6 +525554,7 @@ self: { ]; description = "Multivariate polynomial rings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -526810,6 +525600,28 @@ self: { } ) { }; + polyparse_1_13_1 = callPackage ( + { + mkDerivation, + base, + bytestring, + text, + }: + mkDerivation { + pname = "polyparse"; + version = "1.13.1"; + sha256 = "1mmz8akbws38k6w95kdj270h9vfip4bjlbb5magb3s81k7nqjnrr"; + libraryHaskellDepends = [ + base + bytestring + text + ]; + description = "A variety of alternative parser combinator libraries"; + license = "LGPL"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + polysemy = callPackage ( { mkDerivation, @@ -527753,6 +526565,8 @@ self: { ]; description = "Colog adapters for polysemy-log"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -528739,6 +527553,32 @@ self: { } ) { }; + polytyped = callPackage ( + { + mkDerivation, + base, + QuickCheck, + tasty, + tasty-hunit, + tasty-quickcheck, + }: + mkDerivation { + pname = "polytyped"; + version = "0.1.0.0"; + sha256 = "1lvgr8al65b67xs34g9h28ymrw5hs12pa04majs269j1chi7qqcr"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + QuickCheck + tasty + tasty-hunit + tasty-quickcheck + ]; + description = "Alternative to `Dynamic` with type guarantees"; + license = lib.licenses.bsd3; + } + ) { }; + polyvariadic = callPackage ( { mkDerivation, @@ -529231,8 +528071,6 @@ self: { ]; description = "XEPs implementation on top of pontarius-xmpp"; license = "unknown"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -529346,8 +528184,8 @@ self: { }: mkDerivation { pname = "poolboy"; - version = "0.4.0.1"; - sha256 = "0ifdp2p2c257k52c9prm072c1gmfx55a40gaanba083viq6cxzal"; + version = "0.4.1.0"; + sha256 = "0xzk9ibildpv90hzn6h5c82wl2aqn8j18628ld27pddw3xq7aq08"; libraryHaskellDepends = [ base unliftio @@ -531057,8 +529895,8 @@ self: { }: mkDerivation { pname = "posplyu"; - version = "0.1.0.3"; - sha256 = "1b02i7c6kjmkd8naazfdr7fjy19rd0p2hyrhjgf3q60h09ipi15g"; + version = "0.1.1"; + sha256 = "07pafmfqk8i4g3zp0yq6gylfjb0jmbqla9kdvkfi068cm26m3ryq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -531323,8 +530161,8 @@ self: { }: mkDerivation { pname = "postgres-websockets"; - version = "0.11.2.4"; - sha256 = "1xckjdkzzbd4kqx6ciyagz1zy6i09zvpg1dkmn4ymr8xvm8rk2d7"; + version = "0.11.2.5"; + sha256 = "1f4k7gmy76l18i63zkc3lsc2a99qmaqddb1gdpnkh4z4l77cab5p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -531479,8 +530317,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.14.0.1"; - sha256 = "090plscva1np15p5ya62aqyzpagpyzz6f3fxkkp44p20aw2w78bp"; + version = "0.14.2"; + sha256 = "08a404sgyvlv8zsxyfbqcifn6y5dvdbp2sicaqh9ahky3yz3xw73"; libraryHaskellDepends = [ aeson base @@ -532234,6 +531072,7 @@ self: { ]; description = "pure Haskell PostgreSQL driver"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -532471,7 +531310,6 @@ self: { cryptohash-md5, filepath, hashable, - HUnit, inspection-testing, Only, postgresql-libpq, @@ -532488,10 +531326,8 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.7.0.0"; - sha256 = "0gm1wk2zq35h46v0l1qc0z63jv3gxgqd059j1mcmww80a6sipf4c"; - revision = "3"; - editedCabalFile = "1vbdiniz18m1kk4wxdnc43ry7gq00vxxvklmnrn8v3vc5r55inka"; + version = "0.7.0.1"; + sha256 = "16dbydsi5hib4zksl2sri0mz0hwfnagb2f757q1xc603clhg6z2r"; libraryHaskellDepends = [ aeson attoparsec @@ -532519,7 +531355,6 @@ self: { containers cryptohash-md5 filepath - HUnit inspection-testing postgresql-libpq tasty @@ -532617,6 +531452,50 @@ self: { } ) { }; + postgresql-simple-interval = callPackage ( + { + mkDerivation, + attoparsec, + base, + bytestring, + hspec, + persistent, + postgresql-libpq, + postgresql-simple, + scientific, + text, + time, + }: + mkDerivation { + pname = "postgresql-simple-interval"; + version = "1.0.0.0"; + sha256 = "01d550bhmbpy3bsz37m21hpgpg9x2v72qhv6fa2p0m6p61p1hadx"; + libraryHaskellDepends = [ + attoparsec + base + bytestring + persistent + postgresql-simple + scientific + text + time + ]; + testHaskellDepends = [ + attoparsec + base + bytestring + hspec + postgresql-libpq + postgresql-simple + time + ]; + description = "A simple interval type for PostgreSQL"; + license = lib.licenses.bsd0; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + postgresql-simple-ltree = callPackage ( { mkDerivation, @@ -532965,51 +531844,6 @@ self: { ) { }; postgresql-syntax = callPackage ( - { - mkDerivation, - base, - bytestring, - case-insensitive, - hashable, - headed-megaparsec, - hedgehog, - megaparsec, - parser-combinators, - rerebase, - tasty, - tasty-hunit, - text, - text-builder, - unordered-containers, - }: - mkDerivation { - pname = "postgresql-syntax"; - version = "0.4.1.2"; - sha256 = "0z2mnx8npickm5h208mqm76ybr37cmqqf3q1nfy3kh19xdgqhfy7"; - libraryHaskellDepends = [ - base - bytestring - case-insensitive - hashable - headed-megaparsec - megaparsec - parser-combinators - text - text-builder - unordered-containers - ]; - testHaskellDepends = [ - hedgehog - rerebase - tasty - tasty-hunit - ]; - description = "PostgreSQL AST parsing and rendering"; - license = lib.licenses.mit; - } - ) { }; - - postgresql-syntax_0_4_1_3 = callPackage ( { mkDerivation, base, @@ -533051,7 +531885,6 @@ self: { ]; description = "PostgreSQL AST parsing and rendering"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -534145,6 +532978,8 @@ self: { ]; description = "Potrace bindings for the diagrams library"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -534198,6 +533033,8 @@ self: { ]; description = "PowerDNS API bindings for api/v1"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -535342,6 +534179,84 @@ self: { } ) { }; + pr-tools = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + case-insensitive, + containers, + Diff, + directory, + extra, + filepath, + Glob, + http-client, + http-client-tls, + http-types, + optparse-applicative, + process, + split, + temporary, + text, + time, + uuid, + yaml, + }: + mkDerivation { + pname = "pr-tools"; + version = "0.1.0.0"; + sha256 = "0r9588mdf2n65gnnc4jy9nwvklmdd0mzyyp0k8hsd12k7av8fl1f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + case-insensitive + containers + Diff + directory + extra + http-client + http-client-tls + http-types + process + split + text + time + uuid + yaml + ]; + executableHaskellDepends = [ + aeson + base + bytestring + case-insensitive + containers + Diff + directory + filepath + Glob + http-client + http-client-tls + http-types + optparse-applicative + process + split + temporary + time + uuid + yaml + ]; + description = "Decentralized git pull request and code review flows"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + practice-room = callPackage ( { mkDerivation, @@ -535464,42 +534379,6 @@ self: { ) { }; prairie = callPackage ( - { - mkDerivation, - aeson, - base, - constraints, - containers, - hspec, - lens, - template-haskell, - text, - }: - mkDerivation { - pname = "prairie"; - version = "0.0.4.0"; - sha256 = "0d5bfci30ck6kx9pspv0d68lxgs700xv6y6067ki9yvlnrimrff2"; - libraryHaskellDepends = [ - aeson - base - constraints - containers - lens - template-haskell - text - ]; - testHaskellDepends = [ - aeson - base - hspec - lens - ]; - description = "A first class record field library"; - license = lib.licenses.bsd3; - } - ) { }; - - prairie_0_1_0_0 = callPackage ( { mkDerivation, aeson, @@ -535538,7 +534417,6 @@ self: { ]; description = "A first class record field library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -537503,50 +536381,6 @@ self: { ) { }; prettychart = callPackage ( - { - mkDerivation, - async, - base, - box, - bytestring, - chart-svg, - containers, - doctest-parallel, - markup-parse, - numhask-space, - optics-core, - text, - time, - web-rep, - }: - mkDerivation { - pname = "prettychart"; - version = "0.2.2.0"; - sha256 = "1mj20bhpjn7gf7kb123zmn27bfpk1zncqqg606xmdcyx225m43al"; - libraryHaskellDepends = [ - async - base - box - bytestring - chart-svg - containers - markup-parse - numhask-space - optics-core - text - time - web-rep - ]; - testHaskellDepends = [ - base - doctest-parallel - ]; - description = "Pretty print charts from ghci"; - license = lib.licenses.bsd3; - } - ) { }; - - prettychart_0_3_0_1 = callPackage ( { mkDerivation, async, @@ -537568,8 +536402,8 @@ self: { }: mkDerivation { pname = "prettychart"; - version = "0.3.0.1"; - sha256 = "0m1gc6vwywrihrwa6w204vyfsrisim1f7fznyvip48dzn7sh3c2v"; + version = "0.3.0.2"; + sha256 = "0qa4p1yx5ld2gbxymq2x5pd3y37hcqmjiyymxcwd8ndxh3f66llp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -537602,7 +536436,6 @@ self: { ]; description = "Pretty print charts from ghci"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "prettychart-watch"; } ) { }; @@ -538334,6 +537167,25 @@ self: { } ) { }; + primdata = callPackage ( + { + mkDerivation, + base, + ghc-prim, + }: + mkDerivation { + pname = "primdata"; + version = "0.1.2.2"; + sha256 = "0cjsjcm6d71d61idkmb9d8ia26hcwzrmx8k5w1afhzpla73zfia9"; + libraryHaskellDepends = [ + base + ghc-prim + ]; + description = "Minimum-overhead primitive datatypes"; + license = lib.licenses.mit; + } + ) { }; + prime = callPackage ( { mkDerivation, @@ -538640,6 +537492,8 @@ self: { ]; description = "containers backed by arrays"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -539046,47 +537900,6 @@ self: { ) { }; primitive-unlifted = callPackage ( - { - mkDerivation, - array, - base, - bytestring, - primitive, - QuickCheck, - quickcheck-classes-base, - stm, - tasty, - tasty-quickcheck, - text-short, - }: - mkDerivation { - pname = "primitive-unlifted"; - version = "2.1.0.0"; - sha256 = "07ix39sraijgajprpzdbnl67m8ghixxbqg93k4m02k1gi83j2d31"; - revision = "1"; - editedCabalFile = "169j22x9xbw35pgsqixqbjhk5gbshbf1cvq2i84yz4b3g74164gg"; - libraryHaskellDepends = [ - array - base - bytestring - primitive - text-short - ]; - testHaskellDepends = [ - base - primitive - QuickCheck - quickcheck-classes-base - stm - tasty - tasty-quickcheck - ]; - description = "Primitive GHC types with unlifted types inside"; - license = lib.licenses.bsd3; - } - ) { }; - - primitive-unlifted_2_2_0_0 = callPackage ( { mkDerivation, array, @@ -539122,7 +537935,6 @@ self: { ]; description = "Primitive GHC types with unlifted types inside"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -540728,6 +539540,8 @@ self: { ]; description = "Some curated and opinionated packages for building Haskell services"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -542576,8 +541390,8 @@ self: { }: mkDerivation { pname = "prometheus-wai"; - version = "0.0.0.0"; - sha256 = "027i17zyxk3wgzw7161h57rnmgb5iqqnlnlcg129q28dw005wg9h"; + version = "0.0.0.1"; + sha256 = "1l1xab87n1ll5m8h439mcq7bcy0lf7sw8zf97ld6wy6jlq82ncin"; libraryHaskellDepends = [ base bytestring @@ -542713,8 +541527,31 @@ self: { }: mkDerivation { pname = "prompt-hs"; - version = "1.0.1.0"; - sha256 = "1yarj087xyardxpf7ibv2bpfkaiyikzpzcpa1sf76lfd6v5rwr7s"; + version = "1.0.3.1"; + sha256 = "1amcnss78h93b1fxda1ng0ldn60ma6f456g32jaqhc129y3iqqzv"; + libraryHaskellDepends = [ + base + microlens + terminal + text + ]; + description = "A user-friendly, dependently-typed library for asking your users questions"; + license = lib.licenses.bsd3; + } + ) { }; + + prompt-hs_1_1_0_1 = callPackage ( + { + mkDerivation, + base, + microlens, + terminal, + text, + }: + mkDerivation { + pname = "prompt-hs"; + version = "1.1.0.1"; + sha256 = "1x6h8cahb6rwdmk2w155gq2mqk4gl11qrsi96h1l0i0a6nzma9wh"; libraryHaskellDepends = [ base microlens @@ -542723,6 +541560,7 @@ self: { ]; description = "A user-friendly, dependently-typed library for asking your users questions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -542943,8 +541781,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.17"; - sha256 = "0g5f3vywbdh6hl6rkzprpnldr9c8cc2lzz2xb31l6dni6ymyns5a"; + version = "5.18"; + sha256 = "06mp5rlw7w33iabyq2dhvmdsq5kw7jqflrlclwlsfg2lb85dg5g9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -543780,44 +542618,6 @@ self: { ) { }; proto-lens-protobuf-types = callPackage ( - { - mkDerivation, - base, - Cabal, - lens-family, - proto-lens, - proto-lens-protoc, - proto-lens-runtime, - proto-lens-setup, - protobuf, - text, - }: - mkDerivation { - pname = "proto-lens-protobuf-types"; - version = "0.7.2.1"; - sha256 = "0622dfxc7s260fhb2hcjis5p0k7cidr7vvxicmhhk2n3zamngvrb"; - setupHaskellDepends = [ - base - Cabal - proto-lens-setup - ]; - libraryHaskellDepends = [ - base - lens-family - proto-lens - proto-lens-runtime - text - ]; - libraryToolDepends = [ - proto-lens-protoc - protobuf - ]; - description = "Basic protocol buffer message types"; - license = lib.licenses.bsd3; - } - ) { inherit (pkgs) protobuf; }; - - proto-lens-protobuf-types_0_7_2_2 = callPackage ( { mkDerivation, base, @@ -543852,59 +542652,10 @@ self: { ]; description = "Basic protocol buffer message types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { inherit (pkgs) protobuf; }; proto-lens-protoc = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - filepath, - ghc, - ghc-paths, - ghc-source-gen, - lens-family, - pretty, - proto-lens, - proto-lens-runtime, - protobuf, - text, - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.8.0.1"; - sha256 = "0kyvcmvsjrj6mwi71k1rfpzvxjy379yb981fj8nacgv5ka1xmja6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - filepath - ]; - libraryToolDepends = [ protobuf ]; - executableHaskellDepends = [ - base - bytestring - containers - filepath - ghc - ghc-paths - ghc-source-gen - lens-family - pretty - proto-lens - proto-lens-runtime - text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = lib.licenses.bsd3; - mainProgram = "proto-lens-protoc"; - } - ) { inherit (pkgs) protobuf; }; - - proto-lens-protoc_0_9_0_0 = callPackage ( { mkDerivation, base, @@ -543948,7 +542699,6 @@ self: { ]; description = "Protocol buffer compiler for the proto-lens library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "proto-lens-protoc"; } ) { inherit (pkgs) protobuf; }; @@ -545457,15 +544207,11 @@ self: { psqueues = callPackage ( { mkDerivation, - array, base, - containers, criterion, deepseq, - ghc-prim, hashable, HUnit, - mtl, PSQueue, QuickCheck, random, @@ -545473,23 +544219,19 @@ self: { tasty, tasty-hunit, tasty-quickcheck, - unordered-containers, }: mkDerivation { pname = "psqueues"; - version = "0.2.8.1"; - sha256 = "0xrz47nq9mksdg1h9zh5dlhwfrfj4nbbrgsjpskv8wz314pi0znb"; + version = "0.2.8.2"; + sha256 = "0kkr0ya5j0g8z86ihq1h3m7hr88hy6yg0bkrg6vdwmhr6vqlcfzn"; libraryHaskellDepends = [ base deepseq - ghc-prim hashable ]; testHaskellDepends = [ - array base deepseq - ghc-prim hashable HUnit QuickCheck @@ -545500,15 +544242,11 @@ self: { ]; benchmarkHaskellDepends = [ base - containers criterion deepseq - ghc-prim hashable - mtl PSQueue random - unordered-containers ]; description = "Pure priority search queues"; license = lib.licenses.bsd3; @@ -545821,6 +544559,58 @@ self: { } ) { }; + ptr-peeker = callPackage ( + { + mkDerivation, + base, + bytestring, + cereal, + criterion, + ptr, + QuickCheck, + quickcheck-instances, + rerebase, + store, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + vector, + }: + mkDerivation { + pname = "ptr-peeker"; + version = "0.2"; + sha256 = "02wwg9b2kk4lcjncpfwgy7gl43nx4zkj13kk9nxbwi7vyx1m36z6"; + libraryHaskellDepends = [ + base + bytestring + ptr + text + vector + ]; + testHaskellDepends = [ + cereal + QuickCheck + quickcheck-instances + rerebase + tasty + tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + cereal + criterion + rerebase + store + tasty-hunit + ]; + description = "High-performance composable binary data deserializers"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + ptr-poker = callPackage ( { mkDerivation, @@ -545881,6 +544671,7 @@ self: { pms-domain-service, pms-infra-cmdrun, pms-infra-procspawn, + pms-infra-serial, pms-infra-socket, pms-infra-watch, pms-infrastructure, @@ -545891,8 +544682,8 @@ self: { }: mkDerivation { pname = "pty-mcp-server"; - version = "0.0.5.0"; - sha256 = "0vra3p8cfzijkz3m5aw3m97vf3awqfc5ga72ks7hmk4fbf7hiwkq"; + version = "0.1.2.0"; + sha256 = "17mczija7br6l2c4x8svjn60si6hxlv6iy5zwf1l42y2sv5y9hh9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -545903,6 +544694,7 @@ self: { pms-domain-service pms-infra-cmdrun pms-infra-procspawn + pms-infra-serial pms-infra-socket pms-infra-watch pms-infrastructure @@ -547150,8 +545942,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.6.0.2"; - sha256 = "1nnv48yxvzs0fk5d6syrkijh2ailarqs14iand116hfk7xz6as0j"; + version = "0.7"; + sha256 = "1rw72rjji7bclql975gqpbisapjgzzywydql6p6b1v0ivzpsaq3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -547925,6 +546717,44 @@ self: { } ) { }; + purl = callPackage ( + { + mkDerivation, + aeson, + base, + case-insensitive, + containers, + http-types, + parsec, + tasty, + tasty-hunit, + text, + }: + mkDerivation { + pname = "purl"; + version = "0.1.0.0"; + sha256 = "07p3jn5ljj0b98hcmacz2yv735c2ywnqywpw2bnyzqxg9ld0c7bx"; + libraryHaskellDepends = [ + aeson + base + case-insensitive + containers + http-types + parsec + text + ]; + testHaskellDepends = [ + base + containers + tasty + tasty-hunit + text + ]; + description = "Support for purl (mostly universal package url)"; + license = lib.licenses.bsd3; + } + ) { }; + pursuit-client = callPackage ( { mkDerivation, @@ -547955,7 +546785,6 @@ self: { ]; description = "A cli client for pursuit"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "pursuit-search"; } ) { }; @@ -548460,8 +547289,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.20"; - sha256 = "1yvl6ydgix16jxjj40ga9kq832n96ifywra1l3z8cr8apjm3wyin"; + version = "2.1.0.21"; + sha256 = "1vmdijr13yf7bc4lxmgshqvny6gc0dgaiy5138pxvimnsvzr19by"; libraryHaskellDepends = [ aeson base @@ -549017,7 +547846,9 @@ self: { ]; description = "Public Verifiable Secret Sharing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "pvss-exe"; + broken = true; } ) { }; @@ -550488,10 +549319,8 @@ self: { }: mkDerivation { pname = "quadratic-irrational"; - version = "0.1.1"; - sha256 = "11nksvr6wnbrphq3ymg93w2xpqw6in3j1qpgbl2f3x9bgiss2l7s"; - revision = "3"; - editedCabalFile = "0y272jnh73ww4768zm4h5vh6ir2l1pnrmk4sbnpvjcx49n83lgs2"; + version = "0.1.2"; + sha256 = "01n7kwg1diqdgid1ixc76c0rj2px1mvgrss0plf43w93dpj7apvn"; libraryHaskellDepends = [ arithmoi base @@ -550513,8 +549342,6 @@ self: { ]; description = "An implementation of quadratic irrationals"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -550655,6 +549482,8 @@ self: { ]; description = "Rage against the quantification"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -550682,6 +549511,7 @@ self: { ]; description = "Rage against the quantification - integration with Aeson"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -551408,8 +550238,8 @@ self: { pname = "queues"; version = "1.0.0"; sha256 = "0mnn6lgd7101lrmwqy4lf04ncq8ci2kfxydm1rlh879gjvzz3lsr"; - revision = "4"; - editedCabalFile = "19appf6z8aavky899wy93487zmjzfhz6jiw1imzm6903q65w4p6r"; + revision = "5"; + editedCabalFile = "00qbr5h2k6hkykfsw6qqqz8krfd06hvridpzijyvdskg97pggjv5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -551486,6 +550316,7 @@ self: { crypto-token, crypton, crypton-x509, + crypton-x509-store, crypton-x509-system, crypton-x509-validation, fast-logger, @@ -551506,8 +550337,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.2.17"; - sha256 = "15fk5786rkryjixqiqk9y7zh5wazwakp6gkk5jr4ryckjdgjyyjj"; + version = "0.2.20"; + sha256 = "1kam5r9i9zvq3z1nandz38jm1nr8npghxpqrav3mr28rbnlwmd3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -551520,6 +550351,7 @@ self: { crypto-token crypton crypton-x509 + crypton-x509-store crypton-x509-system crypton-x509-validation fast-logger @@ -552080,8 +550912,8 @@ self: { }: mkDerivation { pname = "quickcheck-dynamic"; - version = "4.0.0"; - sha256 = "11cd2d1sx6qlyhc2ik20a7ppc0a8ggnf3zalbsj8i3vnj20240pa"; + version = "4.0.1"; + sha256 = "0i40k3ymgdx95w8f6gzn3jasxyqiqa38jjxm398jkrfnj45jxmph"; libraryHaskellDepends = [ base containers @@ -552311,8 +551143,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.8.0"; - sha256 = "1y3icjvd9qbv38q1cxkn48d6fp4b7c0j0j0l3mwkfi8ph8qjg2y6"; + version = "0.8.1"; + sha256 = "10x2yzr4pykgb8krassql1dl81vp78yx06ykswwy6cld46hq1d5h"; libraryHaskellDepends = [ base constraints @@ -552763,8 +551595,8 @@ self: { }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.10.1"; - sha256 = "03ignyi3db1hciwjk03xvwd1ls53sszm4j3398vdw97s53d5li7l"; + version = "0.10.2"; + sha256 = "01cs422p7jqqgnhhm2lcdsm2ilz0hcakhm16vcdfgmxbmp0af15c"; libraryHaskellDepends = [ base base-compat @@ -552835,6 +551667,8 @@ self: { doHaddock = false; description = "Test monadic programs using state machine based models"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -554324,6 +553158,8 @@ self: { ]; description = "Monad transformer for Quote from template-haskell"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -555820,7 +554656,6 @@ self: { tasty, tasty-bench, tasty-hunit, - tasty-inspection-testing, tasty-smallcheck, time, transformers, @@ -555845,7 +554680,6 @@ self: { stm tasty tasty-hunit - tasty-inspection-testing tasty-smallcheck transformers ]; @@ -556258,6 +555092,70 @@ self: { } ) { }; + random-mhs = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + deepseq, + mtl, + primitive, + random, + rdtsc, + smallcheck, + split, + splitmix, + stm, + tasty, + tasty-bench, + tasty-hunit, + tasty-smallcheck, + time, + transformers, + }: + mkDerivation { + pname = "random-mhs"; + version = "1.3.2"; + sha256 = "0kal37pcjh9a3j4mglysar00dz7n1vgyrq30z335v3fsjn0g31i5"; + libraryHaskellDepends = [ + base + bytestring + deepseq + mtl + splitmix + transformers + ]; + testHaskellDepends = [ + base + bytestring + containers + random + smallcheck + stm + tasty + tasty-hunit + tasty-smallcheck + transformers + ]; + benchmarkHaskellDepends = [ + base + mtl + primitive + random + rdtsc + split + splitmix + tasty-bench + time + ]; + description = "Pseudo-random number generation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + random-names = callPackage ( { mkDerivation, @@ -556680,32 +555578,6 @@ self: { ) { }; ranged-list = callPackage ( - { - mkDerivation, - base, - doctest, - typecheck-plugin-nat-simple, - }: - mkDerivation { - pname = "ranged-list"; - version = "0.1.2.1"; - sha256 = "0higq2v525f0i4fwckcq16lf0ig85hlkhiqz0cc3ipanwap8wr6n"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base - typecheck-plugin-nat-simple - ]; - testHaskellDepends = [ - base - doctest - typecheck-plugin-nat-simple - ]; - description = "The list like structure whose length or range of length can be specified"; - license = lib.licenses.bsd3; - } - ) { }; - - ranged-list_0_1_2_3 = callPackage ( { mkDerivation, base, @@ -556731,7 +555603,6 @@ self: { ]; description = "The list like structure whose length or range of length can be specified"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -556956,6 +555827,8 @@ self: { ]; description = "Hot reload and reload-surviving values with GHCi"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -557939,8 +556812,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "14.1.3"; - sha256 = "0x6n149s39kas2wivnpnpdbwa4v1r1wiyima1vca2bj8h33mbmp4"; + version = "14.1.4"; + sha256 = "1qskyb2m4szwhs2f6npg55abxz1jc0rc0pcp4hzbfapwr588myy6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -558276,6 +557149,48 @@ self: { } ) { }; + raytrace = callPackage ( + { + mkDerivation, + base, + Color, + linear, + massiv, + massiv-io, + mtl, + random, + }: + mkDerivation { + pname = "raytrace"; + version = "0.2.0.0"; + sha256 = "1152vr6g4vaz19vri3fkk8aw83mcy4r3kjnvxwcj9nb6wh66612c"; + revision = "1"; + editedCabalFile = "0ahh2q6h0dq5kzz28vbnhr6szf3aahmsmdpcxkq8060b5z46rm44"; + libraryHaskellDepends = [ + base + Color + linear + massiv + massiv-io + mtl + random + ]; + testHaskellDepends = [ + base + Color + linear + massiv + massiv-io + mtl + random + ]; + description = "Ray tracing library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + raz = callPackage ( { mkDerivation, @@ -561297,7 +560212,9 @@ self: { ]; description = "Preprocessor to allow record.field syntax"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "record-dot-preprocessor"; + broken = true; } ) { }; @@ -561424,6 +560341,8 @@ self: { time ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -561656,7 +560575,6 @@ self: { bytestring, containers, ghc-heap, - ghc-prim, mtl, primitive, QuickCheck, @@ -561671,17 +560589,14 @@ self: { }: mkDerivation { pname = "recover-rtti"; - version = "0.5.0"; - sha256 = "17jx201m9x14d624agxx96wkscmlppilmdsjwnh9p930504f66mp"; - revision = "1"; - editedCabalFile = "1m39pwdlnk20lbp45zlgwwp931rhh98qba0rwvzs2789qw3ma57m"; + version = "0.5.1"; + sha256 = "1k8sxwgbbcx38hlkwvpxa44ifw0mr1k10b01a0pym4n0aha9wp90"; libraryHaskellDepends = [ aeson base bytestring containers ghc-heap - ghc-prim mtl primitive sop-core @@ -561695,8 +560610,6 @@ self: { base bytestring containers - ghc-heap - ghc-prim mtl primitive QuickCheck @@ -562105,54 +561018,6 @@ self: { ) { }; redact = callPackage ( - { - mkDerivation, - ansi-terminal, - ansi-wl-pprint, - base, - directory, - explainable-predicates, - HMock, - optparse-applicative, - tasty, - tasty-hunit, - text, - }: - mkDerivation { - pname = "redact"; - version = "0.5.0.0"; - sha256 = "0f9nfkli9spbcidfwq81z4ryjnlyqf4snj1dmhsngpcp0x2am798"; - revision = "3"; - editedCabalFile = "05rf8wvc27fw9j8j75yx55v17vnwyr1gmqw5rqd1ph1zrqwykj2l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal - base - text - ]; - executableHaskellDepends = [ - ansi-terminal - ansi-wl-pprint - base - directory - optparse-applicative - ]; - testHaskellDepends = [ - ansi-terminal - base - explainable-predicates - HMock - tasty - tasty-hunit - ]; - description = "hide secret text on the terminal"; - license = lib.licenses.mit; - mainProgram = "redact"; - } - ) { }; - - redact_0_6_0_0 = callPackage ( { mkDerivation, ansi-terminal, @@ -562218,7 +561083,6 @@ self: { ]; description = "hide secret text on the terminal"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "redact"; } ) { }; @@ -562602,6 +561466,8 @@ self: { ]; description = "Typed, schema-based, composable Redis library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -563164,6 +562030,8 @@ self: { ]; description = "A reference counting library to alias linear resources"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -564753,7 +563621,9 @@ self: { ]; description = "Helper functions to use reflex with gi-gtk"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "reflex-gi-gtk-example"; + broken = true; } ) { }; @@ -565203,7 +564073,9 @@ self: { ]; description = "SDL2 and reflex FRP"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "reflex-sdl2-exe"; + broken = true; } ) { }; @@ -565318,8 +564190,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.6.1.0"; - sha256 = "0s8xqikz9gcaqax99cn96izqv8srmcxs9d93nz9k3f7ncrb0c5zw"; + version = "0.6.1.1"; + sha256 = "0i1745p0kgc7y2zfzix1vfljmgi4aq8nqng9c3nsm420jkys3xz6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -565380,8 +564252,8 @@ self: { }: mkDerivation { pname = "reform"; - version = "0.2.7.5"; - sha256 = "14p98i2682dm1n4drdrvilz67wfp2lr7m8f0wlmk40q3qmhc05xb"; + version = "0.2.7.6"; + sha256 = "0zfyy42i0q5knqsswbz5bgpkq09mf6rksznrb0dv1qszxg1cdlls"; libraryHaskellDepends = [ base containers @@ -565391,8 +564263,6 @@ self: { ]; description = "reform is a type-safe HTML form generation and validation library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -565418,7 +564288,6 @@ self: { ]; description = "Add support for using blaze-html with Reform"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -565463,8 +564332,8 @@ self: { }: mkDerivation { pname = "reform-happstack"; - version = "0.2.5.6"; - sha256 = "1v76z620b0iw3j2cr7mjs13jcf2lk800ilnl2k46jixc4zk75biy"; + version = "0.2.5.8"; + sha256 = "09h4shfz4vvm4sasg7a0c2s447z4hvrnia1ybr2qdrj5sw8jvh26"; libraryHaskellDepends = [ base bytestring @@ -565477,7 +564346,6 @@ self: { ]; description = "Happstack support for reform"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -566151,6 +565019,8 @@ self: { ]; description = "PCRE wrapper"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -567423,6 +566293,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "data structure for assembling components"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -567483,6 +566354,7 @@ self: { ]; description = "Aeson encoders / decoders"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -567549,6 +566421,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "utilities to work with Hedgehog generators and `registry`"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -567626,6 +566499,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Hedgehog generators for Aeson"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -568113,25 +566987,20 @@ self: { mkDerivation, aeson, attoparsec, - attoparsec-aeson, base, base-compat, base16, bifunctors, - binary-parser, bytestring, case-insensitive, comonad, containers, contravariant, - data-dword, - data-textual, hasql, hasql-transaction, hedgehog, iproute, mmorph, - network-ip, opaleye, pretty, product-profunctors, @@ -568152,26 +567021,22 @@ self: { }: mkDerivation { pname = "rel8"; - version = "1.6.0.0"; - sha256 = "1ljw3zihy3d3nihfc8f791h5bggd2r4gb8vq2zraa8s7brml3bx9"; + version = "1.7.0.0"; + sha256 = "1wdrwmxbvl9qchqhys74ddx5y621j9ngn1mkjr6wxsj8k27bz419"; libraryHaskellDepends = [ aeson attoparsec - attoparsec-aeson base base-compat base16 bifunctors - binary-parser bytestring case-insensitive comonad + containers contravariant - data-dword - data-textual hasql iproute - network-ip opaleye pretty product-profunctors @@ -568193,17 +567058,16 @@ self: { bytestring case-insensitive containers - data-dword hasql hasql-transaction hedgehog iproute mmorph - network-ip scientific tasty tasty-hedgehog text + these time tmp-postgres transformers @@ -568994,10 +567858,8 @@ self: { }: mkDerivation { pname = "relude"; - version = "1.2.2.0"; - sha256 = "0ikp23nbzrxfalpsk6n8yg3byh43f8hp156wpxx45yc297gmgpil"; - revision = "4"; - editedCabalFile = "1pfhfswpmqlyhia8lwbx6yf9in3l8m09w1n6g40njqy95s0cxynz"; + version = "1.2.2.2"; + sha256 = "1865bladis4czglyvkcj05qh3fr2bvrm1w5dm5gz3wjs2cnsivci"; libraryHaskellDepends = [ base bytestring @@ -569163,6 +568025,8 @@ self: { ]; description = "`rematch` matchers for Data.Text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -571084,14 +569948,15 @@ self: { base, bytestring, case-insensitive, + hspec, http-client, http-client-tls, http-types, }: mkDerivation { pname = "request"; - version = "0.2.2.0"; - sha256 = "057x980cs826j7yjhiph6m9j33zh0nlrshfdbq4i8g887scbqgnx"; + version = "0.3.0.0"; + sha256 = "1cankhlqmqcs1qnrqf2k53vdwdp3x2dh7gqz37cynvi7ndxzxavd"; libraryHaskellDepends = [ base bytestring @@ -571100,6 +569965,11 @@ self: { http-client-tls http-types ]; + testHaskellDepends = [ + base + bytestring + hspec + ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -571243,8 +570113,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Abstraction to manage user defined Type Errors"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -571261,7 +570129,6 @@ self: { fin, parsec, QuickCheck, - quickcheck-instances, tasty, tasty-quickcheck, transformers, @@ -571269,10 +570136,8 @@ self: { }: mkDerivation { pname = "rere"; - version = "0.2.0.1"; - sha256 = "1cbdn8jz1zcbddc0b4ahln1k7vwg0npxhmnmqaasm3byrrr6l271"; - revision = "4"; - editedCabalFile = "1bn9hif7mb6spyplmxw5sjm5y505yvsa9xnq1aqskn5i74k0hq3h"; + version = "0.2.0.2"; + sha256 = "14lmqbihrhy9cdskxgk9l36ndr323vqiwxs8fry5s64gg00ahlyf"; libraryHaskellDepends = [ base containers @@ -571286,7 +570151,6 @@ self: { base containers QuickCheck - quickcheck-instances tasty tasty-quickcheck ]; @@ -571298,14 +570162,10 @@ self: { containers criterion derp - fin parsec - vec ]; description = "Regular-expressions extended with fixpoints for context-free powers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -571661,10 +570521,8 @@ self: { }: mkDerivation { pname = "resolv"; - version = "0.2.0.2"; - sha256 = "0jz798kliih4lb16s9bjk7sa9034x1qhyrr8z9sp6ahkz4yjh3c8"; - revision = "5"; - editedCabalFile = "0ck1bka5c4mpzgafbnv8brld1c8z7q1nyk2kwy8jirpcgpqwda2q"; + version = "0.2.0.3"; + sha256 = "00viayfl655hibms5nh3nr3j7jhb1bvlhiscinvwnb4bp25a80kp"; libraryHaskellDepends = [ base base16-bytestring @@ -572646,6 +571504,8 @@ self: { pname = "rest-rewrite"; version = "0.4.5"; sha256 = "0yxg3wfwxcrg036cxqcf601vfc5472vx9zwl21y23kpx031h7ny4"; + revision = "1"; + editedCabalFile = "15n4xgrrcxrm8wkxhi9vw1imdx1y7wifbm8l6p0b5sqp995h86fb"; libraryHaskellDepends = [ base containers @@ -573414,6 +572274,7 @@ self: { description = "A powerful, easy-to-use codemodding tool for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -573505,6 +572366,8 @@ self: { ]; description = "A powerful, easy-to-use codemodding tool for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -576628,6 +575491,8 @@ self: { pname = "risc386"; version = "0.0.20230928"; sha256 = "139cxdvb9lg0p9nkqkrwicsiwlhq8vphq6l1dhv8s6aia556w6kw"; + revision = "1"; + editedCabalFile = "0wmj5b3bgdbqdl213z70zplvmxznz75kzg23idaca0nl6nx9jynf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -576643,9 +575508,7 @@ self: { ]; description = "Reduced instruction set i386 simulator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "risc386"; - broken = true; } ) { }; @@ -577196,6 +576059,60 @@ self: { } ) { }; + rme = callPackage ( + { + mkDerivation, + base, + containers, + vector, + }: + mkDerivation { + pname = "rme"; + version = "0.1"; + sha256 = "1d4mrmyq9124l13skx3na5xwhqh90hj1bhydars0jyd9axllyx89"; + libraryHaskellDepends = [ + base + containers + vector + ]; + description = "Reed-Muller Expansion normal form for Boolean Formulas"; + license = lib.licenses.bsd3; + } + ) { }; + + rme-what4 = callPackage ( + { + mkDerivation, + base, + bv-sized, + containers, + parameterized-utils, + rme, + vector, + what4, + }: + mkDerivation { + pname = "rme-what4"; + version = "0.1"; + sha256 = "1ngcydw0ns0yxm393lwrw05jl0rmhhsh2jpr05nv9l0v71sbg087"; + revision = "1"; + editedCabalFile = "19l4p4c88m9hpxr6wpmfrk0rsk52wkfj0msj36bipjp1cdyxf7rz"; + libraryHaskellDepends = [ + base + bv-sized + containers + parameterized-utils + rme + vector + what4 + ]; + description = "What4 adapter for the RME solver"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + rmonad = callPackage ( { mkDerivation, @@ -578124,6 +577041,40 @@ self: { } ) { }; + rollbar_2_0_0_0 = callPackage ( + { + mkDerivation, + aeson, + base, + http-conduit, + lifted-base, + monad-control, + network, + resourcet, + text, + vector, + }: + mkDerivation { + pname = "rollbar"; + version = "2.0.0.0"; + sha256 = "1nyxs35j5fz7h3cdhrp2agqb9l49w7rp92p8ghrrs9r51i4x934d"; + libraryHaskellDepends = [ + aeson + base + http-conduit + lifted-base + monad-control + network + resourcet + text + vector + ]; + description = "error tracking through rollbar.com"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + rollbar-cli = callPackage ( { mkDerivation, @@ -578732,14 +577683,16 @@ self: { filepath, hspec, hspec-golden, + prettyprinter, text, }: mkDerivation { pname = "ronn"; - version = "1.1.1.0"; - sha256 = "0hrahajjmgfb93z2csyqjzbywv74z0c8yaagq5pbhasmrha2jg2i"; + version = "1.2.0.0"; + sha256 = "03jpq7layr7mg97hnxiny26fgjjmksr57la37ma56a3pwbh80zz8"; libraryHaskellDepends = [ base + prettyprinter text ]; testHaskellDepends = [ @@ -578765,8 +577718,8 @@ self: { }: mkDerivation { pname = "ronn-envparse"; - version = "1.0.1.0"; - sha256 = "00vl088d5c64ds9gz979s07zhz65290px4vij7zg4l9hsxhnbnnr"; + version = "1.0.1.1"; + sha256 = "1c3ad2ik59g1an1j5dl9hmyp6a5012isjbdvppmc4qxqz4flhjvg"; libraryHaskellDepends = [ base envparse @@ -578797,8 +577750,8 @@ self: { }: mkDerivation { pname = "ronn-opt-env-conf"; - version = "1.0.1.0"; - sha256 = "0s2myfg84d3ki0ls816xvllw2dinyzn7gy7ckk6zgc56jckrbs3y"; + version = "1.0.1.1"; + sha256 = "1vb0gisl7gwi8b62plv839fz1kk24qiirjq4b652zxq98634hm8r"; libraryHaskellDepends = [ base opt-env-conf @@ -578830,8 +577783,8 @@ self: { }: mkDerivation { pname = "ronn-optparse-applicative"; - version = "1.0.1.0"; - sha256 = "1l8hsdlb2j3c4q1lmz7kxp16z9vky83gai5kl8jqcb6n7is9c5m2"; + version = "1.0.2.1"; + sha256 = "06cfpl6yfjq94n83y61wwn66kzcxn4p8c6b96yn5g3ck8fpy8mhx"; libraryHaskellDepends = [ base optparse-applicative @@ -579535,6 +578488,7 @@ self: { ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { @@ -579599,6 +578553,7 @@ self: { ]; description = "Directed rounding for built-in floating types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -580789,6 +579744,8 @@ self: { ]; description = "Streaming parser/renderer for the RSS standard"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -581054,39 +580011,49 @@ self: { rtorrent-rpc = callPackage ( { mkDerivation, + aeson, + aeson-pretty, attoparsec, base, + base64-bytestring, blaze-builder, blaze-textual, bytestring, - deepseq, - haxr, + containers, + directory, mtl, network, - split, - utf8-string, + network-uri, + scientific, + text, + vector, + vector-split, }: mkDerivation { pname = "rtorrent-rpc"; - version = "0.2.2.0"; - sha256 = "0k14m4r0zsalngb6c4dckr7z521mymabc0ihk0zz402l7s13n68s"; + version = "0.3.0.0"; + sha256 = "0ks30wvqqhgjfn71cah11csms40rrj8h2rvpkp7wxqx01wc4xmfw"; libraryHaskellDepends = [ + aeson + aeson-pretty attoparsec base + base64-bytestring blaze-builder blaze-textual bytestring - deepseq - haxr + containers + directory mtl network - split - utf8-string + network-uri + scientific + text + vector + vector-split ]; - description = "A library for communicating with RTorrent over its XML-RPC interface"; + description = "A library for communicating with RTorrent over its JSON-RPC interface"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -581474,6 +580441,8 @@ self: { ]; description = "Running newly generated Haskell source module"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -581982,8 +580951,8 @@ self: { }: mkDerivation { pname = "rzk"; - version = "0.7.5"; - sha256 = "0x9485rs2hc51jfaczcmx89jn2nnppfnrk717xc559rzb64s2sgk"; + version = "0.7.6"; + sha256 = "0gr1ay9fg6iilc12jfi4ixmw5mgrhv36x1k12f96zk83ppwam765"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -582518,6 +581487,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Safe and very efficient arithmetic operations on fixed decimal point numbers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -583228,8 +582199,6 @@ self: { lens, lens-action, old-time, - QuickCheck, - quickcheck-instances, tasty, tasty-quickcheck, template-haskell, @@ -583240,10 +582209,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.10.4.2"; - sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; - revision = "11"; - editedCabalFile = "034pd8j432bnwpx8gh08fdbdk7mjb986gqwrailjvrcym3rdkcjm"; + version = "0.10.4.3"; + sha256 = "03hkb4znm7jaszz290hqal3zbmw3606gafrbdxrvlcfkrpg1m71c"; libraryHaskellDepends = [ array base @@ -583267,8 +582234,6 @@ self: { HUnit lens lens-action - QuickCheck - quickcheck-instances tasty tasty-quickcheck template-haskell @@ -584780,8 +583745,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.3.0.4"; - sha256 = "1j6xlnhb58kg776jl1bp82lfi95a9xy27haqanbx67mw7n471gc6"; + version = "0.3.0.5"; + sha256 = "1xx99hlscbqyyl5z8yby4x13bnkxzbxcxq817jf4b4v2qyha1a0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -585030,8 +583995,8 @@ self: { }: mkDerivation { pname = "sandwich-contexts-kubernetes"; - version = "0.1.1.0"; - sha256 = "00g2fq9xnk8icrvfjmqkhl3g7pz7159kqajx10vgy4xgdxp25zfz"; + version = "0.1.1.1"; + sha256 = "186xbfpx2fgvckzmagmxw3cyp6k1avk3jvdii9857i3xwccinc1s"; libraryHaskellDepends = [ aeson base @@ -585067,7 +584032,6 @@ self: { ]; testHaskellDepends = [ base - exceptions random relude sandwich @@ -585108,8 +584072,8 @@ self: { }: mkDerivation { pname = "sandwich-contexts-minio"; - version = "0.1.0.0"; - sha256 = "1jdh7qlsixb15ca2f62llqxdjp3frs5h8yggnhmy72zcamg7j2rg"; + version = "0.1.0.2"; + sha256 = "0s8aqra7h52sa1md8x9a38ikd4z1wx5kxdg4a5hw5nvmr0c86y4w"; libraryHaskellDepends = [ aeson base @@ -585189,50 +584153,6 @@ self: { ) { }; sandwich-quickcheck = callPackage ( - { - mkDerivation, - base, - free, - monad-control, - mtl, - QuickCheck, - safe-exceptions, - sandwich, - text, - time, - }: - mkDerivation { - pname = "sandwich-quickcheck"; - version = "0.1.0.7"; - sha256 = "10l3k71lhppss9fdckp4wm3wd16ljg9jy3vq4gsmkzccs66wy7x8"; - libraryHaskellDepends = [ - base - free - monad-control - mtl - QuickCheck - safe-exceptions - sandwich - text - time - ]; - testHaskellDepends = [ - base - free - monad-control - mtl - QuickCheck - safe-exceptions - sandwich - text - time - ]; - description = "Sandwich integration with QuickCheck"; - license = lib.licenses.bsd3; - } - ) { }; - - sandwich-quickcheck_0_2_0_0 = callPackage ( { mkDerivation, base, @@ -585264,7 +584184,6 @@ self: { ]; description = "Sandwich integration with QuickCheck"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -585481,6 +584400,132 @@ self: { } ) { }; + sandwich-webdriver_0_4_0_1 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + data-default, + directory, + exceptions, + filepath, + http-client, + http-client-tls, + http-conduit, + http-types, + microlens, + microlens-aeson, + monad-control, + monad-logger, + mtl, + network, + process, + random, + regex-tdfa, + retry, + safe, + sandwich, + sandwich-contexts, + string-interpolate, + temporary, + text, + time, + transformers, + unix, + unliftio, + unliftio-core, + unordered-containers, + vector, + webdriver, + }: + mkDerivation { + pname = "sandwich-webdriver"; + version = "0.4.0.1"; + sha256 = "1q2ipwvyn4l9zch5h6cgbvgcjbrywpc5zrz2y9bdlbhdpdk9a2iv"; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + data-default + directory + exceptions + filepath + http-client + http-client-tls + http-conduit + http-types + microlens + microlens-aeson + monad-control + monad-logger + mtl + network + process + random + regex-tdfa + retry + safe + sandwich + sandwich-contexts + string-interpolate + temporary + text + time + transformers + unix + unliftio + unliftio-core + unordered-containers + vector + webdriver + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + data-default + directory + exceptions + filepath + http-client + http-client-tls + http-conduit + http-types + microlens + microlens-aeson + monad-control + monad-logger + mtl + network + process + random + regex-tdfa + retry + safe + sandwich + sandwich-contexts + string-interpolate + temporary + text + time + transformers + unix + unliftio + unliftio-core + unordered-containers + vector + webdriver + ]; + description = "Sandwich integration with Selenium WebDriver"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + sarasvati = callPackage ( { mkDerivation, @@ -585640,8 +584685,8 @@ self: { pname = "sasha"; version = "0.2"; sha256 = "1z99hdbn94ngfinijgsd5x4lllwpyxc8jkf67lk0f6p12jfq7qv0"; - revision = "1"; - editedCabalFile = "0k3c54jajid7ggrm87xa0fvh11zjmhy2qn6lply1nykjhip9q1qn"; + revision = "2"; + editedCabalFile = "07zzjr1klfiafxxlxjdyqxdwvy2np6dg60qskv8bq12b863wxrf4"; libraryHaskellDepends = [ base bytestring @@ -585670,7 +584715,6 @@ self: { testToolDepends = [ alex ]; description = "A staged lexer generator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -585775,6 +584819,8 @@ self: { ]; description = "A high-level wrapper over minisat"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -585982,8 +585028,8 @@ self: { }: mkDerivation { pname = "saturn"; - version = "1.0.0.8"; - sha256 = "00aakwr06ygbidbawr60lq07vk5gp74fp7wj71ndzc1ph6crivwp"; + version = "1.0.0.9"; + sha256 = "1c2z4ar1jiqgmkbrgxb7lg1xgcz4fappgd32xgdxl39q7qa4w1mn"; libraryHaskellDepends = [ base containers @@ -586003,6 +585049,45 @@ self: { } ) { }; + saturn_1_1_0_0 = callPackage ( + { + mkDerivation, + base, + containers, + heck, + hspec, + hspec-core, + parsec, + QuickCheck, + text, + time, + }: + mkDerivation { + pname = "saturn"; + version = "1.1.0.0"; + sha256 = "0qwv38aas0lv01bgbdrl60bikkpx7wm1zij7jyyb07y4615ssrjx"; + libraryHaskellDepends = [ + base + containers + heck + hspec + parsec + QuickCheck + text + time + ]; + testHaskellDepends = [ + base + heck + hspec + hspec-core + ]; + description = "Handle POSIX cron schedules"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + satyros = callPackage ( { mkDerivation, @@ -586322,8 +585407,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.2.1"; - sha256 = "0cq2a62ipkbqmrryync5jqmlgyx5pgkrknk3lpcwmv1l1f9l9dgr"; + version = "6.2.2"; + sha256 = "1bgvkmp5l92vsadnj6hjrhxzsdfcfc3b1pdrg9a901vhib0sa98w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -586417,8 +585502,10 @@ self: { array, async, base, + base16-bytestring, bytestring, containers, + cryptohash-sha512, deepseq, directory, filepath, @@ -586438,19 +585525,23 @@ self: { text, time, transformers, + tree-view, uniplate, z3, }: mkDerivation { pname = "sbv"; - version = "11.0"; - sha256 = "1pdyy3mrhyrqacs7snn4dc9drawqij28svn8qlqxx0wr1bwx86gp"; + version = "11.7"; + sha256 = "1nq1yjc4wfjmqhp0y61aqmva99vxnpj2mpksyai63ijmx9zq8yzs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base + base16-bytestring + bytestring containers + cryptohash-sha512 deepseq directory filepath @@ -586465,6 +585556,7 @@ self: { text time transformers + tree-view uniplate ]; testHaskellDepends = [ @@ -586501,7 +585593,7 @@ self: { } ) { inherit (pkgs) z3; }; - sbv_12_0 = callPackage ( + sbv_12_2 = callPackage ( { mkDerivation, array, @@ -586538,8 +585630,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "12.0"; - sha256 = "14c9i9aa6rbm6kfxjcdbcy7vajh3v6bhsginhn1v6hg8430f93rp"; + version = "12.2"; + sha256 = "1ws5mnd2xv4k50pwwghm3yldir4a0p6r8pi6n7zsk7wcp7mxz5m3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -590143,7 +589235,9 @@ self: { executableHaskellDepends = [ base ]; description = "Take screenshot and copy it to the system clipboard"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "screenshot-to-clipboard"; + broken = true; } ) { }; @@ -590475,6 +589569,7 @@ self: { ]; description = "Multidimensional integration over simplices"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -592546,6 +591641,8 @@ self: { ]; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -592571,6 +591668,7 @@ self: { ]; description = "JSON support for the Selda database library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -592641,6 +591739,7 @@ self: { ]; description = "SQLite backend for the Selda database EDSL"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -592672,43 +591771,8 @@ self: { }: mkDerivation { pname = "select-rpms"; - version = "0.2.0"; - sha256 = "14w9j0jdjsqqd75ppka418hjy0ns1cf30q65cakz8mv81ycdpslc"; - libraryHaskellDepends = [ - base - directory - extra - filepath - Glob - rpm-nvr - safe - simple-cmd - simple-cmd-args - simple-prompt - ]; - description = "Select a subset of RPM packages"; - license = lib.licenses.mit; - } - ) { }; - - select-rpms_0_3_0 = callPackage ( - { - mkDerivation, - base, - directory, - extra, - filepath, - Glob, - rpm-nvr, - safe, - simple-cmd, - simple-cmd-args, - simple-prompt, - }: - mkDerivation { - pname = "select-rpms"; - version = "0.3.0"; - sha256 = "0xzhhic205nvh8n2mdb85675x8kdvlgjy0d4xxyw1nq8p078cn51"; + version = "0.3.1"; + sha256 = "0vsy0yq6a154k9hklzg5hciwyvkvk6hmcrbf4qldkqpbrx4dx2d5"; libraryHaskellDepends = [ base directory @@ -592723,7 +591787,6 @@ self: { ]; description = "Select a subset of RPM packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -594749,70 +593812,6 @@ self: { ) { }; sequence-formats = callPackage ( - { - mkDerivation, - attoparsec, - base, - bytestring, - containers, - errors, - exceptions, - foldl, - hspec, - lens-family, - pipes, - pipes-attoparsec, - pipes-bytestring, - pipes-safe, - pipes-zlib, - streaming-commons, - tasty, - tasty-hunit, - transformers, - vector, - }: - mkDerivation { - pname = "sequence-formats"; - version = "1.10.0.0"; - sha256 = "1hsmhhrd88r3wan6b1z1x5j9shy3qg36m27g9lks4fvs95hf76yg"; - libraryHaskellDepends = [ - attoparsec - base - bytestring - containers - errors - exceptions - foldl - lens-family - pipes - pipes-attoparsec - pipes-bytestring - pipes-safe - pipes-zlib - streaming-commons - transformers - vector - ]; - testHaskellDepends = [ - base - bytestring - containers - foldl - hspec - pipes - pipes-safe - pipes-zlib - tasty - tasty-hunit - transformers - vector - ]; - description = "A package with basic parsing utilities for several Bioinformatic data formats"; - license = lib.licenses.gpl3Only; - } - ) { }; - - sequence-formats_1_11_0_2 = callPackage ( { mkDerivation, attoparsec, @@ -594874,76 +593873,10 @@ self: { ]; description = "A package with basic parsing utilities for several Bioinformatic data formats"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; } ) { }; sequenceTools = callPackage ( - { - mkDerivation, - ansi-wl-pprint, - base, - bytestring, - foldl, - hspec, - lens-family, - optparse-applicative, - pipes, - pipes-group, - pipes-ordered-zip, - pipes-safe, - random, - sequence-formats, - split, - transformers, - vector, - }: - mkDerivation { - pname = "sequenceTools"; - version = "1.5.3.1"; - sha256 = "1h2bfapfqs03j46lx5lpyayajwicapycpyli6nkzs7h7cqiwri6f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bytestring - optparse-applicative - pipes - random - sequence-formats - vector - ]; - executableHaskellDepends = [ - ansi-wl-pprint - base - bytestring - foldl - lens-family - optparse-applicative - pipes - pipes-group - pipes-ordered-zip - pipes-safe - random - sequence-formats - split - transformers - vector - ]; - testHaskellDepends = [ - base - bytestring - hspec - pipes - sequence-formats - vector - ]; - description = "A package with tools for processing DNA sequencing data"; - license = lib.licenses.gpl3Only; - } - ) { }; - - sequenceTools_1_6_0_0 = callPackage ( { mkDerivation, base, @@ -595007,7 +593940,6 @@ self: { ]; description = "A package with tools for processing DNA sequencing data"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -595102,6 +594034,8 @@ self: { ]; description = "Grammar-based compression algorithms SEQUITUR"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -595165,17 +594099,14 @@ self: { base, binary, bytestring, - mtl, serdoc-core, tasty, tasty-quickcheck, - text, - time, }: mkDerivation { pname = "serdoc-binary"; - version = "0.3.1.0"; - sha256 = "1v8psfn9l2zagsxrpbmp63pkg4mqy86zlq5g0x33vygyflrlihqv"; + version = "0.3.2.0"; + sha256 = "059kljs9gcmhn2n4cpbq5i6kc20p936ji6wgrbqvsbrs3sh85faz"; libraryHaskellDepends = [ base binary @@ -595186,16 +594117,12 @@ self: { base binary bytestring - mtl serdoc-core tasty tasty-quickcheck - text - time ]; description = "`binary` backend for `serdoc`"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -595211,23 +594138,18 @@ self: { template-haskell, text, th-abstraction, - time, }: mkDerivation { pname = "serdoc-core"; - version = "0.3.1.0"; - sha256 = "03x18gcm3n5vgm82kp0b237pl5jgrlxim83zznlchdlx1scxdwzw"; + version = "0.3.2.0"; + sha256 = "042qwr8bh3wk0qmbzl3xdq3zj5y6hgvf4mphq5d86ssm18bx4kx5"; libraryHaskellDepends = [ base bytestring containers - mtl - tasty - tasty-quickcheck template-haskell text th-abstraction - time ]; testHaskellDepends = [ base @@ -595235,14 +594157,9 @@ self: { mtl tasty tasty-quickcheck - template-haskell - text - time ]; description = "Generated documentation of serialization formats"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -595805,6 +594722,8 @@ self: { pname = "servant"; version = "0.20.3.0"; sha256 = "00k6pwqxpyjp5qm5pjl8qb75iqmpql5iv3ac43xdvikcixffcwzj"; + revision = "2"; + editedCabalFile = "0wvq6jj6js7sxq1rrn4v6749zfwkz3cl8dsypf5cvbpkz1qp4d7j"; libraryHaskellDepends = [ aeson attoparsec @@ -596139,8 +595058,8 @@ self: { pname = "servant-auth-client"; version = "0.4.2.0"; sha256 = "1pvqiygnwnkj6y4mi03qnpjlp305cjmpzp7nrqmc2p6qwnl2l4q9"; - revision = "1"; - editedCabalFile = "0knqj557cxmjih4dxcyqgyraabsbgihlmf3p06x5rqav6ks2zr8n"; + revision = "2"; + editedCabalFile = "1cbsy3kpbwqliyc59fcwxgl5x31gigawl8zb4zhlv5afnq6inm3q"; libraryHaskellDepends = [ base bytestring @@ -596284,8 +595203,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.11.0"; sha256 = "127w2ggii2vqs60cnd5ir4azyrxnm7mhfydi156liykk2v8jkkaj"; - revision = "1"; - editedCabalFile = "0hnjh3ybc7x39sj4cy3m1c0zq5jwbkq5kz2zh4x1263nyddnxha9"; + revision = "2"; + editedCabalFile = "1afn8h6j7fljz5q6p2pml3xpdrbkapy14nb33fxsdasg4nmfzgzr"; setupHaskellDepends = [ base Cabal @@ -596471,6 +595390,8 @@ self: { pname = "servant-auth-server"; version = "0.4.9.1"; sha256 = "04sy2g81pp0pr31xi6h1hqm199z6r4xv3fy2x307dlydxmdm8qb3"; + revision = "1"; + editedCabalFile = "0n29r1359vs9pl5rk7d7yh33i821qn9bcmrbfd4ddxl4n3sy27v1"; libraryHaskellDepends = [ aeson base @@ -596546,8 +595467,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.11.0"; sha256 = "1h5ckkai4qxz9c2a62l2lv0ss8az5j1lwyzs4g652zffrgx9qk28"; - revision = "1"; - editedCabalFile = "1djifng1y6sgxbcwavdc9w52n0wv99b0wya8byszzg5kjk2vzfkj"; + revision = "2"; + editedCabalFile = "171xyzbay3x6bp5zvx9jcn6hi4sh13hh1ydp6z528xh70lr4krrn"; libraryHaskellDepends = [ base lens @@ -597067,6 +595988,8 @@ self: { pname = "servant-cassava"; version = "0.10.2"; sha256 = "1g2d6gvy21mfxl4f0slqxm7jrapqs47m9n615gijmb536i8csfq1"; + revision = "1"; + editedCabalFile = "09zcd3733hb97wnxvwyk5j19c3b6ar0nk2ak5c1iww2mpkv9lvz2"; libraryHaskellDepends = [ base base-compat @@ -597310,8 +596233,8 @@ self: { pname = "servant-client"; version = "0.20.3.0"; sha256 = "0kxmixgv5nmir2bk3zfrhaal4969rf414wi2ccnngjm3395bqrwn"; - revision = "1"; - editedCabalFile = "0644af144zy4axv8hhqhv8mj7amnqd09fbz5rglr6l60d27hpqx1"; + revision = "2"; + editedCabalFile = "01if9an74258ri4sg91z64f200wl5z9i368ngc25wcgqkzpda3xd"; libraryHaskellDepends = [ base base-compat @@ -597399,8 +596322,8 @@ self: { pname = "servant-client-core"; version = "0.20.3.0"; sha256 = "1vv6xf340hyk60vv6jb1zxfpsb7x2ykacb84yrn3h1w4k075hlyn"; - revision = "1"; - editedCabalFile = "1g8arzgcqc9qp1fimrs8iwqvzgsp6br76kkh72hsz0nsg6gmlvc1"; + revision = "2"; + editedCabalFile = "1gnnbybxpvvc82p45iqqiggrw545m6qmkgwfnv18rv83p5lqzcv0"; libraryHaskellDepends = [ aeson attoparsec @@ -598216,10 +597139,8 @@ self: { }: mkDerivation { pname = "servant-event-stream"; - version = "0.3.0.1"; - sha256 = "1nd9v3dmpnqwj63psm6zikgcd635fc80a7bhn0azzlgi551s5kf2"; - revision = "1"; - editedCabalFile = "1dw8rknp2a2b92ri6f4qgvz93r99c7jzrhdmll3n7kkz0lyk9z28"; + version = "0.3.1.0"; + sha256 = "1hpwm093ry1kclyxj4fgr03zcg85c7v9d9drcaxrmrsnihra6ii3"; libraryHaskellDepends = [ base bytestring @@ -598232,8 +597153,6 @@ self: { testHaskellDepends = [ base ]; description = "Servant support for Server-Sent events"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -598920,8 +597839,8 @@ self: { pname = "servant-http-streams"; version = "0.20.2"; sha256 = "029i6rqmj6q5fn32vimr92rwgfb0c5l5cm19ncrw48nh78pgp0zm"; - revision = "1"; - editedCabalFile = "1k1yl2n7j1j8n5d88y0i6ddxgakzd55h94my4rgmga7c8vrd2ynn"; + revision = "2"; + editedCabalFile = "0790nxwl0wiv8qvfl6pv7aqcqivx7yhjyfld9xvpkwkg8ny6z86d"; libraryHaskellDepends = [ base base-compat @@ -598980,6 +597899,8 @@ self: { ]; description = "Automatic derivation of querying functions for servant"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -600764,8 +599685,8 @@ self: { pname = "servant-quickcheck"; version = "0.1.1.0"; sha256 = "0hzfwqxbcgf9mxzlhw53pv99jxlpib56xjsnh8yw15j2pgb908qs"; - revision = "1"; - editedCabalFile = "0lppp61x971hkz3cw2ag2aqnpfjk4bk3vsf80rivhw4r2fv53p07"; + revision = "2"; + editedCabalFile = "1gxbwicayab51avfn5phxbhd4r03l1qadblwkswxkv56b7qlb6av"; libraryHaskellDepends = [ aeson base @@ -600813,6 +599734,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -601205,6 +600128,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate route descriptions from Servant APIs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -601251,6 +600176,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Golden test your Servant APIs using `servant-routes`"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -601379,6 +600305,8 @@ self: { ]; description = "Generate Robots.txt and Sitemap.xml specification for your servant API."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -601407,7 +600335,9 @@ self: { executableHaskellDepends = [ base ]; description = "Automatically generate Servant API modules"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "servant-serf"; + broken = true; } ) { }; @@ -603718,8 +602648,6 @@ self: { ]; description = "Storage backend for serversession using acid-state"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -604362,6 +603290,8 @@ self: { ]; description = "Set monad"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -605295,6 +604225,8 @@ self: { ]; description = "SGF (Smart Game Format) parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -606865,6 +605797,83 @@ self: { ) { }; shakespeare = callPackage ( + { + mkDerivation, + aeson, + base, + blaze-html, + blaze-markup, + bytestring, + containers, + directory, + exceptions, + file-embed, + ghc-prim, + hspec, + HUnit, + parsec, + process, + scientific, + template-haskell, + text, + th-lift, + time, + transformers, + unordered-containers, + vector, + }: + mkDerivation { + pname = "shakespeare"; + version = "2.1.0.1"; + sha256 = "0byj0zhxi1pr8l5f18phzkwcf7z38lyk2zznz8hbkqadfgrmbdkc"; + libraryHaskellDepends = [ + aeson + base + blaze-html + blaze-markup + bytestring + containers + directory + exceptions + file-embed + ghc-prim + parsec + process + scientific + template-haskell + text + th-lift + time + transformers + unordered-containers + vector + ]; + testHaskellDepends = [ + aeson + base + blaze-html + blaze-markup + bytestring + containers + directory + exceptions + ghc-prim + hspec + HUnit + parsec + process + template-haskell + text + time + transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.psibi ]; + } + ) { }; + + shakespeare_2_1_4 = callPackage ( { mkDerivation, aeson, @@ -606937,6 +605946,7 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; } ) { }; @@ -607892,61 +606902,6 @@ self: { ) { }; shellify = callPackage ( - { - mkDerivation, - base, - containers, - data-default-class, - directory, - extra, - hspec, - hspec-core, - HStringTemplate, - mtl, - raw-strings-qq, - shake, - text, - unordered-containers, - }: - mkDerivation { - pname = "shellify"; - version = "0.11.0.4"; - sha256 = "1q0fjdsw76507f0abx6vcqhm1khsx8rd4d1nnipfpj4vsp5w1dbc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - containers - data-default-class - directory - extra - HStringTemplate - mtl - raw-strings-qq - shake - text - unordered-containers - ]; - executableHaskellDepends = [ - base - raw-strings-qq - text - ]; - testHaskellDepends = [ - base - hspec - hspec-core - raw-strings-qq - text - ]; - description = "A tool for generating shell.nix files"; - license = lib.licenses.asl20; - mainProgram = "nix-shellify"; - maintainers = [ lib.maintainers.danielrolls ]; - } - ) { }; - - shellify_0_14_0_1 = callPackage ( { mkDerivation, base, @@ -607968,8 +606923,8 @@ self: { }: mkDerivation { pname = "shellify"; - version = "0.14.0.1"; - sha256 = "1gnr4ii3wn7i0b8facg5a9d3b83lwm7nyk56576ll3nyywqh577i"; + version = "0.14.0.2"; + sha256 = "0hv3ggkx00qn62pdgk3paiqmhm6l3ckgw3ajwg43b9xwji5iiz3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -608005,7 +606960,6 @@ self: { ]; description = "A tool for generating shell.nix files"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "nix-shellify"; maintainers = [ lib.maintainers.danielrolls ]; } @@ -608254,8 +607208,8 @@ self: { }: mkDerivation { pname = "shellwords"; - version = "0.1.4.3"; - sha256 = "054pmhh6yiblycckx9702wxqdx6wj3a29j3vb8arbm9mgyfjvy26"; + version = "0.1.4.4"; + sha256 = "1609i2s68hx3h9zbjyfwdj286w1acrd8z9m7g7f9slbdk9ps3hn5"; libraryHaskellDepends = [ base megaparsec @@ -608299,10 +607253,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.12.1"; - sha256 = "0xqcz0105cvvhngnlzbn2pfrh17vx5p20a1c4c9rp3124922cnhk"; - revision = "1"; - editedCabalFile = "0f71dbh0a3xb82y578z95wchspm2r4i38wiv1s5ls6p6vchk7phm"; + version = "1.12.1.1"; + sha256 = "16fy3mgky92w85g4vhnl3xf9bxjil3kc2vh85qy85jg2kz5mw208"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -608314,7 +607266,6 @@ self: { enclosed-exceptions exceptions filepath - lifted-async lifted-base monad-control mtl @@ -610245,6 +609196,8 @@ self: { ]; description = "Multisets with negative membership"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -613732,6 +612685,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "a class for single tuple implementations"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -613889,8 +612844,8 @@ self: { }: mkDerivation { pname = "singletons-base"; - version = "3.3"; - sha256 = "1h879yy50g6pldnshjh3syvw8qvqzkm8vxsrj237fk76n56x0iq8"; + version = "3.4"; + sha256 = "1cypbpfg0xlh9dy3rwa9yhs2k007x34z7v5h3qd3ncwrvy0f450d"; setupHaskellDepends = [ base Cabal @@ -614043,11 +612998,12 @@ self: { reflection, singletons, singletons-base, + transformers, }: mkDerivation { pname = "singletons-presburger"; - version = "0.7.4.0"; - sha256 = "1c58ckqnhqsmshdc9fmjd5y0x63i3q1jajj8v9cacybhi8krl0sq"; + version = "0.7.4.1"; + sha256 = "1h2xwcnwlrkfd5yi1h3q5xw4yy891mq979iajdxaz7a8dxzz58ga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -614058,9 +613014,11 @@ self: { reflection singletons singletons-base + transformers ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -614080,8 +613038,8 @@ self: { }: mkDerivation { pname = "singletons-th"; - version = "3.3"; - sha256 = "131v6gfx43mwxaqxx4m1lkyb1cxybwpd02m91r83i1phkxmla2qv"; + version = "3.4"; + sha256 = "1fkfaj04g03sw6zsz553a3zyjrhdv7cw1m2dsqb1plk10fj7zi51"; libraryHaskellDepends = [ base containers @@ -614451,7 +613409,7 @@ self: { ]; description = "Sitemap parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.mpscholten ]; } ) { }; @@ -614749,6 +613707,7 @@ self: { ]; description = "Sized sequence data-types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -615027,7 +613986,9 @@ self: { ]; description = "Recursively show space (size and i-nodes) used in subdirectories"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "sizes"; + broken = true; } ) { }; @@ -615221,9 +614182,7 @@ self: { ]; description = "Batteries-included, opinionated test framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "skeletest-preprocessor"; - broken = true; } ) { }; @@ -615451,8 +614410,6 @@ self: { ]; description = "Random access lists: skew binary"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -615490,8 +614447,6 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -615647,53 +614602,6 @@ self: { ) { }; skylighting = callPackage ( - { - mkDerivation, - base, - binary, - blaze-html, - bytestring, - containers, - pretty-show, - skylighting-core, - skylighting-format-ansi, - skylighting-format-blaze-html, - skylighting-format-context, - skylighting-format-latex, - text, - }: - mkDerivation { - pname = "skylighting"; - version = "0.14.5"; - sha256 = "1xs3vhxa8nyn8fm99jzn8cmd3n0y50sjrvy7k05vp5jr5g00zhkc"; - configureFlags = [ "-fexecutable" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - binary - containers - skylighting-core - skylighting-format-ansi - skylighting-format-blaze-html - skylighting-format-context - skylighting-format-latex - ]; - executableHaskellDepends = [ - base - blaze-html - bytestring - containers - pretty-show - text - ]; - description = "syntax highlighting library"; - license = lib.licenses.gpl2Only; - mainProgram = "skylighting"; - } - ) { }; - - skylighting_0_14_6 = callPackage ( { mkDerivation, base, @@ -615712,8 +614620,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.14.6"; - sha256 = "1g73jsxq4ybbghiqyrs3aly5km90qsmp2yvyp399hr7f7pjkpqza"; + version = "0.14.7"; + sha256 = "07q087vryki5dklha90bh7v36a70rf8ii3k1ggdgfnms1b76ppq5"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -615738,7 +614646,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "skylighting"; } ) { }; @@ -615774,92 +614681,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.14.5"; - sha256 = "1bld0xwrbhspycm9ii7rb3c2wnydvc6vmw9q0sxyk6iavsmia0kd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - attoparsec - base - base64-bytestring - binary - bytestring - case-insensitive - colour - containers - directory - filepath - mtl - safe - text - transformers - utf8-string - xml-conduit - ]; - testHaskellDepends = [ - aeson - base - bytestring - containers - Diff - directory - filepath - pretty-show - QuickCheck - tasty - tasty-golden - tasty-hunit - tasty-quickcheck - text - ]; - benchmarkHaskellDepends = [ - base - containers - criterion - filepath - text - ]; - description = "syntax highlighting library"; - license = lib.licenses.bsd3; - } - ) { }; - - skylighting-core_0_14_6 = callPackage ( - { - mkDerivation, - aeson, - attoparsec, - base, - base64-bytestring, - binary, - bytestring, - case-insensitive, - colour, - containers, - criterion, - Diff, - directory, - filepath, - mtl, - pretty-show, - QuickCheck, - safe, - tasty, - tasty-golden, - tasty-hunit, - tasty-quickcheck, - text, - transformers, - utf8-string, - xml-conduit, - }: - mkDerivation { - pname = "skylighting-core"; - version = "0.14.6"; - sha256 = "1zvdgrqqr9xlbnrrp2lbrxqdbpjl11j13qbpibp5rl3y5azqn89y"; - revision = "1"; - editedCabalFile = "0yz5yjvllkxwjzdg7jhm7ma8lv7ymwy3cl4myv0j4krgp30lcdc8"; + version = "0.14.7"; + sha256 = "1gbxmdfmbjpnwva9r4vak3c98prpplk0zqcsh5lwpda389xvqkz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -615906,7 +614729,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -617393,6 +616215,61 @@ self: { } ) { }; + slynx_0_9_0_0 = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + base, + bytestring, + containers, + elynx-markov, + elynx-seq, + elynx-tools, + elynx-tree, + hmatrix, + matrices, + optparse-applicative, + random, + statistics, + text, + transformers, + vector, + }: + mkDerivation { + pname = "slynx"; + version = "0.9.0.0"; + sha256 = "0gmm3qimsr45a7h80f9115jqn7bkyfjpczf7l4wpjvw85la4n4hp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + attoparsec + base + bytestring + containers + elynx-markov + elynx-seq + elynx-tools + elynx-tree + hmatrix + matrices + optparse-applicative + random + statistics + text + transformers + vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "slynx"; + maintainers = [ lib.maintainers.dschrempf ]; + } + ) { }; + small-bytearray-builder = callPackage ( { mkDerivation, @@ -618700,6 +617577,7 @@ self: { ]; description = "Low-level functions for SMT-LIB-based interaction with SMT solvers"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.artem ]; } ) { }; @@ -618739,8 +617617,7 @@ self: { ]; description = "An SMT-LIB backend running solvers as external processes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.artem ]; } ) { }; @@ -618756,8 +617633,8 @@ self: { pname = "smtlib-backends-tests"; version = "0.3"; sha256 = "0lj4bpl4nkw6w2hfjzz16zmrbaj5g3myvbmzlsc5rdsz0xwisfb8"; - revision = "4"; - editedCabalFile = "1yw863054cf2bmb2khhvb1dlanvjq0pqy0k06rfa9x89b9s08lwi"; + revision = "5"; + editedCabalFile = "1frvbpr40dyp2rj2b1hj34f7lfjdb8a3kvbl447gzrqaqapvlya1"; libraryHaskellDepends = [ base smtlib-backends @@ -618766,8 +617643,7 @@ self: { ]; description = "Testing SMT-LIB backends"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.artem ]; } ) { }; @@ -618810,7 +617686,6 @@ self: { ]; description = "An SMT-LIB backend implemented using Z3's C API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { @@ -619321,6 +618196,8 @@ self: { ]; description = "Strict ByteString Parser Combinator"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -620379,7 +619256,9 @@ self: { ]; description = "Scaffolding CLI for the Snap Framework"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "snap"; + broken = true; } ) { }; @@ -620858,6 +619737,8 @@ self: { ]; description = "Alternate authentication snaplet"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -622536,6 +621417,37 @@ self: { } ) { }; + snappy-hs = callPackage ( + { + mkDerivation, + base, + bytestring, + vector, + }: + mkDerivation { + pname = "snappy-hs"; + version = "0.1.0.3"; + sha256 = "1fbl5zw8ag379sacd735948qzaikzv01qzfczgn1lp0wy424q9hv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + bytestring + vector + ]; + executableHaskellDepends = [ + base + bytestring + ]; + testHaskellDepends = [ base ]; + description = "Snappy compression library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "snappy-hs"; + broken = true; + } + ) { }; + snappy-iteratee = callPackage ( { mkDerivation, @@ -623059,8 +621971,6 @@ self: { ]; description = "A checksummed variation on Twitter's Snowflake UID generation algorithm"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -624023,8 +622933,8 @@ self: { }: mkDerivation { pname = "socks5"; - version = "0.6.0.1"; - sha256 = "1q4084wvfhyni3dw0xa5a08k3lkylr6g5bzv6d463iqwn5skjwsq"; + version = "0.8.0.0"; + sha256 = "1lvzrvj5gc6c1vmq05yy269jc7ll4wahqgmyn6gqhs20pkg3cp2g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -625008,6 +623918,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Apply sound changes to words"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -626416,8 +625328,8 @@ self: { }: mkDerivation { pname = "sparse-set"; - version = "0.1.0"; - sha256 = "0yy5n4dli33s6hqlpaifi7p81bp656lymlk3zfw97ijz8ac07dsn"; + version = "0.3.0"; + sha256 = "0wgnl1xd047j3g222clm5vx1g7g1br27zzj43vv33k9gf37xcsrn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -626509,8 +625421,8 @@ self: { }: mkDerivation { pname = "sparse-vector"; - version = "0.1.0"; - sha256 = "0q01fjip1lql62kpqia23mhhv906n3hr7axs760gj7sclqgvcmyr"; + version = "0.3.0"; + sha256 = "0f86qh8akaimz7q146w6sbshxiay0w7bqi7zx7n4877gsq0hirys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -626739,6 +625651,8 @@ self: { ]; description = "Rotate about any suitable axis"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -627030,6 +625944,8 @@ self: { ]; description = "Computational combinatorial species"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -627982,7 +626898,6 @@ self: { base, containers, ghc, - hlint, stm, }: mkDerivation { @@ -627993,7 +626908,6 @@ self: { base containers ghc - hlint stm ]; description = "HLint as a GHC source plugin"; @@ -628192,8 +627106,8 @@ self: { }: mkDerivation { pname = "splitmix-distributions"; - version = "1.0.0"; - sha256 = "03ffkpz3877y2jj1cblxk5gvcpl8zdsiccaq0x7xh761fgz3vsd6"; + version = "1.1.0"; + sha256 = "0rq99yr7mfv0z795s3z2shnsn1ynd7f6gkp3bazpv01sa95rjgj8"; libraryHaskellDepends = [ base containers @@ -628205,18 +627119,14 @@ self: { ]; testHaskellDepends = [ base - erf hspec - mtl - splitmix - transformers ]; description = "Random samplers for some common distributions, based on splitmix"; license = lib.licenses.bsd3; } ) { }; - splitmix-distributions_1_1_0 = callPackage ( + splitmix-distributions_1_2_0 = callPackage ( { mkDerivation, base, @@ -628230,8 +627140,8 @@ self: { }: mkDerivation { pname = "splitmix-distributions"; - version = "1.1.0"; - sha256 = "0rq99yr7mfv0z795s3z2shnsn1ynd7f6gkp3bazpv01sa95rjgj8"; + version = "1.2.0"; + sha256 = "0r47f5gnga16gxmm9x37q636r5kww5g4xy52s79l581a4wygkw6x"; libraryHaskellDepends = [ base containers @@ -629787,8 +628697,6 @@ self: { ]; description = "A primitive yet easy to use sqlite library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -630189,6 +629097,55 @@ self: { } ) { }; + squeal-postgresql-qq = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + generics-sop, + hspec, + postgresql-syntax, + squeal-postgresql, + template-haskell, + text, + time, + uuid, + }: + mkDerivation { + pname = "squeal-postgresql-qq"; + version = "0.1.3.0"; + sha256 = "04kfccn22ik76fgr9bhlk9rh0ldyk010icr1rbzqs6mj3iddyd3w"; + libraryHaskellDepends = [ + aeson + base + bytestring + generics-sop + postgresql-syntax + squeal-postgresql + template-haskell + text + time + uuid + ]; + testHaskellDepends = [ + aeson + base + bytestring + generics-sop + hspec + postgresql-syntax + squeal-postgresql + template-haskell + text + time + uuid + ]; + description = "QuasiQuoter transforming raw sql into Squeal expressions"; + license = lib.licenses.mit; + } + ) { }; + squeal-postgresql-uuid-ossp = callPackage ( { mkDerivation, @@ -630406,6 +629363,8 @@ self: { ]; description = "Module limbo"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -630599,121 +629558,6 @@ self: { ) { }; srtree = callPackage ( - { - mkDerivation, - ad, - attoparsec, - attoparsec-expr, - base, - bytestring, - containers, - dlist, - exceptions, - filepath, - hashable, - HUnit, - ieee754, - lens, - list-shuffle, - massiv, - mtl, - nlopt, - normaldistribution, - optparse-applicative, - random, - split, - statistics, - transformers, - unordered-containers, - vector, - zlib, - }: - mkDerivation { - pname = "srtree"; - version = "2.0.0.2"; - sha256 = "1azvqikk4d9rdd2hc96s7bsnzn575w0lvw6xrl1iiv40655xsdzf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec - attoparsec-expr - base - bytestring - containers - dlist - exceptions - filepath - hashable - ieee754 - lens - list-shuffle - massiv - mtl - random - split - statistics - transformers - unordered-containers - vector - zlib - ]; - librarySystemDepends = [ nlopt ]; - executableHaskellDepends = [ - attoparsec - attoparsec-expr - base - bytestring - containers - dlist - exceptions - filepath - hashable - ieee754 - lens - list-shuffle - massiv - mtl - normaldistribution - optparse-applicative - random - split - statistics - transformers - unordered-containers - vector - zlib - ]; - testHaskellDepends = [ - ad - attoparsec - attoparsec-expr - base - bytestring - containers - dlist - exceptions - filepath - hashable - HUnit - ieee754 - lens - list-shuffle - massiv - mtl - random - split - statistics - transformers - unordered-containers - vector - zlib - ]; - description = "A general library to work with Symbolic Regression expression trees"; - license = lib.licenses.bsd3; - } - ) { inherit (pkgs) nlopt; }; - - srtree_2_0_1_5 = callPackage ( { mkDerivation, ad, @@ -630839,7 +629683,6 @@ self: { ]; description = "A general library to work with Symbolic Regression expression trees"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { inherit (pkgs) nlopt; }; @@ -631995,52 +630838,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.6.4"; - sha256 = "1yvzglvaalk537fza2nhzjacm7aanrnwsz0grg00ln0a06hb8wcb"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson - base - cached-json-file - config-ini - directory - extra - filepath - http-query - process - simple-cmd - simple-cmd-args - text - yaml - ]; - description = "CLI tool for building over Stackage major versions"; - license = lib.licenses.bsd3; - mainProgram = "stack-all"; - } - ) { }; - - stack-all_0_7 = callPackage ( - { - mkDerivation, - aeson, - base, - cached-json-file, - config-ini, - directory, - extra, - filepath, - http-query, - process, - simple-cmd, - simple-cmd-args, - text, - yaml, - }: - mkDerivation { - pname = "stack-all"; - version = "0.7"; - sha256 = "12h5ddkfjv93h677gp2jd254viizbkcg09fflp9mlwxl30bghzdh"; + version = "0.7.1"; + sha256 = "0s9z8ca6g4gc728nn5kgg5j8qykg23cha1qg01y9xpb25mjjprdq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -632060,7 +630859,6 @@ self: { ]; description = "CLI tool for building over Stackage major versions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "stack-all"; } ) { }; @@ -634119,7 +632917,9 @@ self: { executableHaskellDepends = [ base ]; description = "Static site generator"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "stagen"; + broken = true; } ) { }; @@ -634210,8 +633010,8 @@ self: { pname = "stan"; version = "0.2.1.0"; sha256 = "1mf01bpy291131jfl4fcslv0jfn8i8jqwr29v1v48j6c6q49rias"; - revision = "1"; - editedCabalFile = "0b7lf7g8kg7xxxl3zgfxk86bs0pl9i9xm1cvn1n2bpmfvymm19qa"; + revision = "2"; + editedCabalFile = "1ddjjy5sa22k6hbra3y4v1rlh01x5s5k39ihdwbrl4vr2q93q6c9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -635345,6 +634145,8 @@ self: { pname = "statistics"; version = "0.16.3.0"; sha256 = "1rx1dckaj54hzx03zqf4rz43hp80rxxgi8dp31rwy9qjckk4dv03"; + revision = "1"; + editedCabalFile = "1996zyq4n7c5zh36h3nhzx5xyd7z6fa3mqsldrgii56g7ixq1rkz"; libraryHaskellDepends = [ aeson async @@ -636482,35 +635284,6 @@ self: { ) { }; step-function = callPackage ( - { - mkDerivation, - base, - containers, - deepseq, - QuickCheck, - }: - mkDerivation { - pname = "step-function"; - version = "0.2.0.1"; - sha256 = "0hpzbjgjgsrx6q7sjk2dz40i2lggx8wraqlf58ibbv3y1yvb2q6a"; - revision = "2"; - editedCabalFile = "034mk1k23qs8d9y1iyxnpxn0zcq0yy6z7jy9lp3l4vin6gmpz0vk"; - libraryHaskellDepends = [ - base - containers - deepseq - QuickCheck - ]; - testHaskellDepends = [ - base - QuickCheck - ]; - description = "Staircase functions or piecewise constant functions"; - license = lib.licenses.bsd3; - } - ) { }; - - step-function_0_2_1 = callPackage ( { mkDerivation, base, @@ -636522,8 +635295,8 @@ self: { pname = "step-function"; version = "0.2.1"; sha256 = "1izshxrfhidvdhmnyrnqx2lqv2qjpisjdrxa687yywswcd4nlf9g"; - revision = "1"; - editedCabalFile = "1xh4slrjyrbzp5fzrx65bld6y8h8rmqrrb36xprs7c2kq08c6wwv"; + revision = "2"; + editedCabalFile = "1vrlv163yl2997lsas5qj1d5jp563dzy78mdhfp3bd57lvjz396r"; libraryHaskellDepends = [ base containers @@ -636536,7 +635309,6 @@ self: { ]; description = "Staircase functions or piecewise constant functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -637350,6 +636122,7 @@ self: { ]; description = "Bounded channel for STM where item sizes can vary"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -637446,6 +636219,8 @@ self: { ]; description = "Mutable, singly-linked list in STM"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -637720,12 +636495,13 @@ self: { base, clock, hspec, + hspec-discover, transformers, }: mkDerivation { pname = "stopwatch"; - version = "0.1.0.6"; - sha256 = "1gvlh58hkg02a5814lm5f123p853z92dlmv4r5mhhlg5j6g7c62h"; + version = "0.1.0.7"; + sha256 = "0vbbb60gi2cyi9nxf4xwxjfrx5kc614pgywkl65ayakrvn8ab2hp"; libraryHaskellDepends = [ base clock @@ -637736,10 +636512,9 @@ self: { clock hspec ]; + testToolDepends = [ hspec-discover ]; description = "A simple stopwatch utility"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -640060,6 +638835,59 @@ self: { } ) { }; + streamly_0_11_0 = callPackage ( + { + mkDerivation, + atomic-primops, + base, + containers, + deepseq, + directory, + exceptions, + fusion-plugin-types, + hashable, + heaps, + lockfree-queue, + monad-control, + mtl, + network, + streamly-core, + template-haskell, + transformers, + unicode-data, + unordered-containers, + }: + mkDerivation { + pname = "streamly"; + version = "0.11.0"; + sha256 = "1ha7rr6038k1hikfhg2bi0ican8b9yf1gcbaf82b4889wymy7xyc"; + libraryHaskellDepends = [ + atomic-primops + base + containers + deepseq + directory + exceptions + fusion-plugin-types + hashable + heaps + lockfree-queue + monad-control + mtl + network + streamly-core + template-haskell + transformers + unicode-data + unordered-containers + ]; + description = "Streaming data pipelines with declarative concurrency"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + } + ) { }; + streamly-archive = callPackage ( { mkDerivation, @@ -640177,10 +639005,8 @@ self: { }: mkDerivation { pname = "streamly-bytestring"; - version = "0.2.2"; - sha256 = "0c1dnvmqjwk18i8mbimaa1khhj6x6ch45i57giidqin00n11n3cq"; - revision = "1"; - editedCabalFile = "161x23kagixbvf9zvmhdvnaxh8sixilj5rz7f51blq3c8578ljfx"; + version = "0.2.3"; + sha256 = "1j4bjc8f7xwxk19558xxvrmbrahphhn1dh70h9z23pxf18lpnlrn"; libraryHaskellDepends = [ base bytestring @@ -640323,6 +639149,44 @@ self: { } ) { }; + streamly-core_0_3_0 = callPackage ( + { + mkDerivation, + base, + containers, + exceptions, + filepath, + fusion-plugin-types, + ghc-bignum, + ghc-prim, + heaps, + monad-control, + template-haskell, + transformers, + }: + mkDerivation { + pname = "streamly-core"; + version = "0.3.0"; + sha256 = "1qycnqxc7icqfd2y06rg7bgymigmrcmm75q7l7m2c92ssh5rbv4q"; + libraryHaskellDepends = [ + base + containers + exceptions + filepath + fusion-plugin-types + ghc-bignum + ghc-prim + heaps + monad-control + template-haskell + transformers + ]; + description = "Streaming, parsers, arrays, serialization and more"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + streamly-examples = callPackage ( { mkDerivation, @@ -640330,6 +639194,7 @@ self: { containers, directory, exceptions, + filepath, fusion-plugin, hashable, mtl, @@ -640337,6 +639202,7 @@ self: { random, streamly, streamly-core, + streamly-fsevents, tasty-bench, transformers, transformers-base, @@ -640345,8 +639211,8 @@ self: { }: mkDerivation { pname = "streamly-examples"; - version = "0.2.0"; - sha256 = "0m2mzsbijd11hxq6kvsd61700ndvj58qdixvp7mkdrvb7pw5jf4q"; + version = "0.3.0"; + sha256 = "1jha5ay5ympy1hmz02f0jsqhv6k0qma2bv6iycriss076gr529rl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -640354,6 +639220,7 @@ self: { containers directory exceptions + filepath fusion-plugin hashable mtl @@ -640361,6 +639228,7 @@ self: { random streamly streamly-core + streamly-fsevents tasty-bench transformers transformers-base @@ -640374,6 +639242,44 @@ self: { } ) { }; + streamly-fsevents = callPackage ( + { + mkDerivation, + base, + containers, + directory, + filepath, + hspec, + streamly, + streamly-core, + temporary, + }: + mkDerivation { + pname = "streamly-fsevents"; + version = "0.1.0"; + sha256 = "1dsbhp5x4m05sqr27xlgfhvd5h4zvf8gf49v55x2384i33g28hnw"; + libraryHaskellDepends = [ + base + containers + directory + streamly-core + ]; + testHaskellDepends = [ + base + directory + filepath + hspec + streamly + streamly-core + temporary + ]; + description = "File system event notification API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + streamly-fsnotify = callPackage ( { mkDerivation, @@ -640614,6 +639520,53 @@ self: { ]; description = "Use OS processes as stream transformation functions"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + streamly-process_0_4_0 = callPackage ( + { + mkDerivation, + base, + directory, + exceptions, + hspec, + process, + QuickCheck, + streamly, + streamly-core, + tasty-bench, + }: + mkDerivation { + pname = "streamly-process"; + version = "0.4.0"; + sha256 = "0kzb372vq18ybisskyqsqkxsvgz5gk51777jhjzlc4pcp6wm4ds9"; + libraryHaskellDepends = [ + base + exceptions + process + streamly + streamly-core + ]; + testHaskellDepends = [ + base + directory + exceptions + hspec + QuickCheck + streamly-core + ]; + benchmarkHaskellDepends = [ + base + directory + streamly-core + tasty-bench + ]; + description = "Use OS processes as stream transformation functions"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -640675,6 +639628,42 @@ self: { } ) { }; + streamly-text = callPackage ( + { + mkDerivation, + base, + hspec, + quickcheck-instances, + random, + streamly-core, + temporary, + text, + }: + mkDerivation { + pname = "streamly-text"; + version = "0.1.0"; + sha256 = "163bmfnrx54qcq4r3dv9shgm1g84m6cxkq9dcmpnypv8j491agzi"; + libraryHaskellDepends = [ + base + streamly-core + text + ]; + testHaskellDepends = [ + base + hspec + quickcheck-instances + random + streamly-core + temporary + text + ]; + description = "Library for streamly and text interoperation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + streamly-zip = callPackage ( { mkDerivation, @@ -641139,6 +640128,8 @@ self: { ]; description = "Strict containers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -641164,6 +640155,7 @@ self: { ]; description = "Strict containers - Lens instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -641191,6 +640183,7 @@ self: { ]; description = "Strict containers - Serialise instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -641308,8 +640301,8 @@ self: { }: mkDerivation { pname = "strict-impl-params"; - version = "1.0.0"; - sha256 = "0qbc5vk8079vcwxj8sgy696jd629arsws92bcv3vcavnkvzz696c"; + version = "1.1.0"; + sha256 = "1778h3ck3px9cdrxgpcm1f9k76c538c1y8d9nlyhldigrvyminjb"; libraryHaskellDepends = [ base ghc @@ -641318,8 +640311,6 @@ self: { ]; description = "Plugin for making top-level implicit parameters strict"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -641513,8 +640504,8 @@ self: { pname = "strict-tuple"; version = "0.1.5.4"; sha256 = "1znx5lmi7lgn4jzkr73lsc2xac0ypl65bx0pa1hxrc4c74ilysbk"; - revision = "1"; - editedCabalFile = "05s4z3crwb0akjfgcgrqrmzd690wn5s765srhmwdg6b1is8zm1zn"; + revision = "2"; + editedCabalFile = "1qxp8122z7bgbklc8jpd0cv6yjgvszkj86wzc2axk10jhcxwdnrx"; libraryHaskellDepends = [ base bifunctors @@ -641587,8 +640578,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "strict-wrapper"; - version = "0.0.1.0"; - sha256 = "06g79nq6mdbvp8cskdmnxbza4fj1bh0xk4hdvijnx3cljv2rnq7g"; + version = "0.0.2.0"; + sha256 = "1qv3qpfn0v0c0cbr8mdhczgd428d17hnf7gg99y7nnakylyz55y1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Lightweight strict types"; @@ -641867,8 +640858,8 @@ self: { pname = "string-fromto"; version = "1.0.0.0"; sha256 = "0vnf500vahgccbbg7zvxqjxllvyq3jxzf2difqwh46fp62jfqwmx"; - revision = "2"; - editedCabalFile = "0h6w39bx4vvrzyg3bbcr3s78g427akzg7nykxa6zwdxk9sq67fsp"; + revision = "3"; + editedCabalFile = "0lg4iwgi22g4pykp27pf9izjz8n3nmgl9j7ga9dnssa80g92xxgy"; libraryHaskellDepends = [ base bytestring @@ -641877,8 +640868,6 @@ self: { ]; description = "Conversions between common string types, as well as Base16/Base32/Base64"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -642508,6 +641497,30 @@ self: { } ) { }; + strip-ansi = callPackage ( + { + mkDerivation, + ansi-terminal, + base, + hspec, + hspec-discover, + }: + mkDerivation { + pname = "strip-ansi"; + version = "0.0.1"; + sha256 = "1g0vp8q4c5jmvf243jm2l127dak5ic2558vv7ddvb5qsvjkbv4b4"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + ansi-terminal + base + hspec + ]; + testToolDepends = [ hspec-discover ]; + description = "Strip ANSI escape codes from strings"; + license = lib.licenses.mit; + } + ) { }; + strip-ansi-escape = callPackage ( { mkDerivation, @@ -642987,8 +642000,6 @@ self: { ]; description = "Use the Stripe API via Wreq"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -643084,8 +642095,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "6.0.0.12"; - sha256 = "1376pkfkzm3pvhl1k8kqls20vj00zfhyhriccwlzvw918h4f73nc"; + version = "6.0.0.17"; + sha256 = "07sqrn4rx4y7pm82nmqayz4zl53cqq30a6a5zgiixj0h6szwlhdh"; libraryHaskellDepends = [ aeson base @@ -643105,13 +642116,12 @@ self: { } ) { }; - strive_6_0_0_17 = callPackage ( + strive_6_1_0_0 = callPackage ( { mkDerivation, aeson, base, bytestring, - data-default, gpolyline, http-client, http-client-tls, @@ -643123,13 +642133,12 @@ self: { }: mkDerivation { pname = "strive"; - version = "6.0.0.17"; - sha256 = "07sqrn4rx4y7pm82nmqayz4zl53cqq30a6a5zgiixj0h6szwlhdh"; + version = "6.1.0.0"; + sha256 = "1nhm1spxqjp80ik96vz3a0yhfa5i7zmliky0jz76bj687y70kbwz"; libraryHaskellDepends = [ aeson base bytestring - data-default gpolyline http-client http-client-tls @@ -643283,52 +642292,6 @@ self: { ) { }; strongweak = callPackage ( - { - mkDerivation, - base, - generic-random, - hspec, - hspec-discover, - QuickCheck, - quickcheck-instances, - rerefined, - text, - text-builder-linear, - vector, - vector-sized, - }: - mkDerivation { - pname = "strongweak"; - version = "0.11.0"; - sha256 = "0bzx25pwc2mg92f72lj32g78yn5gx8pl8341cxbv3j0ysim1fhfj"; - libraryHaskellDepends = [ - base - rerefined - text - text-builder-linear - vector - vector-sized - ]; - testHaskellDepends = [ - base - generic-random - hspec - QuickCheck - quickcheck-instances - rerefined - text - text-builder-linear - vector - vector-sized - ]; - testToolDepends = [ hspec-discover ]; - description = "Convert between strong and weak representations of types"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.raehik ]; - } - ) { }; - - strongweak_0_12_0 = callPackage ( { mkDerivation, base, @@ -643370,7 +642333,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert between strong and weak representations of types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.raehik ]; } ) { }; @@ -643598,6 +642560,8 @@ self: { ]; description = "Structure (hash) of your data types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644281,204 +643245,205 @@ self: { } ) { }; + stylish-haskell_0_14_6_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + Cabal, + containers, + directory, + file-embed, + filepath, + ghc-lib-parser, + ghc-lib-parser-ex, + HsYAML, + HsYAML-aeson, + HUnit, + mtl, + optparse-applicative, + random, + regex-tdfa, + strict, + syb, + test-framework, + test-framework-hunit, + text, + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.14.6.0"; + sha256 = "1v72i3dxn30z832cs19sbnj5p40y873sv4kciaivd0ls7i5mm8vb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + Cabal + containers + directory + file-embed + filepath + ghc-lib-parser + ghc-lib-parser-ex + HsYAML + HsYAML-aeson + mtl + regex-tdfa + syb + text + ]; + executableHaskellDepends = [ + aeson + base + bytestring + Cabal + containers + directory + file-embed + filepath + ghc-lib-parser + ghc-lib-parser-ex + HsYAML + HsYAML-aeson + mtl + optparse-applicative + regex-tdfa + strict + syb + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + Cabal + containers + directory + file-embed + filepath + ghc-lib-parser + ghc-lib-parser-ex + HsYAML + HsYAML-aeson + HUnit + mtl + random + regex-tdfa + syb + test-framework + test-framework-hunit + text + ]; + description = "Haskell code prettifier"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "stylish-haskell"; + } + ) { }; + + stylish-haskell_0_15_0_1 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + Cabal, + containers, + directory, + file-embed, + filepath, + ghc-lib-parser, + ghc-lib-parser-ex, + HsYAML, + HsYAML-aeson, + HUnit, + mtl, + optparse-applicative, + random, + regex-tdfa, + strict, + syb, + test-framework, + test-framework-hunit, + text, + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.15.0.1"; + sha256 = "02smg717ak2m5i7ciyz8vl91x39idmgd5d0ksljyak2jlj77ybr5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + Cabal + containers + directory + file-embed + filepath + ghc-lib-parser + ghc-lib-parser-ex + HsYAML + HsYAML-aeson + mtl + regex-tdfa + syb + text + ]; + executableHaskellDepends = [ + aeson + base + bytestring + Cabal + containers + directory + file-embed + filepath + ghc-lib-parser + ghc-lib-parser-ex + HsYAML + HsYAML-aeson + mtl + optparse-applicative + regex-tdfa + strict + syb + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + Cabal + containers + directory + file-embed + filepath + ghc-lib-parser + ghc-lib-parser-ex + HsYAML + HsYAML-aeson + HUnit + mtl + random + regex-tdfa + syb + test-framework + test-framework-hunit + text + ]; + description = "Haskell code prettifier"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "stylish-haskell"; + } + ) { }; + stylish-haskell = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - Cabal, - containers, - directory, - file-embed, - filepath, - ghc-lib-parser, - ghc-lib-parser-ex, - HsYAML, - HsYAML-aeson, - HUnit, - mtl, - optparse-applicative, - random, - regex-tdfa, - strict, - syb, - test-framework, - test-framework-hunit, - text, - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.14.6.0"; - sha256 = "1v72i3dxn30z832cs19sbnj5p40y873sv4kciaivd0ls7i5mm8vb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - base - bytestring - Cabal - containers - directory - file-embed - filepath - ghc-lib-parser - ghc-lib-parser-ex - HsYAML - HsYAML-aeson - mtl - regex-tdfa - syb - text - ]; - executableHaskellDepends = [ - aeson - base - bytestring - Cabal - containers - directory - file-embed - filepath - ghc-lib-parser - ghc-lib-parser-ex - HsYAML - HsYAML-aeson - mtl - optparse-applicative - regex-tdfa - strict - syb - text - ]; - testHaskellDepends = [ - aeson - base - bytestring - Cabal - containers - directory - file-embed - filepath - ghc-lib-parser - ghc-lib-parser-ex - HsYAML - HsYAML-aeson - HUnit - mtl - random - regex-tdfa - syb - test-framework - test-framework-hunit - text - ]; - description = "Haskell code prettifier"; - license = lib.licenses.bsd3; - mainProgram = "stylish-haskell"; - } - ) { }; - - stylish-haskell_0_15_0_1 = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - Cabal, - containers, - directory, - file-embed, - filepath, - ghc-lib-parser, - ghc-lib-parser-ex, - HsYAML, - HsYAML-aeson, - HUnit, - mtl, - optparse-applicative, - random, - regex-tdfa, - strict, - syb, - test-framework, - test-framework-hunit, - text, - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.15.0.1"; - sha256 = "02smg717ak2m5i7ciyz8vl91x39idmgd5d0ksljyak2jlj77ybr5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - base - bytestring - Cabal - containers - directory - file-embed - filepath - ghc-lib-parser - ghc-lib-parser-ex - HsYAML - HsYAML-aeson - mtl - regex-tdfa - syb - text - ]; - executableHaskellDepends = [ - aeson - base - bytestring - Cabal - containers - directory - file-embed - filepath - ghc-lib-parser - ghc-lib-parser-ex - HsYAML - HsYAML-aeson - mtl - optparse-applicative - regex-tdfa - strict - syb - text - ]; - testHaskellDepends = [ - aeson - base - bytestring - Cabal - containers - directory - file-embed - filepath - ghc-lib-parser - ghc-lib-parser-ex - HsYAML - HsYAML-aeson - HUnit - mtl - random - regex-tdfa - syb - test-framework - test-framework-hunit - text - ]; - description = "Haskell code prettifier"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "stylish-haskell"; - } - ) { }; - - stylish-haskell_0_15_1_0 = callPackage ( { mkDerivation, aeson, @@ -644572,7 +643537,6 @@ self: { ]; description = "Haskell code prettifier"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "stylish-haskell"; } ) { }; @@ -644881,8 +643845,8 @@ self: { }: mkDerivation { pname = "subcategories"; - version = "0.2.1.1"; - sha256 = "14n1f28wbk0jczig211jj4181ljnczy18hy5pi1y1c6pmbj9mxci"; + version = "0.2.1.2"; + sha256 = "071kcgw07f5wnnbgf9mgflx4z23jf6pjc19wphnw235sqdd65p66"; libraryHaskellDepends = [ base containers @@ -647825,7 +646789,9 @@ self: { ]; description = "A tool to prune unused symbols from icon SVG files"; license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; mainProgram = "svgsym"; + broken = true; } ) { }; @@ -649179,6 +648145,33 @@ self: { } ) { }; + syb_0_7_3 = callPackage ( + { + mkDerivation, + base, + containers, + mtl, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "syb"; + version = "0.7.3"; + sha256 = "139vmi0nvgcxga9qk0daks8cnfx1g9rgsb6xdgi1pz21d7a6hrk7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + containers + mtl + tasty + tasty-hunit + ]; + description = "Scrap Your Boilerplate"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + syb-extras = callPackage ( { mkDerivation, @@ -649290,8 +648283,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.19.0.0"; - sha256 = "12wp36pi2w7f3wffrmss8ra5y3xcpar4i9zp04z5r1g11y9i2h80"; + version = "0.20.0.0"; + sha256 = "0f1ipp6wqykkyiibn1prx61ysvydf4bybiqg5mlzgi5h1cnqh22i"; libraryHaskellDepends = [ async autodocodec @@ -649325,7 +648318,7 @@ self: { } ) { }; - sydtest_0_20_0_0 = callPackage ( + sydtest_0_20_0_1 = callPackage ( { mkDerivation, async, @@ -649357,8 +648350,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.20.0.0"; - sha256 = "0f1ipp6wqykkyiibn1prx61ysvydf4bybiqg5mlzgi5h1cnqh22i"; + version = "0.20.0.1"; + sha256 = "1jnks9znjr4ar6x4a6965w6yijcd80ci6z5qwln4v98ls1a81x19"; libraryHaskellDepends = [ async autodocodec @@ -651702,6 +650695,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library for symbolic integration of mathematical expressions"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -652780,8 +651775,8 @@ self: { pname = "synthesizer-llvm"; version = "1.1.0.1"; sha256 = "166551a0g4m48f0mxccwcrgg488i4v8jpj6rjhd39mh6gxb874yr"; - revision = "1"; - editedCabalFile = "1kjiqwmfp2g7mqg6818qdhjjc5lw8hxf895763npjv5dx62b6dc3"; + revision = "2"; + editedCabalFile = "1rgb81in79d8yvks08hr5lrsbvvwc7p70gz7l9jcp59w2lgg42yb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -654209,6 +653204,25 @@ self: { } ) { }; + tabler-icons = callPackage ( + { + mkDerivation, + base, + bytestring, + }: + mkDerivation { + pname = "tabler-icons"; + version = "0.1.0.2"; + sha256 = "0hz4pwb83lv75dynjallmyf9p08yg8pkvam1g4bg27ji5mckr6vv"; + libraryHaskellDepends = [ + base + bytestring + ]; + description = "Haskell bindings for Tabler SVG icons"; + license = lib.licenses.mit; + } + ) { }; + tables = callPackage ( { mkDerivation, @@ -654609,6 +653623,7 @@ self: { description = "A desktop bar similar to xmobar, but with more GUI"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; mainProgram = "taffybar"; maintainers = [ lib.maintainers.rvl ]; } @@ -654717,31 +653732,6 @@ self: { ) { }; tagged = callPackage ( - { - mkDerivation, - base, - deepseq, - template-haskell, - transformers, - }: - mkDerivation { - pname = "tagged"; - version = "0.8.8"; - sha256 = "19x66y8zqh06mmkbbnpy0m5sk402zj6iqfj3d30h6qji6mwgm0x0"; - revision = "1"; - editedCabalFile = "0chbxdppgpsrjqzf28z53x9wqwz0ncfimhfc6rr9knixvvxxx4wi"; - libraryHaskellDepends = [ - base - deepseq - template-haskell - transformers - ]; - description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; - license = lib.licenses.bsd3; - } - ) { }; - - tagged_0_8_9 = callPackage ( { mkDerivation, base, @@ -654761,7 +653751,6 @@ self: { ]; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -655069,8 +654058,6 @@ self: { ]; description = "Lenses for the taggy html/xml parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -656138,6 +655125,60 @@ self: { } ) { }; + tail = callPackage ( + { + mkDerivation, + async, + base, + directory, + filepath, + hspec, + hspec-discover, + process, + relude, + stm, + stm-chans, + temporary, + text, + which, + }: + mkDerivation { + pname = "tail"; + version = "0.1.0.0"; + sha256 = "1zpld1s7nac596ahc5as594px750arajqqw7d5b2i6as1660d8vp"; + libraryHaskellDepends = [ + async + base + directory + filepath + process + relude + stm + stm-chans + text + which + ]; + testHaskellDepends = [ + async + base + directory + filepath + hspec + hspec-discover + process + relude + stm + stm-chans + temporary + text + which + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell API for tail -f streaming"; + license = lib.licenses.mit; + } + ) { }; + tailfile-hinotify = callPackage ( { mkDerivation, @@ -657017,7 +656058,7 @@ self: { } ) { }; - tar = callPackage ( + tar_0_6_3_0 = callPackage ( { mkDerivation, array, @@ -657085,10 +656126,11 @@ self: { doHaddock = false; description = "Reading, writing and manipulating \".tar\" archive files."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; - tar_0_6_4_0 = callPackage ( + tar = callPackage ( { mkDerivation, array, @@ -657114,8 +656156,8 @@ self: { pname = "tar"; version = "0.6.4.0"; sha256 = "1apkq11xg0rqbgs83hag85r4ibdw7v09n1qj0l0962d80h0aajbr"; - revision = "1"; - editedCabalFile = "05fqzjmcp7qqk1cb23dahszrcpk88cpasi4703irkzj90hvlj9d7"; + revision = "2"; + editedCabalFile = "074f5a4qcdl5vb7334i41azj4aj8i5ql03qrlr3hb5smxhvvk386"; libraryHaskellDepends = [ array base @@ -657161,6 +656203,75 @@ self: { doHaddock = false; description = "Reading, writing and manipulating \".tar\" archive files."; license = lib.licenses.bsd3; + } + ) { }; + + tar_0_7_0_0 = callPackage ( + { + mkDerivation, + array, + base, + bytestring, + containers, + deepseq, + directory, + directory-ospath-streaming, + file-embed, + file-io, + filepath, + os-string, + QuickCheck, + tasty, + tasty-bench, + tasty-quickcheck, + temporary, + time, + transformers, + }: + mkDerivation { + pname = "tar"; + version = "0.7.0.0"; + sha256 = "0dlhf8hhcgl5zvqqsykvg4vwi05b2cy0ml3p6yz4bngqxhnd2jkf"; + libraryHaskellDepends = [ + array + base + bytestring + containers + deepseq + directory + directory-ospath-streaming + file-io + filepath + os-string + time + transformers + ]; + testHaskellDepends = [ + array + base + bytestring + containers + deepseq + directory + directory-ospath-streaming + file-embed + filepath + QuickCheck + tasty + tasty-quickcheck + temporary + time + ]; + benchmarkHaskellDepends = [ + base + bytestring + directory + tasty-bench + temporary + ]; + doHaddock = false; + description = "Reading, writing and manipulating \".tar\" archive files."; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; } ) { }; @@ -657810,16 +656921,17 @@ self: { optparse-applicative, protolude, tasklite-core, + template-haskell, + temporary, text, yaml, }: mkDerivation { pname = "tasklite"; - version = "0.3.0.0"; - sha256 = "0zmpf1b6k6xlypvv04gwwqkmghsxpqii2zci361whfsy3qyyy0hs"; + version = "0.5.0.0"; + sha256 = "0fx3f8v6lg5gk0rzq9mli6f85yw83aw6nvbqs7rbilc9fj0431xg"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; executableHaskellDepends = [ base directory @@ -657831,10 +656943,13 @@ self: { ]; testHaskellDepends = [ base + directory hspec optparse-applicative protolude tasklite-core + template-haskell + temporary ]; description = "CLI task / todo list manager with SQLite backend"; license = lib.licenses.agpl3Plus; @@ -657857,6 +656972,7 @@ self: { directory, editor-open, exceptions, + extra, file-embed, filepath, fuzzily, @@ -657866,6 +656982,7 @@ self: { hsemail, hspec, iso8601-duration, + MissingH, neat-interpolation, optparse-applicative, parsec, @@ -657884,6 +657001,7 @@ self: { simple-sql-parser, sqlite-simple, syb, + terminal-size, text, time, ulid, @@ -657898,8 +657016,8 @@ self: { }: mkDerivation { pname = "tasklite-core"; - version = "0.3.0.0"; - sha256 = "1did4b3gh4pfrwawi2g2ka7d6mg7xcg7vgbdwyfdvwzva5ynrx99"; + version = "0.5.0.0"; + sha256 = "1vkklq4v65ms4nav1ph2zkpq8sqcnrd8272kzmbrfs1jlyzgfrn1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -657912,6 +657030,7 @@ self: { directory editor-open exceptions + extra file-embed filepath fuzzily @@ -657937,6 +657056,7 @@ self: { simple-sql-parser sqlite-simple syb + terminal-size text time ulid @@ -657952,12 +657072,16 @@ self: { testHaskellDepends = [ aeson base + bytestring hourglass hspec + iso8601-duration + MissingH neat-interpolation protolude sqlite-simple text + ulid yaml ]; benchmarkHaskellDepends = [ @@ -658422,6 +657546,8 @@ self: { ]; description = "Check multiple items during a tasty test"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -658534,6 +657660,76 @@ self: { } ) { }; + tasty-discover_5_1_0 = callPackage ( + { + mkDerivation, + ansi-terminal, + base, + bytestring, + containers, + directory, + filepath, + Glob, + hedgehog, + hspec, + hspec-core, + process, + tasty, + tasty-expected-failure, + tasty-golden, + tasty-hedgehog, + tasty-hspec, + tasty-hunit, + tasty-quickcheck, + tasty-smallcheck, + temporary, + }: + mkDerivation { + pname = "tasty-discover"; + version = "5.1.0"; + sha256 = "0y6py4l63idqvvr063cnkqcl3wbsglk3bpizmlgbwmq4gq9aprif"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + directory + filepath + Glob + tasty + ]; + executableHaskellDepends = [ + base + filepath + ]; + testHaskellDepends = [ + ansi-terminal + base + bytestring + containers + directory + filepath + hedgehog + hspec + hspec-core + process + tasty + tasty-expected-failure + tasty-golden + tasty-hedgehog + tasty-hspec + tasty-hunit + tasty-quickcheck + tasty-smallcheck + temporary + ]; + description = "Test discovery for the tasty framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "tasty-discover"; + } + ) { }; + tasty-expected-failure = callPackage ( { mkDerivation, @@ -658742,8 +657938,8 @@ self: { pname = "tasty-golden-extra"; version = "0.1.0.0"; sha256 = "1bfd9ql3pws2vd37nbc5a8b49p7zbq3n48slxkrrwx1szaxkp8nj"; - revision = "3"; - editedCabalFile = "1hdkxsn075bc6f318vk81bddagxsyp390604v3azskfp52bwbl8r"; + revision = "4"; + editedCabalFile = "10bcysc2i1s1p0ih2i9nrqpi0839pgpzzl625iqcbjhv9hnx01kd"; libraryHaskellDepends = [ aeson aeson-diff @@ -659659,42 +658855,6 @@ self: { ) { }; tasty-quickcheck = callPackage ( - { - mkDerivation, - base, - optparse-applicative, - pcre-light, - QuickCheck, - random, - tagged, - tasty, - tasty-hunit, - }: - mkDerivation { - pname = "tasty-quickcheck"; - version = "0.11"; - sha256 = "07liq4wjz7wad8xwgwb5x9ijl8626cfd9f5gb37mjqc23ab268lx"; - libraryHaskellDepends = [ - base - optparse-applicative - QuickCheck - random - tagged - tasty - ]; - testHaskellDepends = [ - base - pcre-light - QuickCheck - tasty - tasty-hunit - ]; - description = "QuickCheck support for the Tasty test framework"; - license = lib.licenses.mit; - } - ) { }; - - tasty-quickcheck_0_11_1 = callPackage ( { mkDerivation, base, @@ -659729,7 +658889,6 @@ self: { ]; description = "QuickCheck support for the Tasty test framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -659783,8 +658942,8 @@ self: { pname = "tasty-rerun"; version = "1.1.20"; sha256 = "0px58jm1yqbg32qf2s0yk09d2qdjxkkz9df89f31q3nzw85jv2ky"; - revision = "1"; - editedCabalFile = "13xmx91hp7i0qzrhada9ckliqkynwlwa8x6pjbvxjcy1y0qsd7hk"; + revision = "2"; + editedCabalFile = "1izl4r9bp61qdrv50lsg7rshzvhj18ija69jp7ybk1z0qcsmm6lj"; libraryHaskellDepends = [ base containers @@ -659806,11 +658965,9 @@ self: { { mkDerivation, ansi-terminal, - async, base, bytestring, containers, - deepseq, directory, filepath, mtl, @@ -659825,19 +658982,16 @@ self: { tasty-hunit, temporary, text, - transformers, }: mkDerivation { pname = "tasty-silver"; - version = "3.3.2"; - sha256 = "1ysdfxnl46d4vnkhw79pcyswqrip68nr7p2rhrk48vy7kxyhca5g"; + version = "3.3.2.1"; + sha256 = "01w3576kymglcddinh10m1wgy71dia49k2pnw5y1c97jjrhanf17"; libraryHaskellDepends = [ ansi-terminal - async base bytestring containers - deepseq directory filepath mtl @@ -659851,18 +659005,15 @@ self: { tasty temporary text - transformers ]; testHaskellDepends = [ base directory filepath - process silently tasty tasty-hunit temporary - transformers ]; description = "A fancy test runner, including support for golden tests"; license = lib.licenses.mit; @@ -659955,8 +659106,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "2.2.2.0"; - sha256 = "1ac9ciqlrq25ipqnjssk3288gnpsi6y9ia8s0f3d6dvcv73593rb"; + version = "2.2.2.1"; + sha256 = "009n17zzaxyw0gfy6jr3869bjd8qwadwwf2ya788kasa00qh8if2"; libraryHaskellDepends = [ base containers @@ -659990,6 +659141,7 @@ self: { doHaddock = false; description = "Tests defined by Search Using Golden Answer References"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -662006,6 +661158,7 @@ self: { description = "Astronomical Observations (FITS, ASDF, WCS, etc)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -663837,39 +662990,6 @@ self: { ) { }; tensort = callPackage ( - { - mkDerivation, - base, - mtl, - QuickCheck, - random, - random-shuffle, - }: - mkDerivation { - pname = "tensort"; - version = "1.0.1.4"; - sha256 = "1k1cp1hx9b845pnj0rmyx450893bgi7l77m3pi83l7mfzx0zbkiz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - mtl - random - random-shuffle - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base - mtl - QuickCheck - ]; - description = "Tunable sorting for responsive robustness and beyond"; - license = lib.licenses.mit; - mainProgram = "tensort"; - } - ) { }; - - tensort_1_1_0_0 = callPackage ( { mkDerivation, base, @@ -663898,7 +663018,6 @@ self: { ]; description = "Tunable sorting for responsive robustness and beyond"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "tensort"; } ) { }; @@ -663919,8 +663038,8 @@ self: { }: mkDerivation { pname = "term-rewriting"; - version = "0.4.0.2"; - sha256 = "0k0aylm6vzcqghp5zw461p68zgzjzr6k4ki7d00zl471lmbdbs8n"; + version = "0.5"; + sha256 = "0cxzccdkhljijca42f5gf03wjqymd4rzsdl5ziy3b7dj1c0ms7vc"; libraryHaskellDepends = [ ansi-wl-pprint array @@ -664431,8 +663550,10 @@ self: { description = "Terminal emulator configurable in Haskell"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; mainProgram = "termonad"; maintainers = [ lib.maintainers.cdepillabout ]; + broken = true; } ) { @@ -665898,10 +665019,8 @@ self: { }: mkDerivation { pname = "testcontainers"; - version = "0.5.1.0"; - sha256 = "17739lvasks03m6f2fgqb9cgsxf4780da44ya1qy3s5672czv6dp"; - revision = "1"; - editedCabalFile = "1i7pqsg0la8jkh2jcgn5wyjlk9zak455pa5ibrrgfp9r5k6a5gcc"; + version = "0.5.2.0"; + sha256 = "0dvzp77gpmiswdnsksw1avxh9b4xn3pvk3q47kqxgvv41rhh5bnd"; libraryHaskellDepends = [ aeson aeson-optics @@ -665940,6 +665059,27 @@ self: { } ) { }; + testcontainers-postgresql = callPackage ( + { + mkDerivation, + base, + testcontainers, + text, + }: + mkDerivation { + pname = "testcontainers-postgresql"; + version = "0.0.1.1"; + sha256 = "0zycclxn0wnnj0qhhxixlljl0jirsfd00wihhlx6azpy0h6qc8lw"; + libraryHaskellDepends = [ + base + testcontainers + text + ]; + description = "Testcontainers integration for PostgreSQL"; + license = lib.licenses.mit; + } + ) { }; + testing-feat = callPackage ( { mkDerivation, @@ -665979,10 +665119,8 @@ self: { }: mkDerivation { pname = "testing-tensor"; - version = "0.1.0"; - sha256 = "1kylr8ip97975n99v9d16j14wda34fxihj22jc4222jkqkh755a1"; - revision = "1"; - editedCabalFile = "0614vzh1zv5h6x0pdfczrxn34wyx51y19w9g9cljbz5rqik7j3q6"; + version = "0.2.0"; + sha256 = "1d5i4vfqcdsq8r400i1509kynddhlk1xjv1y2xvw140a9f74c1h0"; libraryHaskellDepends = [ base fin @@ -666003,8 +665141,6 @@ self: { ]; description = "Pure implementation of tensors, for use in tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -666319,8 +665455,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.10.1"; - sha256 = "0cxdwnfz61zpcwh2va1vmm4mi41zmh72i8c28v17mb1jwvlk59f1"; + version = "0.12.10.3"; + sha256 = "0xpv5zxaixn2kkc3kn547jg7rkg6bl2mrmxiwvxf2r0qgj4kmr2p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -666352,7 +665488,7 @@ self: { } ) { }; - texmath_0_12_10_3 = callPackage ( + texmath_0_13 = callPackage ( { mkDerivation, base, @@ -666375,8 +665511,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.10.3"; - sha256 = "0xpv5zxaixn2kkc3kn547jg7rkg6bl2mrmxiwvxf2r0qgj4kmr2p"; + version = "0.13"; + sha256 = "1cap5mgh7ca0b7sk1k68wpxa1alhyvzgayj65llzyw94j9pbb23x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -666458,7 +665594,7 @@ self: { } ) { }; - text_2_1_2 = callPackage ( + text_2_1_3 = callPackage ( { mkDerivation, array, @@ -666478,14 +665614,13 @@ self: { tasty-inspection-testing, tasty-quickcheck, template-haskell, + temporary, transformers, }: mkDerivation { pname = "text"; - version = "2.1.2"; - sha256 = "1dmcrvgavan5r5h4w0rjcmjii3l1rglr03wi4nd8xlw7jbshr9l4"; - revision = "1"; - editedCabalFile = "0m57vdin9bkn9fbdlhhc9dl625asy39rv7vfzhg92q9sd50d5618"; + version = "2.1.3"; + sha256 = "17gqrvcw7hsm64560dypvmvpqfn1zwb772fllwbn9b4x7vj1xfxi"; libraryHaskellDepends = [ array base @@ -666501,7 +665636,6 @@ self: { binary bytestring deepseq - directory ghc-prim QuickCheck tasty @@ -666509,6 +665643,7 @@ self: { tasty-inspection-testing tasty-quickcheck template-haskell + temporary transformers ]; benchmarkHaskellDepends = [ @@ -666519,6 +665654,7 @@ self: { directory filepath tasty-bench + temporary transformers ]; doCheck = false; @@ -666669,7 +665805,7 @@ self: { } ) { }; - text-builder = callPackage ( + text-builder_0_6_10 = callPackage ( { mkDerivation, base, @@ -666704,10 +665840,11 @@ self: { ]; description = "Efficient strict text builder"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; - text-builder_1_0_0_4 = callPackage ( + text-builder = callPackage ( { mkDerivation, base, @@ -666754,7 +665891,6 @@ self: { ]; description = "Efficient and flexible strict text builder"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -666800,7 +665936,7 @@ self: { } ) { }; - text-builder-dev = callPackage ( + text-builder-dev_0_3_10 = callPackage ( { mkDerivation, base, @@ -666855,10 +665991,11 @@ self: { ]; description = "Edge of developments for \"text-builder\""; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; - text-builder-dev_0_4 = callPackage ( + text-builder-dev = callPackage ( { mkDerivation, base, @@ -666901,7 +666038,6 @@ self: { ]; description = "Edge of developments for \"text-builder\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -666919,8 +666055,8 @@ self: { }: mkDerivation { pname = "text-builder-lawful-conversions"; - version = "0.1.1"; - sha256 = "0kjsznkn7l4m16z9m7l1i47yf4kygyyjpvdsjnwjdn6ix07nwd6d"; + version = "0.1.4"; + sha256 = "0dqinf0nkrviaxz2p465w7zh9nz73a2ivs35b2kx1bd3l8gvl9wp"; libraryHaskellDepends = [ base lawful-conversions @@ -667003,8 +666139,6 @@ self: { ]; description = "Various formats for \"time\" in terms of \"text-builder\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -668390,46 +667524,6 @@ self: { ) { }; text-rope = callPackage ( - { - mkDerivation, - base, - deepseq, - random, - tasty, - tasty-bench, - tasty-quickcheck, - text, - vector, - }: - mkDerivation { - pname = "text-rope"; - version = "0.2"; - sha256 = "12z7radm15mlfz5nrpii2dkjkiis05a88x923jipbhwwbs2j4i5i"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base - deepseq - text - vector - ]; - testHaskellDepends = [ - base - tasty - tasty-quickcheck - text - ]; - benchmarkHaskellDepends = [ - base - random - tasty-bench - text - ]; - description = "Text lines and ropes"; - license = lib.licenses.bsd3; - } - ) { }; - - text-rope_0_3 = callPackage ( { mkDerivation, base, @@ -668467,7 +667561,6 @@ self: { ]; description = "Text lines and ropes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -668498,6 +667591,8 @@ self: { ]; description = "2D text zipper based on text-rope"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -669797,10 +668892,8 @@ self: { }: mkDerivation { pname = "th-desugar"; - version = "1.16"; - sha256 = "0442hqc2b0a1rqcwdlng63bfqa80b2sws414lr08q9v1sgh8gjsf"; - revision = "1"; - editedCabalFile = "18qjikbyjzbhickq11hrn5ill89jdfdzbdx3q2s3630k4g8g2qzi"; + version = "1.17"; + sha256 = "0a00l9r7qyhl30bizrydcsjcraia2vq3r4jc7papab4mdv59z1wz"; libraryHaskellDepends = [ base containers @@ -670260,8 +669353,8 @@ self: { pname = "th-letrec"; version = "0.1.1"; sha256 = "0z4zh9lnp60nih7dwy697jbnk19f1h3ypazw23jbf0z93f7d90b6"; - revision = "1"; - editedCabalFile = "1zghhmlqzz5lfq8zbbxnbyl9naf9ixjpawi6l00z2b31l0wspfsr"; + revision = "2"; + editedCabalFile = "1qdsysi3w9axzwyzn9qzdmw5yfvk8h2k8qi0bg912spydchqgfav"; libraryHaskellDepends = [ base codet @@ -672305,8 +671398,8 @@ self: { }: mkDerivation { pname = "thrift-compiler"; - version = "0.1.0.1"; - sha256 = "09cchacymbacg9i6r375pshl3k23hr16967hjrnmfq4865x7kc9r"; + version = "0.2.0.0"; + sha256 = "0w4m3hqs24lc4bszk0df944v9vr08r8l3i2nk32yrmc96b8ncl7x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -672378,8 +671471,8 @@ self: { }: mkDerivation { pname = "thrift-haxl"; - version = "0.1.0.1"; - sha256 = "0ggl264m25qfmb6wi1mnvn24z6ivhybdzbwj4wfvb08865gw06y0"; + version = "0.2.0.0"; + sha256 = "1lvlz4cbzifsqcddcqnygp8mjdmg6aygdpddcq3250nf60s1b925"; libraryHaskellDepends = [ base hashable @@ -672429,8 +671522,8 @@ self: { }: mkDerivation { pname = "thrift-http"; - version = "0.1.0.1"; - sha256 = "1vsh56axfzi9p374nbxis6k9c9lzba7czkzag3wa3l9l30y3504n"; + version = "0.2.0.0"; + sha256 = "0n4s8wanfl27b5vjlqlf8jf3cmxmy447zwlgffw1w90940fznj9p"; libraryHaskellDepends = [ aeson async @@ -672521,8 +671614,8 @@ self: { }: mkDerivation { pname = "thrift-lib"; - version = "0.1.0.1"; - sha256 = "0y9wg720q18mwn39iq8fd1xldy2vf1km85b2dxmwwb2nl71dxmmj"; + version = "0.2.0.0"; + sha256 = "1kfmlk02yrcz1iczbpzln0sadr3bmw6l8hbvlmpqabyj9rspkixz"; libraryHaskellDepends = [ aeson aeson-pretty @@ -673324,72 +672417,6 @@ self: { ) { }; tidal = callPackage ( - { - mkDerivation, - base, - bytestring, - clock, - colour, - containers, - criterion, - deepseq, - exceptions, - hosc, - microspec, - mtl, - network, - parsec, - primitive, - random, - text, - tidal-link, - transformers, - weigh, - }: - mkDerivation { - pname = "tidal"; - version = "1.9.5"; - sha256 = "1skm8x9gh60c0i1rr0a18jxi6y4mpi83fvzjcadlziwjna5x6a3w"; - revision = "2"; - editedCabalFile = "0l306jxlzkaxyry7p6kmxp7yv8yfw5f1sims2hk3gvhwmb0d64pz"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base - bytestring - clock - colour - containers - deepseq - exceptions - hosc - mtl - network - parsec - primitive - random - text - tidal-link - transformers - ]; - testHaskellDepends = [ - base - containers - deepseq - hosc - microspec - parsec - ]; - benchmarkHaskellDepends = [ - base - criterion - weigh - ]; - description = "Pattern language for improvised music"; - license = lib.licenses.gpl3Only; - } - ) { }; - - tidal_1_10_0 = callPackage ( { mkDerivation, base, @@ -673415,10 +672442,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.10.0"; - sha256 = "07ky2bj0hfm734sf4c2pymxlxs0rmgdd13q7fmb390p5m5fbxy54"; - revision = "2"; - editedCabalFile = "0pka2nxlmf2sh3c4cmpjzb9zmcmhqhf5bz8qprcmxvmzkwm5a4yz"; + version = "1.10.1"; + sha256 = "0pkklwnl49ldmasbdsgz385n9ba2rryivrb66c0hq437f62b0f4q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -673456,7 +672481,6 @@ self: { ]; description = "Pattern language for improvised music"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -673473,8 +672497,8 @@ self: { }: mkDerivation { pname = "tidal-core"; - version = "1.10.0"; - sha256 = "1dg6z0z52zxrqai4jfgqrp4ghsdkcflixwspcbnyrxq1d4jw0zdf"; + version = "1.10.1"; + sha256 = "1wgzfmhmw5f0jzmrjksr84fbc2yhm836b45vyr9mdzgrs8872v9j"; libraryHaskellDepends = [ base colour @@ -673495,29 +672519,6 @@ self: { ) { }; tidal-link = callPackage ( - { - mkDerivation, - base, - system-cxx-std-lib, - }: - mkDerivation { - pname = "tidal-link"; - version = "1.0.3"; - sha256 = "1yqxwjs2y8n01j3x6mc4cg2ka4kl0k3yi0wmcxcs5v257g8f8dg7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - system-cxx-std-lib - ]; - executableHaskellDepends = [ base ]; - description = "Ableton Link integration for Tidal"; - license = lib.licenses.gpl3Only; - mainProgram = "linktest"; - } - ) { }; - - tidal-link_1_2_0 = callPackage ( { mkDerivation, base, @@ -673542,7 +672543,6 @@ self: { executableHaskellDepends = [ base ]; description = "Ableton Link integration for Tidal"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "tidal-linktest"; } ) { }; @@ -673578,6 +672578,44 @@ self: { } ) { }; + tidal-parse = callPackage ( + { + mkDerivation, + base, + containers, + haskellish, + hspec, + mtl, + template-haskell, + text, + tidal-core, + transformers, + }: + mkDerivation { + pname = "tidal-parse"; + version = "0.0.3"; + sha256 = "0ral5xa3wa2jihqlyphrkkz3ma6a1srwndn6za3ak8lwxqg0nmaj"; + libraryHaskellDepends = [ + base + containers + haskellish + mtl + template-haskell + text + tidal-core + transformers + ]; + testHaskellDepends = [ + base + containers + hspec + tidal-core + ]; + description = "Parser for TidalCycles"; + license = lib.licenses.gpl3Only; + } + ) { }; + tidal-serial = callPackage ( { mkDerivation, @@ -673740,6 +672778,60 @@ self: { } ) { }; + tigerbeetle-hs = callPackage ( + { + mkDerivation, + base, + binary, + bytestring, + containers, + hspec, + mtl, + QuickCheck, + stm, + tb_client, + text, + vector, + wide-word, + }: + mkDerivation { + pname = "tigerbeetle-hs"; + version = "0.1.0.0"; + sha256 = "1dlby3x3hap57lzyw6m091bf81bppyxbfvjrrlbr1dyzw8kr9l8p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + binary + bytestring + containers + mtl + stm + text + vector + wide-word + ]; + libraryPkgconfigDepends = [ tb_client ]; + executableHaskellDepends = [ + base + containers + stm + ]; + executableSystemDepends = [ tb_client ]; + testHaskellDepends = [ + base + hspec + QuickCheck + ]; + testSystemDepends = [ tb_client ]; + description = "A Haskell client library for Tigerbeetle database"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "tigerbeetle-hs"; + broken = true; + } + ) { tb_client = null; }; + tight-apply = callPackage ( { mkDerivation, base }: mkDerivation { @@ -674001,7 +673093,7 @@ self: { } ) { }; - time_1_14 = callPackage ( + time_1_15 = callPackage ( { mkDerivation, base, @@ -674016,10 +673108,8 @@ self: { }: mkDerivation { pname = "time"; - version = "1.14"; - sha256 = "0gkzffnvi33ksw4zln0d31dpmqiyl8gicrx04g8j13kjr5ygx86z"; - revision = "1"; - editedCabalFile = "13brg65cvava8w5wlfp3jwn7mpkprad1chws2v14jw1lgzh5b14i"; + version = "1.15"; + sha256 = "0632fg4n4psg4b756fhs6cq0yspyb6k5n3nvpql6bycsbj7i78jg"; libraryHaskellDepends = [ base deepseq @@ -674074,51 +673164,6 @@ self: { ) { }; time-compat = callPackage ( - { - mkDerivation, - base, - base-orphans, - deepseq, - hashable, - HUnit, - QuickCheck, - tagged, - tasty, - tasty-hunit, - tasty-quickcheck, - time, - }: - mkDerivation { - pname = "time-compat"; - version = "1.9.7"; - sha256 = "1k0xcd73wx4l6wsj3c2ksdxch9c4kdbg0v8qmxik4v033nibx3y9"; - revision = "2"; - editedCabalFile = "03xjd6jcdnj1fn6zj6x9hlplnlviz88birkrnqvgzbpsyrdg3gzh"; - libraryHaskellDepends = [ - base - base-orphans - deepseq - hashable - time - ]; - testHaskellDepends = [ - base - deepseq - hashable - HUnit - QuickCheck - tagged - tasty - tasty-hunit - tasty-quickcheck - time - ]; - description = "Compatibility package for time"; - license = lib.licenses.bsd3; - } - ) { }; - - time-compat_1_9_8 = callPackage ( { mkDerivation, base, @@ -674163,7 +673208,6 @@ self: { ]; description = "Compatibility package for time"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -674265,6 +673309,44 @@ self: { } ) { }; + time-hourglass = callPackage ( + { + mkDerivation, + base, + deepseq, + tasty, + tasty-bench, + tasty-hunit, + tasty-quickcheck, + time, + }: + mkDerivation { + pname = "time-hourglass"; + version = "0.3.0"; + sha256 = "08lx5dhs529wqxqh454svyx1l814hwzcn1l669h320x5vms7qz4w"; + libraryHaskellDepends = [ + base + deepseq + ]; + testHaskellDepends = [ + base + deepseq + tasty + tasty-hunit + tasty-quickcheck + time + ]; + benchmarkHaskellDepends = [ + base + deepseq + tasty-bench + time + ]; + description = "A simple and efficient time library"; + license = lib.licenses.bsd3; + } + ) { }; + time-http = callPackage ( { mkDerivation, @@ -674591,6 +673673,8 @@ self: { pname = "time-qq"; version = "0.0.1.0"; sha256 = "11sch73355fpwqgvg8cq0br0108mj9ph085vycnyq1jndrd0wvxd"; + revision = "1"; + editedCabalFile = "0k7ajxvsabqcpg7bl6axmjxf5bc2plcacqvx96cp1x16rhl63qgw"; libraryHaskellDepends = [ base template-haskell @@ -675145,8 +674229,8 @@ self: { pname = "timeline"; version = "0.1.1.0"; sha256 = "15npn5wfhdg2mcvr92n7c9k7jj1jcifm6rcpmyi64mcfsb2g1ry6"; - revision = "1"; - editedCabalFile = "0njs6asmfkq3lvl6i1pagxaxfirq9yjrgh6iaw1vy129wq4vjp2v"; + revision = "2"; + editedCabalFile = "1qqhf50g4b89fa5wjhhgjsvyx3gqrdmpswsyjwkwbrbh6m795xja"; libraryHaskellDepends = [ base containers @@ -675738,12 +674822,13 @@ self: { mkDerivation, base, containers, + mtl, text, }: mkDerivation { pname = "timestats"; - version = "0.2.0"; - sha256 = "085jbizsxn7hxn8i8621gbyss924qzysc56c81lg13xng7s8b3f3"; + version = "0.2.1"; + sha256 = "0a6x2kranf8s25f7lzwksfbxsas5n1l88n5s1xqbcld485x7g2m4"; libraryHaskellDepends = [ base containers @@ -675751,6 +674836,7 @@ self: { ]; testHaskellDepends = [ base + mtl text ]; description = "A library for profiling time in Haskell applications"; @@ -676232,8 +675318,8 @@ self: { }: mkDerivation { pname = "tinyapp"; - version = "0.2.1.0"; - sha256 = "1rbr41wwyi2y8ybzz0fn8bbsqc5gnnvj5nchr6d2gjxylsn8c61d"; + version = "0.2.1.1"; + sha256 = "1gh525aylrlpv5m7qfw4dgzyc442vfnfgqbcrmg0fqzyq4asyv08"; libraryHaskellDepends = [ base brick @@ -677371,7 +676457,7 @@ self: { crypton-x509, crypton-x509-store, crypton-x509-validation, - data-default-class, + data-default, hourglass, hspec, hspec-discover, @@ -677382,17 +676468,17 @@ self: { serialise, transformers, unix-time, + zlib, }: mkDerivation { pname = "tls"; - version = "2.1.1"; - sha256 = "1rzbyrc5x4zq0xdm5h4h0jh2l2ajhbjx5qny6x79ij7zv0c79hkp"; + version = "2.1.8"; + sha256 = "1csdy3426lva1a5f7gh9qm96vzfraqj91jbxlm79wbf1jsdzfhsq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ asn1-encoding asn1-types - async base base16-bytestring bytestring @@ -677401,13 +676487,14 @@ self: { crypton-x509 crypton-x509-store crypton-x509-validation - data-default-class + data-default memory mtl network serialise transformers unix-time + zlib ]; testHaskellDepends = [ asn1-types @@ -677417,7 +676504,6 @@ self: { crypton crypton-x509 crypton-x509-validation - data-default-class hourglass hspec QuickCheck @@ -677429,7 +676515,7 @@ self: { } ) { }; - tls_2_1_10 = callPackage ( + tls_2_1_11 = callPackage ( { mkDerivation, asn1-encoding, @@ -677462,8 +676548,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.1.10"; - sha256 = "18ffiz82a2jsdfliygynn50pxwndh7kykg7z4xq016p2si5nzxaq"; + version = "2.1.11"; + sha256 = "1qw4yvvxv10gh7as8lhg4z1q4l547gikwm1krz6h6kshk0rig6h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -677720,6 +676806,63 @@ self: { } ) { }; + tlynx_0_9_0_0 = callPackage ( + { + mkDerivation, + aeson, + async, + attoparsec, + base, + bytestring, + comonad, + containers, + data-default, + elynx-tools, + elynx-tree, + gnuplot, + optparse-applicative, + parallel, + random, + statistics, + text, + transformers, + vector, + }: + mkDerivation { + pname = "tlynx"; + version = "0.9.0.0"; + sha256 = "1f3x2yi72g7syhjvrhh33vyz21i8kar9hc6973isn2c5x66i60dx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + async + attoparsec + base + bytestring + comonad + containers + data-default + elynx-tools + elynx-tree + gnuplot + optparse-applicative + parallel + random + statistics + text + transformers + vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "tlynx"; + maintainers = [ lib.maintainers.dschrempf ]; + } + ) { }; + tmapchan = callPackage ( { mkDerivation, @@ -678179,6 +677322,8 @@ self: { ]; description = "Launch ZipKin in docker using tmp-proc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -679126,6 +678271,8 @@ self: { pname = "toml-parser"; version = "2.0.1.2"; sha256 = "0fm3anvslylamazr4jgm3y3v3sjh0jv5ydf565cfm1ma9kw4kbhv"; + revision = "1"; + editedCabalFile = "0p6h6yh2x93bgspan1s5hkwg10s834m5gkx1bha9y3ljppffpg2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -679159,57 +678306,6 @@ self: { ) { }; toml-reader = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - containers, - directory, - megaparsec, - parser-combinators, - process, - tasty, - tasty-golden, - tasty-hunit, - text, - time, - unordered-containers, - vector, - }: - mkDerivation { - pname = "toml-reader"; - version = "0.2.2.0"; - sha256 = "01adpq3sn87shhd7nrl52wycv4ksziqnp9d5b5xhgyrsn9vrbs4n"; - libraryHaskellDepends = [ - base - containers - megaparsec - parser-combinators - text - time - ]; - testHaskellDepends = [ - aeson - base - bytestring - containers - directory - process - tasty - tasty-golden - tasty-hunit - text - time - unordered-containers - vector - ]; - description = "TOML format parser compliant with v1.0.0."; - license = lib.licenses.bsd3; - } - ) { }; - - toml-reader_0_3_0_0 = callPackage ( { mkDerivation, aeson, @@ -679254,7 +678350,6 @@ self: { testToolDepends = [ skeletest ]; description = "TOML format parser compliant with v1.0.0."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -679338,6 +678433,8 @@ self: { ]; description = "toml-parser test drivers"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -679366,8 +678463,8 @@ self: { pname = "tomland"; version = "1.3.3.3"; sha256 = "1asnz773mrbg8fkfabq5w24v63sgqljspc4p4nmf4dm6abm2p6d0"; - revision = "2"; - editedCabalFile = "070x95r3silsswl74b5jpsy3s8644mcjqihq3b334jlvvqql5ypw"; + revision = "3"; + editedCabalFile = "0aclzlwr7xmjzda327vzfb8av90g3lpcln1h1gkw76x5w7xq662s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -680301,6 +679398,7 @@ self: { ]; description = "Extensible records library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -681266,8 +680364,8 @@ self: { }: mkDerivation { pname = "tpdb"; - version = "2.8.1"; - sha256 = "1y162ny5c37n58cqd057w8c8865205qi7xq8jsm7gjz3qr86izs8"; + version = "2.8.6"; + sha256 = "0gxjxlwbdbwlygw0n8rd00564vp96jgasf49s6rkm4pgi3hzh1m8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -681479,7 +680577,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Smart version of Debug.Trace module"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -683730,8 +682827,8 @@ self: { pname = "tree-diff"; version = "0.3.4"; sha256 = "0fqfyrab0bf98z251lsfvl2jdcaja6ikfn9q537jbxkx402fi6jy"; - revision = "1"; - editedCabalFile = "1nq6bx4zzp37vw7mmnab5nsc6z8x09xga4aqbfia8r6rp1zxbm10"; + revision = "2"; + editedCabalFile = "1hb62nd833n7gmg508qkbndbj13p8dscwfanilwifbxqwwcn98ah"; libraryHaskellDepends = [ aeson ansi-terminal @@ -684209,6 +683306,8 @@ self: { ]; description = "Functions and newtype wrappers for traversing Trees"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -684711,8 +683810,8 @@ self: { }: mkDerivation { pname = "trexio-hs"; - version = "0.1.0"; - sha256 = "1b64kkisyis9fx577xmppv02z36qy4yk74qsp5ybf517k69vc8nr"; + version = "0.2.0"; + sha256 = "1w5rr889q16z5nmjfbmqs8kc2j2vyd6gs290zvq6ps54ndc9vz86"; libraryHaskellDepends = [ aeson base @@ -685457,6 +684556,8 @@ self: { ]; description = "Template Haskell hack to violate module abstractions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -686137,44 +685238,6 @@ self: { ) { }; ttc = callPackage ( - { - mkDerivation, - base, - bytestring, - tasty, - tasty-hunit, - template-haskell, - text, - text-short, - }: - mkDerivation { - pname = "ttc"; - version = "1.4.0.0"; - sha256 = "0kp3kpdv5hf13qri8ms8jb9ydyn3fpviw0wgkqb3g2m4ccyl8ssq"; - revision = "1"; - editedCabalFile = "0g0p1fq7r90dd89alky78x6cl5g7mq7cs5j033cwy9s1jck17km0"; - libraryHaskellDepends = [ - base - bytestring - template-haskell - text - text-short - ]; - testHaskellDepends = [ - base - bytestring - tasty - tasty-hunit - template-haskell - text - text-short - ]; - description = "Textual Type Classes"; - license = lib.licenses.mit; - } - ) { }; - - ttc_1_5_0_0 = callPackage ( { mkDerivation, base, @@ -686207,7 +685270,6 @@ self: { ]; description = "Textual Type Classes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -687219,6 +686281,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Elegant UCI chess engine"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "turncoat"; } ) { }; @@ -687830,14 +686893,11 @@ self: { { mkDerivation, base, - Cabal, - cabal-test-quickcheck, containers, deepseq, directory, filepath, heap, - HUnit-Plus, monad-loops, MonadRandom, mtl, @@ -687847,6 +686907,10 @@ self: { QuickCheck, ref-fd, split, + tagged, + tasty, + tasty-hunit, + tasty-quickcheck, template-haskell, time, transformers, @@ -687854,10 +686918,8 @@ self: { }: mkDerivation { pname = "twentyseven"; - version = "0.0.0"; - sha256 = "0cq1nz0d8x37h46arf7xf33sk652s834nx7bwk4nqa22fx3905j7"; - revision = "1"; - editedCabalFile = "0izi8ci7sq62zvcfnl4fhkjbf3fhr76wnljlyfc6k9d5qcxxbc9j"; + version = "1.0.0"; + sha256 = "0j1m96s6iajcbpf88i984xrw9233jrzapr2bz9xqc015qccpbvgl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -687884,17 +686946,19 @@ self: { ]; testHaskellDepends = [ base - Cabal - cabal-test-quickcheck - HUnit-Plus QuickCheck split + tagged + tasty + tasty-hunit + tasty-quickcheck vector ]; description = "Rubik's cube solver"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "twentyseven"; + broken = true; } ) { }; @@ -689919,6 +688983,65 @@ self: { } ) { }; + type-machine = callPackage ( + { + mkDerivation, + base, + containers, + criterion, + extensible, + hspec, + lens, + mtl, + superrecord, + syb, + template-haskell, + }: + mkDerivation { + pname = "type-machine"; + version = "0.1.0.2"; + sha256 = "0x7dnlsd2qac99ijqxzj0cjlf8mrrz0dpsfl4wvxkyypqjy4n9jq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + mtl + syb + template-haskell + ]; + executableHaskellDepends = [ + base + containers + mtl + syb + template-haskell + ]; + testHaskellDepends = [ + base + containers + hspec + mtl + syb + template-haskell + ]; + benchmarkHaskellDepends = [ + base + containers + criterion + extensible + lens + mtl + superrecord + syb + template-haskell + ]; + description = "Type-level functions for record types"; + license = lib.licenses.bsd3; + mainProgram = "vector-example"; + } + ) { }; + type-map = callPackage ( { mkDerivation, @@ -690000,6 +689123,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Type-level natural and proofs of their properties"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -690689,23 +689813,26 @@ self: { base, containers, ghc, + ghc-internal, ghc-tcplugins-extra, }: mkDerivation { pname = "typecheck-plugin-nat-simple"; - version = "0.1.0.9"; - sha256 = "0ada389g1zmprwj2injmx49dcj8z6n1vxbbii4c6327mvw39ay0w"; + version = "0.1.0.11"; + sha256 = "0rb4cxib6i7byn7syym252gvrw7mgrfjglqwsiwprc7mx254k42i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers ghc + ghc-internal ghc-tcplugins-extra ]; testHaskellDepends = [ base containers ghc + ghc-internal ghc-tcplugins-extra ]; description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than"; @@ -690713,7 +689840,7 @@ self: { } ) { }; - typecheck-plugin-nat-simple_0_1_0_11 = callPackage ( + typecheck-plugin-nat-simple_0_1_0_12 = callPackage ( { mkDerivation, base, @@ -690724,8 +689851,8 @@ self: { }: mkDerivation { pname = "typecheck-plugin-nat-simple"; - version = "0.1.0.11"; - sha256 = "0rb4cxib6i7byn7syym252gvrw7mgrfjglqwsiwprc7mx254k42i"; + version = "0.1.0.12"; + sha256 = "0zr49wan5wbd3iqh98fkqh6p431a1v4ny170dsp2ryr0xdmrs480"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -690992,8 +690119,6 @@ self: { ]; description = "A framework for strongly typed FSM"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -691022,7 +690147,6 @@ self: { testHaskellDepends = [ base ]; description = "GUI framework based on typed-fsm"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -691118,29 +690242,26 @@ self: { io-classes, io-sim, network, - primitive, QuickCheck, serialise, singletons, tasty, tasty-quickcheck, - time, unix, }: mkDerivation { pname = "typed-protocols"; - version = "1.0.0.0"; - sha256 = "109503w2fsnfpnf0s1988c6km17pj56vlgwrcxi0d4yjy5n88462"; + version = "1.1.0.0"; + sha256 = "0zxm7440985vlir9g7qn61g8k31afx33ca5s6jn5yi3j9q5vny5y"; libraryHaskellDepends = [ base bytestring contra-tracer io-classes network - primitive + QuickCheck serialise singletons - time ]; testHaskellDepends = [ base @@ -691158,6 +690279,8 @@ self: { doHaddock = false; description = "A framework for strongly typed protocols"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -691705,8 +690828,8 @@ self: { }: mkDerivation { pname = "typelet"; - version = "0.1.5"; - sha256 = "120hwkwv1zriqjhwlplqql5qs30kxydwi07w8px6zfqhk6yixkq5"; + version = "0.1.6"; + sha256 = "0bf5g30zbjwk8z30vad6hqslpslfxzmanpv4zpdn41kdcnc1dj8k"; libraryHaskellDepends = [ base containers @@ -692197,6 +691320,8 @@ self: { ]; description = "Typelevel printf"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -692511,81 +691636,8 @@ self: { }: mkDerivation { pname = "typst"; - version = "0.6.1"; - sha256 = "1vcg5lvqxsxf5q1jg8c5g2fcmalfah92fqv6rzr8b5m1ipai2c10"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - array - base - bytestring - cassava - containers - directory - filepath - mtl - ordered-containers - parsec - pretty - regex-tdfa - scientific - text - time - toml-parser - typst-symbols - vector - xml-conduit - yaml - ]; - testHaskellDepends = [ - base - bytestring - directory - filepath - pretty-show - tasty - tasty-golden - text - time - ]; - description = "Parsing and evaluating typst syntax"; - license = lib.licenses.bsd3; - } - ) { }; - - typst_0_8_0_1 = callPackage ( - { - mkDerivation, - aeson, - array, - base, - bytestring, - cassava, - containers, - directory, - filepath, - mtl, - ordered-containers, - parsec, - pretty, - pretty-show, - regex-tdfa, - scientific, - tasty, - tasty-golden, - text, - time, - toml-parser, - typst-symbols, - vector, - xml-conduit, - yaml, - }: - mkDerivation { - pname = "typst"; - version = "0.8.0.1"; - sha256 = "00vqm67smsh4idp9506b3698k573p5h101ygff0wkrbkk7bmaf4v"; + version = "0.8.0.2"; + sha256 = "1q17vy9x5g64zzw5156bdh3mippin6ygkc3yqk0mbffkrfdcn21m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -692624,30 +691676,10 @@ self: { ]; description = "Parsing and evaluating typst syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; typst-symbols = callPackage ( - { - mkDerivation, - base, - text, - }: - mkDerivation { - pname = "typst-symbols"; - version = "0.1.7"; - sha256 = "1f158pjvkbx05aj0nv4qwlz2h7a811v9r7nlhnp54vws4h4rdvnz"; - libraryHaskellDepends = [ - base - text - ]; - description = "Symbol and emoji lookup for typst language"; - license = lib.licenses.mit; - } - ) { }; - - typst-symbols_0_1_8_1 = callPackage ( { mkDerivation, base, @@ -692663,7 +691695,6 @@ self: { ]; description = "Symbol and emoji lookup for typst language"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -692875,6 +691906,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Safe timezone-aware handling of time"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -693818,9 +692851,7 @@ self: { executableHaskellDepends = [ base ]; description = "Minimalistic console UI (getLine), arrow key support (edit, browse cmd history)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; - broken = true; } ) { }; @@ -694011,7 +693042,9 @@ self: { ]; description = "Display Ukulele fingering charts in the terminal"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; mainProgram = "uku"; + broken = true; } ) { }; @@ -694116,6 +693149,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Another ULID implementation with tight memory representation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -694482,8 +693517,6 @@ self: { ]; description = "Unification based on unbound-generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -695036,6 +694069,8 @@ self: { ]; description = "Make any action thread safe"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -695414,6 +694449,36 @@ self: { } ) { }; + unicode-data_0_7_0 = callPackage ( + { + mkDerivation, + base, + deepseq, + hspec, + tasty, + tasty-bench, + }: + mkDerivation { + pname = "unicode-data"; + version = "0.7.0"; + sha256 = "1l21qmhg9pgfnfxi8bsdvbb5zq9izz23caz44s32r9xmd7mdxqc0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + hspec + ]; + benchmarkHaskellDepends = [ + base + deepseq + tasty + tasty-bench + ]; + description = "Access Unicode Character Database (UCD)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + unicode-data-names = callPackage ( { mkDerivation, @@ -695426,8 +694491,8 @@ self: { }: mkDerivation { pname = "unicode-data-names"; - version = "0.4.0"; - sha256 = "041vkwzxk2fiq3icxkp9rrvvi2z4w7fjdh75cx8nsg8g573g1q05"; + version = "0.5.0"; + sha256 = "0hyx4lwz9y2nzk2jmrjcway02wbgam8yrsgggn28p8aabn452kp4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -695448,6 +694513,8 @@ self: { ]; description = "Unicode characters names and aliases"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -695459,8 +694526,8 @@ self: { }: mkDerivation { pname = "unicode-data-parser"; - version = "0.3.0.2"; - sha256 = "1zz5n9x4pn1whyam0kkbsml8iawk1savzp7xc7idvripdm61dd31"; + version = "0.3.0.3"; + sha256 = "1bayaa83d6iacddbz7sywjflkm42lr3p76glmnvfysfgj76hm8ni"; libraryHaskellDepends = [ base bytestring @@ -695481,8 +694548,8 @@ self: { }: mkDerivation { pname = "unicode-data-scripts"; - version = "0.4.0"; - sha256 = "04v87r7hqvkyzdsrjiap1brxdaqvsk5vpg2m7jd6i630ag0lvvzy"; + version = "0.5.0"; + sha256 = "0s01wjps018i67xgrkrvzw6ncmvsa3hpbl7qs75pvfskhjh9bjvq"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -695511,8 +694578,8 @@ self: { }: mkDerivation { pname = "unicode-data-security"; - version = "0.4.0"; - sha256 = "0awmdzv6d619c0lpk0jwnr0dh1sa2f8jr1h0ab3ysjp7gq969qfq"; + version = "0.5.0"; + sha256 = "199gk9444wbr1balpl1nzl0ivbpx5md9qhd9gf4jrjkb2nkk1hi6"; libraryHaskellDepends = [ base unicode-data @@ -695529,6 +694596,8 @@ self: { ]; description = "Unicode security mechanisms database"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -696493,43 +695562,6 @@ self: { ) { }; union = callPackage ( - { - mkDerivation, - base, - criterion, - deepseq, - hashable, - lens, - profunctors, - tagged, - vinyl, - }: - mkDerivation { - pname = "union"; - version = "0.1.2"; - sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3"; - revision = "9"; - editedCabalFile = "11h6qk4gnnlprrgi9cnpcbklwqnjsvk97h9gbp7ka4ib78xgxr84"; - libraryHaskellDepends = [ - base - deepseq - hashable - profunctors - tagged - vinyl - ]; - benchmarkHaskellDepends = [ - base - criterion - deepseq - lens - ]; - description = "Extensible type-safe unions"; - license = lib.licenses.bsd3; - } - ) { }; - - union_0_1_3 = callPackage ( { mkDerivation, base, @@ -696561,7 +695593,6 @@ self: { ]; description = "Extensible type-safe unions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -696582,8 +695613,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "union-color"; - version = "0.1.2.1"; - sha256 = "188pmc32i1c112hph1irdpcf9b1jxc68yydqm2xzdcvyf1xpp0vr"; + version = "0.1.4.0"; + sha256 = "01nnnvvnb41j780zkx1krw2z8vc7vfxckv7ya0g5nyk5v0xr4yn4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Unify verious color formats"; @@ -696670,12 +695701,15 @@ self: { bytestring, containers, data-default, + dir-traverse, directory, filepath, filepattern, fsnotify, + hspec, lvar, monad-logger, + monad-logger-extras, mtl, relude, text, @@ -696685,8 +695719,8 @@ self: { }: mkDerivation { pname = "unionmount"; - version = "0.2.2.0"; - sha256 = "0gifmxi8z74s6ckh5naqp3y4ililxzp52adnlp10cglbjw18vkis"; + version = "0.3.0.0"; + sha256 = "12c1h1b6ikhzdk6cdd0q3sn3brb3fy1i6fv2l92kr99fnp709vmk"; libraryHaskellDepends = [ async base @@ -696706,6 +695740,28 @@ self: { unliftio with-utf8 ]; + testHaskellDepends = [ + async + base + bytestring + containers + data-default + dir-traverse + directory + filepath + filepattern + fsnotify + hspec + lvar + monad-logger + monad-logger-extras + mtl + relude + text + time + unliftio + with-utf8 + ]; description = "Union mount filesystem paths into Haskell datastructures"; license = lib.licenses.mit; } @@ -696820,10 +695876,8 @@ self: { }: mkDerivation { pname = "unique"; - version = "0.0.1"; - sha256 = "1dgln2dr64ma1isqskj1qnjslg9smmr7jssg8hmk68wp36i3rwkd"; - revision = "1"; - editedCabalFile = "0l95cgs8hbvakrcqzqk5l9rkz3cr3jnnszq7pgjnxrqfhgsp58r7"; + version = "0.0.2"; + sha256 = "1bjlwzbyqdjnn5fvdnkkbkq7hwlqsc9n6h8c7ndk758gwzkf4j75"; libraryHaskellDepends = [ base hashable @@ -696910,10 +695964,8 @@ self: { }: mkDerivation { pname = "unique-logic-tf"; - version = "0.5.1"; - sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; - revision = "4"; - editedCabalFile = "05dl9xbbd1zlynqzz0vmi41q2vhjj7jrgpdzb4jxdxkcg5xrxccr"; + version = "0.5.1.1"; + sha256 = "0l6clsazbcvbxb65hhjp3cpsf00ksi625mvxg0v9gxqibssdziwk"; libraryHaskellDepends = [ base containers @@ -697912,6 +696964,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -697930,8 +696984,8 @@ self: { pname = "unix"; version = "2.8.7.0"; sha256 = "10zv2vcq82vv56hll5mpvfwfsx6ymp2f75fwxvp5a1xgbafqgpfb"; - revision = "1"; - editedCabalFile = "1mvyq9qajqhjrv8m3zch07v8h0b3i4fj40d8jfcpbmqsq6h8sa9d"; + revision = "2"; + editedCabalFile = "0xbk68mf4j22kw1a4q732b5n6j8v5yqc55kxdk3hcwgcm0a12wys"; libraryHaskellDepends = [ base bytestring @@ -697976,7 +697030,6 @@ self: { mkDerivation, base, directory, - extra, hspec, HUnit, monad-parallel, @@ -697985,8 +697038,8 @@ self: { }: mkDerivation { pname = "unix-compat"; - version = "0.7.4"; - sha256 = "1x7gnyfx8bny5x021pha30frqxn4slwvg9aaal82kqcg1jb3m6v8"; + version = "0.7.4.1"; + sha256 = "0m20wi8z3bzdc9b61rilb9hrbrd0wwzyc06rfbk7a30h99i135iz"; libraryHaskellDepends = [ base unix @@ -697994,7 +697047,6 @@ self: { testHaskellDepends = [ base directory - extra hspec HUnit monad-parallel @@ -698406,6 +697458,7 @@ self: { ]; description = "Unleash feature toggle client"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; } ) { }; @@ -698453,6 +697506,8 @@ self: { ]; description = "Unleash feature toggle client core"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -698774,8 +697829,8 @@ self: { }: mkDerivation { pname = "unliftio-pool"; - version = "0.4.3.0"; - sha256 = "1pwlyvlz7qf4vdgijzal9dmwdgx7hzqqan5ws6dg38qb5914j1rq"; + version = "0.4.3.1"; + sha256 = "0xc74l6qfr8gy4ap8xjhjb57grj415bgz82kyxgp255w0qv9k2bz"; libraryHaskellDepends = [ base resource-pool @@ -700269,71 +699324,6 @@ self: { ) { }; uri-bytestring = callPackage ( - { - mkDerivation, - attoparsec, - base, - base-compat, - blaze-builder, - bytestring, - containers, - criterion, - deepseq, - deepseq-generics, - hedgehog, - HUnit, - network-uri, - safe, - tasty, - tasty-hedgehog, - tasty-hunit, - template-haskell, - th-lift-instances, - transformers, - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.3.3.1"; - sha256 = "0s0k26v5x6601rbpkjkl5vp3dkp9xwj1dlgy4xkl470i4sna1rzk"; - libraryHaskellDepends = [ - attoparsec - base - blaze-builder - bytestring - containers - template-haskell - th-lift-instances - ]; - testHaskellDepends = [ - attoparsec - base - base-compat - blaze-builder - bytestring - containers - hedgehog - HUnit - safe - tasty - tasty-hedgehog - tasty-hunit - transformers - ]; - benchmarkHaskellDepends = [ - base - blaze-builder - bytestring - criterion - deepseq - deepseq-generics - network-uri - ]; - description = "Haskell URI parsing as ByteStrings"; - license = lib.licenses.bsd3; - } - ) { }; - - uri-bytestring_0_4_0_1 = callPackage ( { mkDerivation, attoparsec, @@ -700395,7 +699385,6 @@ self: { ]; description = "Haskell URI parsing as ByteStrings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -702568,6 +701557,7 @@ self: { ]; description = "Attribute Grammar System of Universiteit Utrecht"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "uuagc"; } ) { }; @@ -702649,6 +701639,8 @@ self: { ]; description = "Cabal plugin for UUAGC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -702838,10 +701830,8 @@ self: { }: mkDerivation { pname = "uuid-crypto"; - version = "1.4.0.0"; - sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn"; - revision = "6"; - editedCabalFile = "146jxyrsnrcwsll6mhq8a67ms1wpbbbxmkbq7sh9wza6c4g2fbwy"; + version = "1.4.0.1"; + sha256 = "1j8d089dlxca6hzlvaz5kzblwh7ywdmf5h36309jlb3cb35hjfrq"; libraryHaskellDepends = [ base binary @@ -703022,7 +702012,9 @@ self: { ]; description = "Tweak .cabal files"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.berberman ]; + broken = true; } ) { }; @@ -703750,8 +702742,8 @@ self: { pname = "validation-selective"; version = "0.2.0.0"; sha256 = "11s9qsp5w19lbk6vg6psr3864xdsx2kmx3gcmnn2qkx6wsblx24s"; - revision = "5"; - editedCabalFile = "05lksfm5micvk2s6isscjf6ipkwd79698cczlr0ipgn8wmm87drz"; + revision = "6"; + editedCabalFile = "14m1iwnz026ypqn1xzs5dgsq2jkyxfcam82dbmdidwhviyr7hzbz"; libraryHaskellDepends = [ base deepseq @@ -704739,8 +703731,10 @@ self: { }: mkDerivation { pname = "variety"; - version = "0.1.0.2"; - sha256 = "0bzavj283kraw1ffx1fi5ihxvk168mqs1s6j6vpl7qmxc0zmrn5a"; + version = "0.2.1.0"; + sha256 = "0arz9ggs70xlmzbkk2i8gw90brgxcskxw00sp70nxwi2iggwdqi4"; + revision = "1"; + editedCabalFile = "1igrzy8wgg50xja0p0zh6jyzgrww7y9vxvqyl2dngw68z2bfnyh2"; libraryHaskellDepends = [ base bytestring @@ -704803,6 +703797,8 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Vary: Friendly and fast polymorphic variants (open unions/coproducts/extensible sums)"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -705717,8 +704713,8 @@ self: { pname = "vector"; version = "0.13.2.0"; sha256 = "08y4j6nii17wc3fs3d2za0yifd3gqf73g8zyqdnsry6bhv3h7wi8"; - revision = "1"; - editedCabalFile = "07yq10jyw5y7dlvhx1szyf19gmih02sf5qv5937jl3ajfdxsadmp"; + revision = "2"; + editedCabalFile = "1d3ma9zldfwlz7s41hmaz6jcxwpyh12cld44n1ys7n2jvb43ihws"; libraryHaskellDepends = [ base deepseq @@ -706153,35 +705149,6 @@ self: { ) { }; vector-extras = callPackage ( - { - mkDerivation, - base, - containers, - deferred-folds, - foldl, - hashable, - unordered-containers, - vector, - }: - mkDerivation { - pname = "vector-extras"; - version = "0.2.8.2"; - sha256 = "1h14iv4aw6qk29wvfg63rm16ydx0pkqq3wz5g1jdhbqk6i11r59j"; - libraryHaskellDepends = [ - base - containers - deferred-folds - foldl - hashable - unordered-containers - vector - ]; - description = "Utilities for the \"vector\" library"; - license = lib.licenses.mit; - } - ) { }; - - vector-extras_0_3 = callPackage ( { mkDerivation, base, @@ -706197,7 +705164,6 @@ self: { ]; description = "Utilities for the \"vector\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -706648,29 +705614,6 @@ self: { ) { }; vector-space = callPackage ( - { - mkDerivation, - base, - Boolean, - MemoTrie, - NumInstances, - }: - mkDerivation { - pname = "vector-space"; - version = "0.16"; - sha256 = "17676s2f8i45dj5gk370nc8585aylah7m34nbf34al7r1492y2qc"; - libraryHaskellDepends = [ - base - Boolean - MemoTrie - NumInstances - ]; - description = "Vector & affine spaces, linear maps, and derivatives"; - license = lib.licenses.bsd3; - } - ) { }; - - vector-space_0_19 = callPackage ( { mkDerivation, base, @@ -706692,7 +705635,6 @@ self: { ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -706872,8 +705814,8 @@ self: { pname = "vector-stream"; version = "0.1.0.1"; sha256 = "0z5z88flyassdpgga412qci6brr9gyljbx875wd479fy9crhgxfh"; - revision = "3"; - editedCabalFile = "07k5zgxbfbcf9anzfd9c0lzaa79iypdk303dq5yswi9a46andjas"; + revision = "4"; + editedCabalFile = "17i8x8vsnb853pagq4zsm6zfgv4zdxk8j1b42ylnj8f72ggycfs8"; libraryHaskellDepends = [ base ghc-prim @@ -707106,8 +706048,8 @@ self: { }: mkDerivation { pname = "venzone"; - version = "1.1.1.2"; - sha256 = "1ajaw6r6yi6rmji3m0zbwiyxcimq1rx6h1mspsv305368as1cqnx"; + version = "1.1.2.0"; + sha256 = "104prg5z2iw7hsd43qa0k05qkbyw8wnxr4j17lzhmvl0vins68c8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -707659,49 +706601,6 @@ self: { } ) { }; - versions_5_0_5 = callPackage ( - { - mkDerivation, - base, - deepseq, - hashable, - megaparsec, - microlens, - parser-combinators, - QuickCheck, - tasty, - tasty-hunit, - tasty-quickcheck, - text, - }: - mkDerivation { - pname = "versions"; - version = "5.0.5"; - sha256 = "01kn3ilizzm5n05nz0qry1vjb6bj8dzinyqn3mbshds298acn70c"; - libraryHaskellDepends = [ - base - deepseq - hashable - megaparsec - parser-combinators - text - ]; - testHaskellDepends = [ - base - megaparsec - microlens - QuickCheck - tasty - tasty-hunit - tasty-quickcheck - text - ]; - description = "Types and parsers for software version numbers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - versions = callPackage ( { mkDerivation, @@ -707881,6 +706780,8 @@ self: { doHaddock = false; description = "Array library monomorphized with backpack"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -710258,51 +709159,6 @@ self: { ) { inherit (pkgs) vte; }; vty = callPackage ( - { - mkDerivation, - base, - binary, - blaze-builder, - bytestring, - deepseq, - directory, - filepath, - microlens, - microlens-mtl, - mtl, - parsec, - stm, - text, - utf8-string, - vector, - }: - mkDerivation { - pname = "vty"; - version = "6.2"; - sha256 = "0ywqfdngfv5pnsk5pa99yizpbhdq856sy3z70q2hmpmlc2r4h7vg"; - libraryHaskellDepends = [ - base - binary - blaze-builder - bytestring - deepseq - directory - filepath - microlens - microlens-mtl - mtl - parsec - stm - text - utf8-string - vector - ]; - description = "A simple terminal UI library"; - license = lib.licenses.bsd3; - } - ) { }; - - vty_6_4 = callPackage ( { mkDerivation, base, @@ -710344,7 +709200,6 @@ self: { ]; description = "A simple terminal UI library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -710595,6 +709450,58 @@ self: { ) { }; vty-windows = callPackage ( + { + mkDerivation, + base, + blaze-builder, + bytestring, + containers, + deepseq, + directory, + filepath, + microlens, + microlens-mtl, + microlens-th, + mtl, + parsec, + stm, + transformers, + utf8-string, + vector, + vty, + Win32, + }: + mkDerivation { + pname = "vty-windows"; + version = "0.2.0.3"; + sha256 = "12f91izwg4r18zvdbnkwd8jk7agdyy3w3bcljrm92hib43i210id"; + libraryHaskellDepends = [ + base + blaze-builder + bytestring + containers + deepseq + directory + filepath + microlens + microlens-mtl + microlens-th + mtl + parsec + stm + transformers + utf8-string + vector + vty + Win32 + ]; + description = "Windows backend for Vty"; + license = lib.licenses.bsd3; + platforms = lib.platforms.windows; + } + ) { }; + + vty-windows_0_2_0_4 = callPackage ( { mkDerivation, base, @@ -710643,6 +709550,7 @@ self: { description = "Windows backend for Vty"; license = lib.licenses.bsd3; platforms = lib.platforms.windows; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -710762,6 +709670,8 @@ self: { description = "Utils for the vulkan package"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -711213,8 +710123,6 @@ self: { ]; description = "File/CGI/Rev Proxy App of WAI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -711483,6 +710391,7 @@ self: { filepath, http-types, memory, + random, stm, text, time, @@ -711491,8 +710400,8 @@ self: { }: mkDerivation { pname = "wai-cryptocookie"; - version = "0.1"; - sha256 = "1h1ajlwpgsjx4liril1zcnwnx51b6idm4vg5d2226ibcn5v67478"; + version = "0.2"; + sha256 = "1y97641w1ms0hzzw34v67h60hy4mjwnanvb8511qp033rpyqqh53"; libraryHaskellDepends = [ aeson base @@ -711514,6 +710423,7 @@ self: { directory filepath http-types + random stm wai wai-extra @@ -711731,6 +710641,8 @@ self: { ]; description = "WAI middleware to parameterize requests with environment"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -711784,8 +710696,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.16"; - sha256 = "1g7n7kq4c4zmiffm7dsb4j4wq5khkgw2i9mx5x71yzj4disanahj"; + version = "3.1.18"; + sha256 = "1xshy78bz6jpmvnifbahll5f03mwn41qd5pqjq8v0y6lil5p8qzf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -711844,104 +710756,6 @@ self: { } ) { }; - wai-extra_3_1_17 = callPackage ( - { - mkDerivation, - aeson, - ansi-terminal, - base, - base64-bytestring, - bytestring, - call-stack, - case-insensitive, - containers, - cookie, - data-default, - directory, - fast-logger, - hspec, - hspec-discover, - http-types, - HUnit, - iproute, - network, - resourcet, - streaming-commons, - temporary, - text, - time, - transformers, - unix, - vault, - wai, - wai-logger, - warp, - word8, - zlib, - }: - mkDerivation { - pname = "wai-extra"; - version = "3.1.17"; - sha256 = "0jq1vr3sc4gbcan0w9mzvrj6p20m825zb1y4bq1yjccka146xmn7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - ansi-terminal - base - base64-bytestring - bytestring - call-stack - case-insensitive - containers - cookie - data-default - directory - fast-logger - http-types - HUnit - iproute - network - resourcet - streaming-commons - text - time - transformers - unix - vault - wai - wai-logger - warp - word8 - ]; - testHaskellDepends = [ - aeson - base - bytestring - case-insensitive - cookie - directory - fast-logger - hspec - http-types - HUnit - iproute - resourcet - temporary - text - time - wai - warp - word8 - zlib - ]; - testToolDepends = [ hspec-discover ]; - description = "Provides some basic WAI handlers and middleware"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - } - ) { }; - wai-feature-flags = callPackage ( { mkDerivation, @@ -712203,10 +711017,8 @@ self: { }: mkDerivation { pname = "wai-handler-hal"; - version = "0.4.0.1"; - sha256 = "04blpf393mimd2wma6k7wf4plc76w8a74mmazgyi8jam6ck0id40"; - revision = "1"; - editedCabalFile = "1b7nad5313ih8ana6mccyy1hqgrky0zfn79mfli28n3i1lrpvara"; + version = "0.4.0.2"; + sha256 = "1bf67bl7cqavn0mqnmsh6wfn62iqpzrs7mqgzn8f3lrbkxw5rbny"; libraryHaskellDepends = [ base base64-bytestring @@ -715129,6 +713941,98 @@ self: { } ) { }; + wai-saml2_0_7_0 = callPackage ( + { + mkDerivation, + base, + base16-bytestring, + base64-bytestring, + bytestring, + c14n, + containers, + crypton, + crypton-x509, + crypton-x509-store, + data-default-class, + filepath, + http-types, + mtl, + network-uri, + pretty-show, + tasty, + tasty-expected-failure, + tasty-golden, + tasty-hunit, + text, + time, + transformers, + vault, + wai, + wai-extra, + xml-conduit, + zlib, + }: + mkDerivation { + pname = "wai-saml2"; + version = "0.7.0"; + sha256 = "1crfhrzap4rpw2fais2rpgkls3gdnr2xypy9ay1xbb21yc38ymzs"; + libraryHaskellDepends = [ + base + base16-bytestring + base64-bytestring + bytestring + c14n + containers + crypton + crypton-x509 + crypton-x509-store + data-default-class + http-types + mtl + network-uri + text + time + vault + wai + wai-extra + xml-conduit + zlib + ]; + testHaskellDepends = [ + base + base16-bytestring + base64-bytestring + bytestring + c14n + containers + crypton + crypton-x509 + crypton-x509-store + data-default-class + filepath + http-types + mtl + network-uri + pretty-show + tasty + tasty-expected-failure + tasty-golden + tasty-hunit + text + time + transformers + vault + wai + wai-extra + xml-conduit + zlib + ]; + description = "SAML2 assertion validation as WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + wai-secure-cookies = callPackage ( { mkDerivation, @@ -715739,6 +714643,36 @@ self: { } ) { }; + wai-transformers_0_2_0 = callPackage ( + { + mkDerivation, + base, + exceptions, + transformers, + unliftio-core, + wai, + wai-websockets, + websockets, + }: + mkDerivation { + pname = "wai-transformers"; + version = "0.2.0"; + sha256 = "19pvm7h9igja6q3id725km96k91080chz19nq3smsz9r0qld6r1q"; + libraryHaskellDepends = [ + base + exceptions + transformers + unliftio-core + wai + wai-websockets + websockets + ]; + description = "Monad transformers for WAI and WebSockets"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + wai-util = callPackage ( { mkDerivation, @@ -716209,8 +715143,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.4.8"; - sha256 = "0l67bz23l5sbhsmi9pz5vr0cf2mkkzpl0gjkf9309g0lxfq0mpyl"; + version = "3.4.9"; + sha256 = "1c2mbcdsvv1rwsngckf83r80340c1vrim8qdvajda8iy9h6nh69s"; libraryHaskellDepends = [ array async @@ -716490,43 +715424,6 @@ self: { ) { }; warp-tls = callPackage ( - { - mkDerivation, - base, - bytestring, - data-default, - network, - recv, - streaming-commons, - tls, - tls-session-manager, - unliftio, - wai, - warp, - }: - mkDerivation { - pname = "warp-tls"; - version = "3.4.9"; - sha256 = "01dpnc77sf7fkksvpi1rhfwk1h9lz5jjarzxjvy0y1yl8gn69vgf"; - libraryHaskellDepends = [ - base - bytestring - data-default - network - recv - streaming-commons - tls - tls-session-manager - unliftio - wai - warp - ]; - description = "HTTP over TLS support for Warp via the TLS package"; - license = lib.licenses.mit; - } - ) { }; - - warp-tls_3_4_13 = callPackage ( { mkDerivation, base, @@ -716556,7 +715453,6 @@ self: { ]; description = "HTTP over TLS support for Warp via the TLS package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -716851,8 +715747,8 @@ self: { }: mkDerivation { pname = "waterfall-cad"; - version = "0.5.1.0"; - sha256 = "173pv3a7n3jcf4j2jb7sirdib0x850qsifhlz858bkzamhqlxkr8"; + version = "0.6.0.0"; + sha256 = "05nx65f1wca9swn8jpq60mwwivbbz9wc44rn0bxcaszw4maqzv3h"; libraryHaskellDepends = [ base filepath @@ -716886,8 +715782,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-examples"; - version = "0.5.1.0"; - sha256 = "0vrlhgvbkwgk2nvmw8h6sg3fygi3sxs7qllyvwkzzs91kavnkb4d"; + version = "0.6.0.0"; + sha256 = "0i5yrwnkcp60czv0mmxkcxh1jl7q21q3n0xq4y4dr8bvh4wfbgql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -716940,8 +715836,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-svg"; - version = "0.5.1.0"; - sha256 = "1gjm36f7w3xf7q8gfm6xk5ssj594z45vfkqkr3x9rgny8rn7w3p5"; + version = "0.6.0.0"; + sha256 = "1mfxcc62m88saf7n56f8chwfy1n2y1r0y68cfg1jkn7n97yrlxzm"; libraryHaskellDepends = [ attoparsec base @@ -717547,8 +716443,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.3.2"; - sha256 = "0gmbj6c6c8gqz9xfxv0d4134d7c2wfla3zg3bgqvvzsqjjmrg81v"; + version = "0.1.3.3"; + sha256 = "06jcdp74sylpal882s9ybjwhixf3wkb575ad8hlwrpirxhjxcg5w"; libraryHaskellDepends = [ base bytestring @@ -717574,8 +716470,6 @@ self: { ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -717821,79 +716715,8 @@ self: { }: mkDerivation { pname = "web-rep"; - version = "0.12.3.0"; - sha256 = "10k2fm7g1p54v6gnn045vgc8p58xal17vxin9ah11xqr0dddk7sa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async - base - bifunctors - box - box-socket - bytestring - flatparse - markup-parse - mtl - optics-core - optics-extra - profunctors - scotty - string-interpolate - text - transformers - unordered-containers - wai-middleware-static - wai-websockets - websockets - ]; - executableHaskellDepends = [ - base - box - markup-parse - optics-core - optparse-applicative - ]; - testHaskellDepends = [ - base - doctest-parallel - ]; - description = "representations of a web page"; - license = lib.licenses.bsd3; - mainProgram = "web-rep-example"; - } - ) { }; - - web-rep_0_13_0_0 = callPackage ( - { - mkDerivation, - async, - base, - bifunctors, - box, - box-socket, - bytestring, - doctest-parallel, - flatparse, - markup-parse, - mtl, - optics-core, - optics-extra, - optparse-applicative, - profunctors, - scotty, - string-interpolate, - text, - transformers, - unordered-containers, - wai-middleware-static, - wai-websockets, - websockets, - }: - mkDerivation { - pname = "web-rep"; - version = "0.13.0.0"; - sha256 = "04w49x4mknbsc86xq62amyfk3696cv906grhm98yyyg4gkpd7qx2"; + version = "0.14.0.0"; + sha256 = "1vjnvsdwjwvlmz1gwrga38wmj4akff3xnh0gjxzbi2hv4vdax7yn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -717931,7 +716754,6 @@ self: { ]; description = "representations of a web page"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "web-rep-example"; } ) { }; @@ -718044,8 +716866,8 @@ self: { }: mkDerivation { pname = "web-routes-happstack"; - version = "0.23.12.3"; - sha256 = "1qkbaq5k9as5s0bdaiza02jfg17vwmsfwg6r3gg95sh4l5rvwyx6"; + version = "0.23.12.4"; + sha256 = "1sfv84h60cwss6ncdyymwszw42mjabfg1nzh6ppbyfkda6l8g02l"; libraryHaskellDepends = [ base bytestring @@ -718055,8 +716877,6 @@ self: { ]; description = "Adds support for using web-routes with Happstack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -718171,8 +716991,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.8.2"; - sha256 = "11ps9cn5qz46w0i69znqb03fc6ljrwrn9y1cq0j1dsy7rjkqhgxm"; + version = "0.22.8.3"; + sha256 = "0w9izg5f5nwngvfnggvkd0yynlqi2827na7kycqhjfsdndw0g475"; libraryHaskellDepends = [ base parsec @@ -718287,6 +717107,61 @@ self: { ) { }; web-view = callPackage ( + { + mkDerivation, + base, + bytestring, + casing, + containers, + Diff, + effectful-core, + file-embed, + html-entities, + http-types, + skeletest, + string-interpolate, + text, + }: + mkDerivation { + pname = "web-view"; + version = "0.7.0"; + sha256 = "062n3zff1frm38qzcylrp25krxx2nr5w68w71ijja2j87glj20kz"; + revision = "2"; + editedCabalFile = "1c8dh2r85mjxcsyqkar5zsm5h4b5x3k6c33nccwfga2n0r1sn0m8"; + libraryHaskellDepends = [ + base + bytestring + casing + containers + effectful-core + file-embed + html-entities + http-types + string-interpolate + text + ]; + testHaskellDepends = [ + base + bytestring + casing + containers + Diff + effectful-core + file-embed + html-entities + http-types + skeletest + string-interpolate + text + ]; + description = "Type-safe HTML and CSS"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + web-view_0_7_1 = callPackage ( { mkDerivation, base, @@ -719415,6 +718290,114 @@ self: { } ) { }; + webdriver_0_13_0_0 = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + attoparsec-aeson, + base, + base64-bytestring, + bytestring, + containers, + directory, + exceptions, + filepath, + http-client, + http-types, + microlens, + microlens-th, + monad-logger, + mtl, + network, + network-uri, + optparse-applicative, + random, + retry, + safe-exceptions, + sandwich, + sandwich-contexts, + scientific, + stm, + string-interpolate, + text, + time, + unliftio, + unliftio-core, + unordered-containers, + wai-app-static, + warp, + websockets, + zip-archive, + }: + mkDerivation { + pname = "webdriver"; + version = "0.13.0.0"; + sha256 = "192dm2bwhdfrmfkimblm43gvh3vnnk6p68kw5cfpar00mli08mbi"; + libraryHaskellDepends = [ + aeson + attoparsec + attoparsec-aeson + base + base64-bytestring + bytestring + containers + directory + exceptions + filepath + http-client + http-types + microlens-th + monad-logger + network + network-uri + random + retry + safe-exceptions + scientific + stm + string-interpolate + text + time + unliftio + unliftio-core + unordered-containers + websockets + zip-archive + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + exceptions + filepath + http-client + http-types + microlens + monad-logger + mtl + network + network-uri + optparse-applicative + retry + safe-exceptions + sandwich + sandwich-contexts + string-interpolate + text + unliftio + unliftio-core + wai-app-static + warp + ]; + testToolDepends = [ sandwich ]; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + webdriver-angular = callPackage ( { mkDerivation, @@ -719510,8 +718493,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "A typed wrapper for W3C WebDriver protocol. A base for other libraries."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -720034,8 +719015,8 @@ self: { }: mkDerivation { pname = "webgear-core"; - version = "1.3.1"; - sha256 = "1svspzqxqappvmbsvj1cvvvh7dbgsxww43xc93ny19x6qwmksgr5"; + version = "1.4.0"; + sha256 = "0kda3yyg7w2ws2v303nsb9g6wrc743d8rd5lz6xpd71myiq5w5fx"; libraryHaskellDepends = [ arrows base @@ -720060,7 +719041,7 @@ self: { } ) { }; - webgear-core_1_4_0 = callPackage ( + webgear-core_1_5_0 = callPackage ( { mkDerivation, arrows, @@ -720083,8 +719064,8 @@ self: { }: mkDerivation { pname = "webgear-core"; - version = "1.4.0"; - sha256 = "0kda3yyg7w2ws2v303nsb9g6wrc743d8rd5lz6xpd71myiq5w5fx"; + version = "1.5.0"; + sha256 = "1f5dy707rcb25n0w5ld210vczaa3az2y6xvg5jn7gwsxs23a8b3k"; libraryHaskellDepends = [ arrows base @@ -720126,8 +719107,8 @@ self: { }: mkDerivation { pname = "webgear-openapi"; - version = "1.3.1"; - sha256 = "1aky9zdc040njndjch2l7xj8gb13ygnv0zgm2jc307lswnbh98vb"; + version = "1.4.0"; + sha256 = "0pm0v20spryxdl63fgrpzqvjx98awncxmxak4z6ma8fxnxvq14cb"; libraryHaskellDepends = [ arrows base @@ -720145,7 +719126,7 @@ self: { } ) { }; - webgear-openapi_1_4_0 = callPackage ( + webgear-openapi_1_5_0 = callPackage ( { mkDerivation, arrows, @@ -720161,8 +719142,8 @@ self: { }: mkDerivation { pname = "webgear-openapi"; - version = "1.4.0"; - sha256 = "0pm0v20spryxdl63fgrpzqvjx98awncxmxak4z6ma8fxnxvq14cb"; + version = "1.5.0"; + sha256 = "0amwhdbb1va8c7ham34zbjpd5azwvwsl5d4i7xyfkq8gzry9vji6"; libraryHaskellDepends = [ arrows base @@ -720211,8 +719192,8 @@ self: { }: mkDerivation { pname = "webgear-server"; - version = "1.3.1"; - sha256 = "053ddbkjx9vshzrbyys7kjv92s97z0kjh586xgz5ix3zxpy6wyda"; + version = "1.4.0"; + sha256 = "1453n5yga3880fzv7ziyy0sricgx4i7d18s2pg8idix3kj4r40xl"; libraryHaskellDepends = [ aeson arrows @@ -720253,7 +719234,7 @@ self: { } ) { }; - webgear-server_1_4_0 = callPackage ( + webgear-server_1_5_0 = callPackage ( { mkDerivation, aeson, @@ -720283,8 +719264,8 @@ self: { }: mkDerivation { pname = "webgear-server"; - version = "1.4.0"; - sha256 = "1453n5yga3880fzv7ziyy0sricgx4i7d18s2pg8idix3kj4r40xl"; + version = "1.5.0"; + sha256 = "1srr5kblk1b59jyrkidh9js4yax8dvjyici283z25yk2lnqijc2y"; libraryHaskellDepends = [ aeson arrows @@ -720341,8 +719322,8 @@ self: { }: mkDerivation { pname = "webgear-swagger"; - version = "1.3.1"; - sha256 = "04z58rsn40zp19rr7b3bfp13n1yp4j2d5fjvm3msv7ik6pqgdkqq"; + version = "1.4.0"; + sha256 = "0ca6smxgxa6ck0f914wj4ivrdpbqxy0v46di3lyl9kwnb0jia5vc"; libraryHaskellDepends = [ arrows base @@ -720359,7 +719340,7 @@ self: { } ) { }; - webgear-swagger_1_4_0 = callPackage ( + webgear-swagger_1_5_0 = callPackage ( { mkDerivation, arrows, @@ -720374,8 +719355,8 @@ self: { }: mkDerivation { pname = "webgear-swagger"; - version = "1.4.0"; - sha256 = "0ca6smxgxa6ck0f914wj4ivrdpbqxy0v46di3lyl9kwnb0jia5vc"; + version = "1.5.0"; + sha256 = "0vgd506yqfj02l6a25wfwi03xxf6nyg9gkh2phq85g88v22brwpf"; libraryHaskellDepends = [ arrows base @@ -720406,8 +719387,8 @@ self: { }: mkDerivation { pname = "webgear-swagger-ui"; - version = "1.3.1"; - sha256 = "07rc7wjjmgirwmbbi66gzbvbb194c2rb5ab2sw9kf3ppsl9xwqg0"; + version = "1.4.0"; + sha256 = "1qrf435pky7imwashh7f48z2agwjnyjw396w98jcg92k9cs6sisk"; libraryHaskellDepends = [ base bytestring @@ -720422,7 +719403,7 @@ self: { } ) { }; - webgear-swagger-ui_1_4_0 = callPackage ( + webgear-swagger-ui_1_5_0 = callPackage ( { mkDerivation, base, @@ -720435,8 +719416,8 @@ self: { }: mkDerivation { pname = "webgear-swagger-ui"; - version = "1.4.0"; - sha256 = "1qrf435pky7imwashh7f48z2agwjnyjw396w98jcg92k9cs6sisk"; + version = "1.5.0"; + sha256 = "02larl8s6b9i1rkbw6gflyz0pn8ba80yd0i6w73mifkma7m39zxi"; libraryHaskellDepends = [ base bytestring @@ -720584,6 +719565,7 @@ self: { description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; } ) { webkit = null; }; @@ -720635,6 +719617,7 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; } ) { inherit (pkgs) webkitgtk_4_0; }; @@ -720706,6 +719689,7 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { webkitgtk = null; }; @@ -721529,8 +720513,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.9.0"; - sha256 = "0fgxsyijn5flxzhjy3096qjlv0avlwchwyb46pizwh2s6i1nwil3"; + version = "2.10.0"; + sha256 = "0w6q65wfycxf9980agr3w60008zzwr1br94srmmj9i3qwpxwcysy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -722334,6 +721318,8 @@ self: { pname = "what4"; version = "1.7"; sha256 = "1iba76c7zagxxgqvfxrsk92vayyhv1vjd6dd5wj242vps29jhb3v"; + revision = "1"; + editedCabalFile = "0d2xhwmgk20pqjh9xgdfyzwi9brckz71bdk8lr56q36nzmrkj0dl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -722822,9 +721808,7 @@ self: { mkDerivation, base, binary, - bytestring, deepseq, - ghc-prim, hashable, hedgehog, primitive, @@ -722834,21 +721818,18 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.7.1"; - sha256 = "1h42k00inir628qb2r8966bhn354bnkgadpx5fgm6g1kh879y15a"; + version = "0.1.8.1"; + sha256 = "0jisg5y3rxcqwd3kgdvcmz5awwcgzdhdkl768llhh388kp64mjcy"; libraryHaskellDepends = [ base binary deepseq - ghc-prim hashable primitive ]; testHaskellDepends = [ base binary - bytestring - ghc-prim hedgehog primitive QuickCheck @@ -723461,6 +722442,8 @@ self: { ]; description = "Graphical indicator for WildBind"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -723489,6 +722472,7 @@ self: { testHaskellDepends = [ base ]; description = "Task to install and export everything you need to use WildBind in X11"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -723753,8 +722737,6 @@ self: { doHaddock = false; description = "Error handling for foreign calls to the Windows API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -723898,7 +722880,6 @@ self: { ]; description = "I/O library for Windows"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { @@ -724089,48 +723070,6 @@ self: { ) { }; witch = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - HUnit, - tagged, - template-haskell, - text, - time, - transformers, - }: - mkDerivation { - pname = "witch"; - version = "1.2.4.0"; - sha256 = "1kpkdqn8h8wrsf5i45j4y43favyb2f3nsk03n8gcf6rn6cgwk2cf"; - libraryHaskellDepends = [ - base - bytestring - containers - tagged - template-haskell - text - time - ]; - testHaskellDepends = [ - base - bytestring - containers - HUnit - tagged - text - time - transformers - ]; - description = "Convert values from one type into another"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - } - ) { }; - - witch_1_3_0_6 = callPackage ( { mkDerivation, base, @@ -724168,7 +723107,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; } ) { }; @@ -724202,6 +723140,8 @@ self: { ]; description = "Use ImplicitParams-based source locations in a backward compatible way"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -724401,29 +723341,6 @@ self: { ) { }; witness = callPackage ( - { - mkDerivation, - base, - constraints, - containers, - countable, - }: - mkDerivation { - pname = "witness"; - version = "0.6.2"; - sha256 = "0g83d6b6w8djsqkqdarw6szzwvz8h7i05x8jwzpvax86fcvwp3cr"; - libraryHaskellDepends = [ - base - constraints - containers - countable - ]; - description = "values that witness types"; - license = lib.licenses.bsd2; - } - ) { }; - - witness_0_7 = callPackage ( { mkDerivation, base, @@ -724443,7 +723360,6 @@ self: { ]; description = "values that witness types"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -724901,51 +723817,6 @@ self: { ) { inherit (pkgs) wlc; }; wled-json = callPackage ( - { - mkDerivation, - aeson, - barbies, - base, - bytestring, - deriving-aeson, - hspec, - hspec-discover, - http-conduit, - QuickCheck, - rhine, - }: - mkDerivation { - pname = "wled-json"; - version = "0.0.1.1"; - sha256 = "1d9i4qn9iyfxdd46drj811dyr9hask3sgbdim7vgkhphg5059g4p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - barbies - base - bytestring - deriving-aeson - http-conduit - ]; - executableHaskellDepends = [ - base - rhine - ]; - testHaskellDepends = [ - aeson - base - hspec - QuickCheck - ]; - testToolDepends = [ hspec-discover ]; - description = "Convenient interface for interacting with WLED devices"; - license = lib.licenses.bsd3; - mainProgram = "wled-json-exe"; - } - ) { }; - - wled-json_0_1_0_0 = callPackage ( { mkDerivation, aeson, @@ -724986,7 +723857,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convenient interface for interacting with WLED devices"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -725688,8 +724558,6 @@ self: { ]; description = "Word8 set"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -727010,10 +725878,8 @@ self: { }: mkDerivation { pname = "wreq-effectful"; - version = "0.1.0.1"; - sha256 = "1sxqvdc0h4y767blmznb4ld0bq25aanbnrwy2wvk23rm8c7vf0w9"; - revision = "1"; - editedCabalFile = "0dvrypqffj4cmy1qvygy9r6d6iwj3d9fka063bbkgm0ri3bsc40y"; + version = "0.1.1.1"; + sha256 = "1nzgl89m050c0jnrqcl7fsjy8g2g09xaz1l0dxlm7nkkvi96mc82"; libraryHaskellDepends = [ base bytestring @@ -728280,35 +727146,6 @@ self: { ) { }; wuss = callPackage ( - { - mkDerivation, - base, - bytestring, - crypton-connection, - data-default, - exceptions, - network, - websockets, - }: - mkDerivation { - pname = "wuss"; - version = "2.0.2.0"; - sha256 = "01ipsv7hvi016ipiivkp6w9r278nilfh1kcnmyavr5q479dvlz08"; - libraryHaskellDepends = [ - base - bytestring - crypton-connection - data-default - exceptions - network - websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = lib.licenses.mit; - } - ) { }; - - wuss_2_0_2_5 = callPackage ( { mkDerivation, base, @@ -728334,7 +727171,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -728807,6 +727643,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "(Forked) Library for reducing the boilerplate involved with sum types"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -729284,8 +728122,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "1.9.0"; - sha256 = "11zy9lj2dka27s72d86lqdabpr4ij0yls6q33g2pqih6rhaqziya"; + version = "1.10.0"; + sha256 = "1pz36rx9shsq16amni0d9xzwvvzhbf2ysm8xzgvgx9irmz4imxv0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -730406,9 +729244,7 @@ self: { ]; description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "xls2csv"; - broken = true; } ) { }; @@ -730779,8 +729615,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.9.1.4"; - sha256 = "0kfz8ddn1l20q41623dxjlmqjyn1i5pzj5a33pipml5z201hv6q4"; + version = "1.10.0.1"; + sha256 = "09nwn4yv2z8hv7shfpmv9avpxci21kk0dgbslgaymml0jny0la31"; setupHaskellDepends = [ base Cabal @@ -730822,75 +729658,6 @@ self: { } ) { }; - xml-conduit_1_10_0_0 = callPackage ( - { - mkDerivation, - attoparsec, - base, - blaze-html, - blaze-markup, - bytestring, - Cabal, - cabal-doctest, - conduit, - conduit-extra, - containers, - data-default, - deepseq, - doctest, - hspec, - HUnit, - resourcet, - text, - transformers, - xml-types, - }: - mkDerivation { - pname = "xml-conduit"; - version = "1.10.0.0"; - sha256 = "14nyw6slc6yzbg0gjwji94zn7sh3ymg9fnx6q8m9zr407v6d16rz"; - setupHaskellDepends = [ - base - Cabal - cabal-doctest - ]; - libraryHaskellDepends = [ - attoparsec - base - blaze-html - blaze-markup - bytestring - conduit - conduit-extra - containers - data-default - deepseq - resourcet - text - transformers - xml-types - ]; - testHaskellDepends = [ - base - blaze-markup - bytestring - conduit - conduit-extra - containers - doctest - hspec - HUnit - resourcet - text - transformers - xml-types - ]; - description = "Pure-Haskell utilities for dealing with XML with the conduit package"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - } - ) { }; - xml-conduit-decode = callPackage ( { mkDerivation, @@ -731121,6 +729888,8 @@ self: { ]; description = "Warm and fuzzy creation of XML documents"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -731503,8 +730272,8 @@ self: { pname = "xml-lens"; version = "0.3.1"; sha256 = "0i6c4xqacinhxnyszzna7s9x79rrcs1c7jq6zimcwh4302l5d6cm"; - revision = "4"; - editedCabalFile = "1zicqdzvca53rg2ai14nkyq1f46w6kz6bd4mjmqzx778xn17d22f"; + revision = "5"; + editedCabalFile = "0w06wfjpd427sxlasacxg8lwbqrp7xnl0vs8v9s86c2c0i70hzrj"; libraryHaskellDepends = [ base case-insensitive @@ -731986,6 +730755,8 @@ self: { ]; description = "Parse XML from bytes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -732198,6 +730969,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Utilities for dealing with Content-values of \"xml-types\""; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -734448,10 +733221,8 @@ self: { mkDerivation, base, bytestring, - deepseq, digest, hashable, - murmur-hash, QuickCheck, tasty, tasty-bench, @@ -734461,10 +733232,8 @@ self: { }: mkDerivation { pname = "xxhash-ffi"; - version = "0.3"; - sha256 = "0cqayny8g0lbafysbyzw43jnf3mijx6smlpzwsfdv3xc3wk42v4r"; - revision = "1"; - editedCabalFile = "07mc7rllnf3hgnqnywzmjpafmrpr4jdbvj4iwifz72n5c2marr1z"; + version = "0.3.1"; + sha256 = "1vdlx1dn1zx2rwpzhv8wgnc988fwbxzgvzxn2zgd78iibr97slm5"; libraryHaskellDepends = [ base bytestring @@ -734484,16 +733253,12 @@ self: { benchmarkHaskellDepends = [ base bytestring - deepseq digest hashable - murmur-hash tasty-bench ]; description = "Bindings and high-level helpers for xxHash"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) xxHash; }; @@ -734531,6 +733296,8 @@ self: { ]; description = "LZMA/XZ compression and decompression"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { inherit (pkgs) xz; }; @@ -736207,80 +734974,6 @@ self: { ) { }; yaml-unscrambler = callPackage ( - { - mkDerivation, - acc, - attoparsec, - attoparsec-data, - attoparsec-time, - base, - base64-bytestring, - bytestring, - conduit, - containers, - foldl, - hashable, - libyaml, - mtl, - neat-interpolation, - quickcheck-instances, - rerebase, - scientific, - selective, - tasty, - tasty-hunit, - text, - text-builder-dev, - time, - transformers, - unordered-containers, - uuid, - vector, - yaml, - }: - mkDerivation { - pname = "yaml-unscrambler"; - version = "0.1.0.19"; - sha256 = "092778zd41i5zb5jhj2p2vfiib74zw05p6vqmlp3s2ziawj9s79g"; - libraryHaskellDepends = [ - acc - attoparsec - attoparsec-data - attoparsec-time - base - base64-bytestring - bytestring - conduit - containers - foldl - hashable - libyaml - mtl - scientific - selective - text - text-builder-dev - time - transformers - unordered-containers - uuid - vector - yaml - ]; - testHaskellDepends = [ - foldl - neat-interpolation - quickcheck-instances - rerebase - tasty - tasty-hunit - ]; - description = "Flexible declarative YAML parsing toolkit"; - license = lib.licenses.mit; - } - ) { }; - - yaml-unscrambler_0_1_0_20 = callPackage ( { mkDerivation, acc, @@ -736351,7 +735044,6 @@ self: { ]; description = "Flexible declarative YAML parsing toolkit"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -736474,6 +735166,56 @@ self: { } ) { }; + yamlscript = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + base, + bytestring, + hspec, + text, + unix, + vector, + ys, + }: + mkDerivation { + pname = "yamlscript"; + version = "0.2.3.0"; + sha256 = "09ccfdmhpi0ycsmrxnjcr4rgz4b13sgw76ys6979syfqjqmznr5b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + text + unix + ]; + librarySystemDepends = [ ys ]; + executableHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + text + ]; + testHaskellDepends = [ + aeson + base + hspec + text + unix + vector + ]; + description = "Haskell bindings for YAMLScript"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "yamlscript-test"; + broken = true; + } + ) { ys = null; }; + yampa-canvas = callPackage ( { mkDerivation, @@ -736498,6 +735240,8 @@ self: { ]; description = "blank-canvas frontend for Yampa"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -736773,16 +735517,47 @@ self: { { mkDerivation, base }: mkDerivation { pname = "yap"; - version = "0.2"; - sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i"; - revision = "1"; - editedCabalFile = "04q5xgnqy67klf0rzmap454gq4kwy0ly7a9ggfywg1ad15dxwb5v"; + version = "0.3.0"; + sha256 = "1p6a2yrmairvyhxhxx0vsvvdhh4z2f5kdm6svfih4bf79q1bxgv2"; libraryHaskellDepends = [ base ]; description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = lib.licenses.bsd3; } ) { }; + yap-examples = callPackage ( + { + mkDerivation, + base, + Cabal, + containers, + QuickCheck, + test-framework, + test-framework-quickcheck2, + yap, + }: + mkDerivation { + pname = "yap-examples"; + version = "0.1"; + sha256 = "1gcci4pr7qidib8qb7hm0ryb6dl04g42brjhj18865wc8fpamicm"; + libraryHaskellDepends = [ + base + containers + yap + ]; + testHaskellDepends = [ + base + Cabal + QuickCheck + test-framework + test-framework-quickcheck2 + yap + ]; + description = "examples of the algebraic classes in the yap package"; + license = lib.licenses.bsd3; + } + ) { }; + yapb = callPackage ( { mkDerivation, @@ -738668,6 +737443,8 @@ self: { ]; description = "Authentication plugin for Yesod"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -739765,10 +738542,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.27.0"; - sha256 = "104phivlhpb2b48cmvsj99x358z82xja9xz8i0mlhna40dcpx6cp"; - revision = "1"; - editedCabalFile = "1g96f40avs9cj2lsfbisa1bc53hdd4bmjicaj20xrvscngn4df62"; + version = "1.6.27.1"; + sha256 = "0v5pq8ks93b4rrxwl088izl8hrfalkbf3ssgxgqgjsl4x1r5n0kz"; libraryHaskellDepends = [ aeson attoparsec-aeson @@ -739947,6 +738722,7 @@ self: { base, case-insensitive, hspec, + mime, mono-traversable, network-uri, semigroups, @@ -739960,12 +738736,13 @@ self: { }: mkDerivation { pname = "yesod-csp"; - version = "0.2.6.0"; - sha256 = "01wnb1lmxkkl2yw696lkhy8361xsdlsiwwr436h9jlcvwhm3dyv0"; + version = "0.2.7.0"; + sha256 = "0862yma4yyxgwyvlh4c142l6fm2gjdh00p21vxzfkmf5d0bddjc1"; libraryHaskellDepends = [ attoparsec base case-insensitive + mime mono-traversable network-uri semigroups @@ -739980,6 +738757,7 @@ self: { attoparsec base hspec + mime network-uri semigroups template-haskell @@ -739988,6 +738766,8 @@ self: { ]; description = "Add CSP headers to Yesod apps"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -741123,6 +739903,8 @@ self: { ]; description = "Simple display of media types, served by yesod"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -742952,8 +741734,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.16"; - sha256 = "12kvr7z81sfla7kc32iw9qsfhxps1mhairmwayi9x0vg6mxf7vs1"; + version = "1.6.19"; + sha256 = "0snq06yps28lkxfc1mhsvbv2kq0h0mi16zjdfrahm4zaz8axkqka"; libraryHaskellDepends = [ aeson attoparsec @@ -745342,6 +744124,7 @@ self: { ]; description = "Auth module for Yu"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -745515,6 +744298,8 @@ self: { ]; description = "Utils for Yu"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -747492,92 +746277,6 @@ self: { ) { }; zip = callPackage ( - { - mkDerivation, - base, - bytestring, - bzlib-conduit, - case-insensitive, - cereal, - conduit, - conduit-extra, - conduit-zstd, - containers, - digest, - directory, - dlist, - exceptions, - filepath, - hspec, - monad-control, - mtl, - QuickCheck, - resourcet, - temporary, - text, - time, - transformers, - transformers-base, - unix, - }: - mkDerivation { - pname = "zip"; - version = "2.1.0"; - sha256 = "1rbrayns2q34b0cp9b6zl3k600lbgck1c214rmvmywkhmms07slm"; - revision = "3"; - editedCabalFile = "0pnj6ganama1b3q7rc50apw8xk73dxs4j66c382hryljnd1wvnf5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bytestring - bzlib-conduit - case-insensitive - cereal - conduit - conduit-extra - conduit-zstd - containers - digest - directory - dlist - exceptions - filepath - monad-control - mtl - resourcet - text - time - transformers - transformers-base - unix - ]; - executableHaskellDepends = [ - base - filepath - ]; - testHaskellDepends = [ - base - bytestring - conduit - containers - directory - dlist - filepath - hspec - QuickCheck - temporary - text - time - ]; - description = "Operations on zip archives"; - license = lib.licenses.bsd3; - mainProgram = "haskell-zip-app"; - maintainers = [ lib.maintainers.mpscholten ]; - } - ) { }; - - zip_2_2_1 = callPackage ( { mkDerivation, base, @@ -747656,7 +746355,6 @@ self: { ]; description = "Operations on zip archives"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "haskell-zip-app"; maintainers = [ lib.maintainers.mpscholten ]; } @@ -748161,10 +746859,8 @@ self: { }: mkDerivation { pname = "zlib"; - version = "0.7.1.0"; - sha256 = "1g2md8z0ijcbrqlx9q9i49myi2lnlvzmma1ajmsd5y0xp2v3ipbf"; - revision = "2"; - editedCabalFile = "01m2afpizlscn65v12vmcmmycs66a14xb8nsgrm5145lq1slmrl5"; + version = "0.7.1.1"; + sha256 = "1hf1csbc5gb6yipqydkqydlyr5yalpxrb8fyml0fhjwjxl0sp5dz"; libraryHaskellDepends = [ base bytestring diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 87e6562435890..e5ec0f1d053e6 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -44,9 +44,9 @@ self: super: # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; - # spago is not released to Hackage. + # spago-legacy is not released to Hackage. # https://github.com/spacchetti/spago/issues/512 - spago = self.callPackage ../tools/purescript/spago/spago.nix { }; + spago-legacy = self.callPackage ../../by-name/sp/spago-legacy/spago-legacy.nix { }; # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix diff --git a/pkgs/development/haskell-modules/patches/cabal-install-3.14.1.1-lift-unix-bound.patch b/pkgs/development/haskell-modules/patches/cabal-install-3.14.1.1-lift-unix-bound.patch deleted file mode 100644 index ff9f1f427fac3..0000000000000 --- a/pkgs/development/haskell-modules/patches/cabal-install-3.14.1.1-lift-unix-bound.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cabal-install.cabal -+++ b/cabal-install.cabal -@@ -261,7 +261,7 @@ - -- newer directory for symlinks - build-depends: Win32 >= 2.8 && < 3, directory >=1.3.1.0 - else -- build-depends: unix >= 2.5 && < 2.8 || >= 2.8.6.0 && < 2.9 -+ build-depends: unix >= 2.5 && < 2.9 - - if flag(lukko) - build-depends: lukko >= 0.1 && <0.2 diff --git a/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch b/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch new file mode 100644 index 0000000000000..b4d7c553baffd --- /dev/null +++ b/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch @@ -0,0 +1,11 @@ +--- a/cabal-install.cabal ++++ b/cabal-install.cabal +@@ -275,7 +275,7 @@ + , directory >=1.3.1.0 + else + build-depends: +- , unix >= 2.5 && < 2.8 || >= 2.8.6.0 && < 2.9 ++ , unix >= 2.5 && < 2.9 + + if flag(lukko) + build-depends: diff --git a/pkgs/development/haskell-modules/patches/darcs-cabal-3.12.patch b/pkgs/development/haskell-modules/patches/darcs-cabal-3.12.patch new file mode 100644 index 0000000000000..2ad9dfba1d97d --- /dev/null +++ b/pkgs/development/haskell-modules/patches/darcs-cabal-3.12.patch @@ -0,0 +1,24 @@ +diff -rN -u old-darcs.net/darcs.cabal new-darcs.net/darcs.cabal +--- old-darcs.net/darcs.cabal 2025-09-13 02:45:32.790227974 +0200 ++++ new-darcs.net/darcs.cabal 2025-09-13 02:45:32.791227985 +0200 +@@ -124,7 +124,7 @@ + + custom-setup + setup-depends: base >= 4.10 && < 4.20, +- Cabal >= 2.4 && < 3.11, ++ Cabal >= 2.4 && < 3.13, + process >= 1.2.3.0 && < 1.7, + filepath >= 1.4.1 && < 1.5.0.0, + directory >= 1.2.7 && < 1.4 +diff -rN -u old-darcs.net/Setup.hs new-darcs.net/Setup.hs +--- old-darcs.net/Setup.hs 2025-09-13 02:45:32.789227964 +0200 ++++ new-darcs.net/Setup.hs 2025-09-13 02:45:32.790227974 +0200 +@@ -8,7 +8,7 @@ + import Distribution.Package ( packageVersion ) + import Distribution.Version( Version ) + import Distribution.Simple.LocalBuildInfo +- ( LocalBuildInfo(..), absoluteInstallDirs ) ++ ( LocalBuildInfo(..), absoluteInstallDirs, buildDir ) + import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest)) + import Distribution.Simple.Setup + (buildVerbosity, copyDest, copyVerbosity, fromFlag, diff --git a/pkgs/development/haskell-modules/patches/darcs-stackage-lts-23.patch b/pkgs/development/haskell-modules/patches/darcs-stackage-lts-23.patch new file mode 100644 index 0000000000000..613582cdeb3d7 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/darcs-stackage-lts-23.patch @@ -0,0 +1,32 @@ +diff -rN -u old-darcs.net/darcs.cabal new-darcs.net/darcs.cabal +--- old-darcs.net/darcs.cabal 2025-09-13 02:46:05.662572580 +0200 ++++ new-darcs.net/darcs.cabal 2025-09-13 02:46:05.748573468 +0200 +@@ -123,7 +123,7 @@ + -- ---------------------------------------------------------------------- + + custom-setup +- setup-depends: base >= 4.10 && < 4.20, ++ setup-depends: base >= 4.10 && < 4.21, + Cabal >= 2.4 && < 3.13, + process >= 1.2.3.0 && < 1.7, + filepath >= 1.4.1 && < 1.5.0.0, +@@ -412,7 +412,7 @@ + else + build-depends: unix >= 2.7.1.0 && < 2.9 + +- build-depends: base >= 4.10 && < 4.20, ++ build-depends: base >= 4.10 && < 4.21, + safe >= 0.3.20 && < 0.4, + stm >= 2.1 && < 2.6, + binary >= 0.5 && < 0.11, +@@ -447,7 +447,7 @@ + temporary >= 1.2.1 && < 1.4, + process >= 1.2.3.0 && < 1.7, + array >= 0.5.1.0 && < 0.6, +- hashable >= 1.2.3.3 && < 1.5, ++ hashable >= 1.2.3.3 && < 1.6, + mmap >= 0.5.9 && < 0.6, + zlib >= 0.6.1.2 && < 0.8, + network-uri >= 2.6 && < 2.8, + + diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix deleted file mode 100644 index 17bd33cc13583..0000000000000 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix +++ /dev/null @@ -1,255 +0,0 @@ -{ - mkDerivation, - aeson, - async, - attoparsec, - base, - base64-bytestring, - bifunctors, - binary, - binary-conduit, - boost, - bytestring, - Cabal, - cabal-pkg-config-version-hook, - cachix, - cachix-api, - conduit, - conduit-extra, - containers, - directory, - dlist, - exceptions, - file-embed, - filepath, - hercules-ci-api, - hercules-ci-api-agent, - hercules-ci-api-core, - hercules-ci-cnix-expr, - hercules-ci-cnix-store, - hostname, - hspec, - hspec-discover, - http-client, - http-client-tls, - http-conduit, - HUnit, - inline-c, - inline-c-cpp, - katip, - lens, - lens-aeson, - lib, - lifted-async, - lifted-base, - monad-control, - mtl, - network, - network-uri, - nix, - optparse-applicative, - process, - process-extras, - profunctors, - protolude, - QuickCheck, - safe-exceptions, - scientific, - servant, - servant-auth-client, - servant-client, - servant-client-core, - stm, - tagged, - temporary, - text, - time, - tls, - tomland, - transformers, - transformers-base, - unbounded-delays, - unix, - unliftio, - unliftio-core, - unordered-containers, - uuid, - vector, - websockets, - wuss, -}: -mkDerivation { - pname = "hercules-ci-agent"; - version = "0.10.6"; - sha256 = "5551c8eda390b48da6801f8f8580dc770e6e2fa2adf467ea7afd174748816fd6"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ - base - Cabal - cabal-pkg-config-version-hook - ]; - libraryHaskellDepends = [ - aeson - async - base - binary - binary-conduit - bytestring - conduit - containers - directory - dlist - exceptions - file-embed - filepath - hercules-ci-api-agent - hercules-ci-api-core - hercules-ci-cnix-expr - hercules-ci-cnix-store - katip - lens - lens-aeson - lifted-async - lifted-base - monad-control - mtl - network - network-uri - process - process-extras - protolude - safe-exceptions - stm - tagged - temporary - text - time - tls - transformers - transformers-base - unbounded-delays - unix - unliftio - unliftio-core - uuid - vector - websockets - wuss - ]; - executableHaskellDepends = [ - aeson - async - attoparsec - base - base64-bytestring - bifunctors - binary - binary-conduit - bytestring - cachix - cachix-api - conduit - conduit-extra - containers - directory - dlist - exceptions - filepath - hercules-ci-api - hercules-ci-api-agent - hercules-ci-api-core - hercules-ci-cnix-expr - hercules-ci-cnix-store - hostname - http-client - http-client-tls - http-conduit - inline-c - inline-c-cpp - katip - lens - lens-aeson - lifted-async - lifted-base - monad-control - mtl - network - network-uri - optparse-applicative - process - process-extras - profunctors - protolude - safe-exceptions - scientific - servant - servant-auth-client - servant-client - servant-client-core - stm - temporary - text - time - tomland - transformers - transformers-base - unix - unliftio - unliftio-core - unordered-containers - uuid - vector - websockets - wuss - ]; - executableSystemDepends = [ boost ]; - executablePkgconfigDepends = [ nix ]; - testHaskellDepends = [ - aeson - async - attoparsec - base - bifunctors - binary - binary-conduit - bytestring - conduit - containers - exceptions - filepath - hercules-ci-api-agent - hercules-ci-api-core - hercules-ci-cnix-store - hspec - HUnit - katip - lens - lens-aeson - lifted-async - lifted-base - monad-control - mtl - process - profunctors - protolude - QuickCheck - safe-exceptions - scientific - stm - tagged - temporary - text - tomland - transformers - transformers-base - unliftio-core - unordered-containers - uuid - vector - ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://docs.hercules-ci.com"; - description = "Runs Continuous Integration tasks on your machines"; - license = lib.licenses.asl20; -} diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix deleted file mode 100644 index 5a652312b4692..0000000000000 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - mkDerivation, - aeson, - base, - boost, - bytestring, - Cabal, - cabal-pkg-config-version-hook, - conduit, - containers, - directory, - exceptions, - filepath, - hercules-ci-cnix-store, - hspec, - hspec-discover, - inline-c, - inline-c-cpp, - lib, - nix, - process, - protolude, - QuickCheck, - scientific, - temporary, - text, - unliftio, - unordered-containers, - vector, -}: -mkDerivation { - pname = "hercules-ci-cnix-expr"; - version = "0.4.0.0"; - sha256 = "ba6dadda0a14e456780df018a610209ef288ed6562ad5843cb8d19d38fc026ed"; - setupHaskellDepends = [ - base - Cabal - cabal-pkg-config-version-hook - ]; - libraryHaskellDepends = [ - aeson - base - bytestring - conduit - containers - directory - exceptions - filepath - hercules-ci-cnix-store - inline-c - inline-c-cpp - protolude - scientific - text - unliftio - unordered-containers - vector - ]; - librarySystemDepends = [ boost ]; - libraryPkgconfigDepends = [ nix ]; - testHaskellDepends = [ - aeson - base - bytestring - containers - filepath - hercules-ci-cnix-store - hspec - process - protolude - QuickCheck - scientific - temporary - text - unordered-containers - vector - ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://docs.hercules-ci.com"; - description = "Bindings for the Nix evaluator"; - license = lib.licenses.asl20; -} diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix deleted file mode 100644 index fc535cd239119..0000000000000 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - mkDerivation, - base, - boost, - bytestring, - Cabal, - cabal-pkg-config-version-hook, - conduit, - containers, - exceptions, - hspec, - hspec-discover, - inline-c, - inline-c-cpp, - lib, - nix, - protolude, - template-haskell, - temporary, - text, - unix, - unliftio-core, - vector, -}: -mkDerivation { - pname = "hercules-ci-cnix-store"; - version = "0.3.7.0"; - sha256 = "6feba2a6e1a267bc69b67962ed6eaa3510b1ae31c411fdb4e6670763d175d3b1"; - setupHaskellDepends = [ - base - Cabal - cabal-pkg-config-version-hook - ]; - libraryHaskellDepends = [ - base - bytestring - conduit - containers - inline-c - inline-c-cpp - protolude - template-haskell - unix - unliftio-core - vector - ]; - librarySystemDepends = [ boost ]; - libraryPkgconfigDepends = [ nix ]; - testHaskellDepends = [ - base - bytestring - containers - exceptions - hspec - inline-c - inline-c-cpp - protolude - temporary - text - ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://docs.hercules-ci.com"; - description = "Haskell bindings for Nix's libstore"; - license = lib.licenses.asl20; -} diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 3ead981877d1a..d3bf1518868ca 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -147,8 +147,12 @@ builder rec { doCheck = false; doInstallCheck = doCheck; - # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.hostPlatform.isDarwin; + # guile-3 uses ELF files to store bytecode. strip does not + # always handle them correctly and destroys the image: + # darwin: In procedure bytevector-u8-ref: Argument 2 out of range + # linux binutils-2.45: $ guile --version + # Pre-boot error; key: misc-error, args: ("load-thunk-from-memory" "missing DT_GUILE_ENTRY" () #f)Aborted + dontStrip = true; setupHook = ./setup-hook-3.0.sh; diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix index 169f27b0f9370..a1443571ce5ec 100644 --- a/pkgs/development/libraries/c-blosc/1.nix +++ b/pkgs/development/libraries/c-blosc/1.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, testers, @@ -23,6 +24,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-YelKkEXAh27J0Mq1BExGuKNCYBgJCc3nwmmWLr4ZfVI="; }; + patches = [ + # backport patch for cmake 4 compatibility + (fetchpatch { + url = "https://github.com/Blosc/c-blosc/commit/051b9d2cb9437e375dead8574f66d80ebce47bee.patch"; + hash = "sha256-90dUd8KQqq+uVbngfoKF45rmFxbLVVgZjg0Xfc/vpcc="; + }) + ]; + # https://github.com/NixOS/nixpkgs/issues/144170 postPatch = '' sed -i -E \ diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix index 28a8bb3c3dc94..ae88847878cf6 100644 --- a/pkgs/development/libraries/cctag/default.nix +++ b/pkgs/development/libraries/cctag/default.nix @@ -7,7 +7,7 @@ boost, eigen, opencv, - tbb, + onetbb, avx2Support ? stdenv.hostPlatform.avx2Support, }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - tbb + onetbb ]; buildInputs = [ diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix deleted file mode 100644 index d8adcf7df8a2c..0000000000000 --- a/pkgs/development/libraries/embree/2.x.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - ispc, - tbb_2020, - glfw, - openimageio, - libjpeg, - libpng, - libpthreadstubs, - libX11, - python3Packages, - nix-update-script, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "embree"; - version = "2.17.7"; - - src = fetchFromGitHub { - owner = "embree"; - repo = "embree"; - tag = "v${finalAttrs.version}"; - hash = "sha256-FD/ITZBJnYy1F+x4jLTVTsGsNKy/mS7OYWP06NoHZqc="; - }; - - cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = [ - ispc - # tbb_2022 is not backward compatible - tbb_2020 - glfw - openimageio - libjpeg - libpng - libX11 - libpthreadstubs - ]; - - passthru = { - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "v(2.*)" - ]; - }; - tbb = tbb_2020; - tests = { - inherit (python3Packages) embreex; - }; - }; - - meta = with lib; { - description = "High performance ray tracing kernels from Intel"; - homepage = "https://embree.github.io/"; - maintainers = with maintainers; [ - hodapp - pbsds - ]; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - }; -}) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 140a0d82e4bc4..eb4519e13742a 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -5,7 +5,7 @@ cmake, pkg-config, ispc, - tbb, + onetbb, glfw, openimageio, libjpeg, @@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" "-DEMBREE_RAY_MASK=ON" - "-DTBB_ROOT=${tbb}" - "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + "-DTBB_ROOT=${onetbb}" + "-DTBB_INCLUDE_DIR=${onetbb.dev}/include" ]; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; buildInputs = [ - tbb + onetbb glfw openimageio libjpeg diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 271057d7cfa0f..7a209f62692a2 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -514,6 +514,11 @@ stdenv.mkDerivation ( url = "https://gitlab.archlinux.org/archlinux/packaging/packages/ffmpeg/-/raw/a02c1a15706ea832c0d52a4d66be8fb29499801a/add-av_stream_get_first_dts-for-chromium.patch"; hash = "sha256-DbH6ieJwDwTjKOdQ04xvRcSLeeLP2Z2qEmqeo8HsPr4="; }) + (fetchpatch2 { + name = "lcevcdec-4.0.0-compat.patch"; + url = "https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/fa23202cc7baab899894e8d22d82851a84967848.patch"; + hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ="; + }) ] ++ optionals (lib.versionOlder version "7.2") [ (fetchpatch2 { diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index bad3dc21ab716..a88e41c958735 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -89,5 +89,12 @@ in fmt_11 = generic { version = "11.2.0"; hash = "sha256-sAlU5L/olxQUYcv8euVYWTTB8TrVeQgXLHtXy8IMEnU="; + patches = [ + # Fixes the build with libc++ ≥ 21. + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/3cabf3757b6bc00330b55975317b2c145e4c689d.patch"; + hash = "sha256-SJFzNNC0Bt2aEQJlHGc0nv9KOpPQ+TgDX5iuFMUs9tk="; + }) + ]; }; } diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 5660f553f2895..81041136d6620 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fontconfig"; - version = "2.16.2"; + version = "2.17.1"; outputs = [ "bin" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { # ref: https://github.com/NixOS/nixpkgs/pull/401037#discussion_r2055430206 src = fetchurl { url = "https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${finalAttrs.version}/fontconfig-${finalAttrs.version}.tar.xz"; - hash = "sha256-FluP0qEZhkyHRksjOYbEobwJ77CcZd4cpAzB6F/7d+I="; + hash = "sha256-n1yuk/T//B+8Ba6ZzfxwjNYN/WYS/8BRKCcCXAJvpUE="; }; nativeBuildInputs = [ @@ -54,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: { sed -i '/check_PROGRAMS += test-crbug1004254/d' test/Makefile.am # Test causes error without patch shebangs. - patchShebangs doc/check-whitespace-in-args.py + patchShebangs doc/check-whitespace-in-args.py \ + doc/check-missing-doc.py ''; configureFlags = [ diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index 78ecc8f45523a..1085e9b301f6c 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -54,9 +54,10 @@ stdenv.mkDerivation (finalAttrs: { # Drop in libiberty, as external builds are not expected cd "$buildRoot" ( - mkdir -p build-${stdenv.buildPlatform.config}/libiberty/ - cd build-${stdenv.buildPlatform.config}/libiberty/ - ln -s ${buildPackages.libiberty}/lib/libiberty.a ./ + mkdir -p "build-${stdenv.buildPlatform.config}/libiberty/pic" + cd "build-${stdenv.buildPlatform.config}/libiberty/" + ln -s "${buildPackages.libiberty}/lib/libiberty.a" ./ + ln -s "${buildPackages.libiberty}/lib/libiberty_pic.a" pic/libiberty.a ) mkdir -p "$buildRoot/gcc" cd "$buildRoot/gcc" diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 364f51b4b2e83..b915b09caa29e 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -41,6 +41,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/glew/-/raw/ca08ff5d4cd3548a593eb1118d0a84b0c3670349/egl+glx.patch?inline=false"; hash = "sha256-IG3FPhhaor1kshEH3Kr8yzIHqBhczRwCqH7ZeDwlzGE="; }) + + # cmake 4 compatibility + (fetchpatch { + url = "https://github.com/nigels-com/glew/commit/a4d8b2a2a30576eb1b984ba5d573702acfc5b92e.diff"; + hash = "sha256-S6Om0A4y5po2rHl8OXcue2zOcBpCmBZYvf10LfKEYfI="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index 032d788e88823..b998065059613 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation { ''; patches = [ ./mac_device.patch ]; - dontFixCmake = true; cmakeFlags = [ "-DIRRLICHT_STATIC_LIBRARY=ON" diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index f5d817be852fb..f97b55760a3db 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -15,29 +15,18 @@ disableInitExecTls ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jemalloc"; - version = "5.3.0"; + version = "5.3.0-unstable-2025-09-12"; src = fetchFromGitHub { - owner = "jemalloc"; + owner = "facebook"; repo = "jemalloc"; - tag = version; - hash = "sha256-bb0OhZVXyvN+hf9BpPSykn5cGm87a0C+Y/iXKt9wTSs="; + rev = "c0889acb6c286c837530fdbeb96007b0dee8b776"; + hash = "sha256-lBNgvUhuiRPgzr8JC4zSSCT2KpDBktBVX72zfvAEHvo="; }; patches = [ - # fix tests under --with-jemalloc-prefix=, see https://github.com/jemalloc/jemalloc/pull/2340 - (fetchpatch { - url = "https://github.com/jemalloc/jemalloc/commit/d00ecee6a8dfa90afcb1bbc0858985c17bef6559.patch"; - hash = "sha256-N5i4IxGJ4SSAgFiq5oGRnrNeegdk2flw9Sh2mP0yl4c="; - }) - # fix linking with libc++, can be removed in the next update (after 5.3.0). - # https://github.com/jemalloc/jemalloc/pull/2348 - (fetchpatch { - url = "https://github.com/jemalloc/jemalloc/commit/4422f88d17404944a312825a1aec96cd9dc6c165.patch"; - hash = "sha256-dunkE7XHzltn5bOb/rSHqzpRniAFuGubBStJeCxh0xo="; - }) # -O3 appears to introduce an unreproducibility where # `rtree_read.constprop.0` shows up in some builds but # not others, so we fall back to O2: @@ -55,19 +44,12 @@ stdenv.mkDerivation rec { configureScript = "./autogen.sh"; configureFlags = [ - "--with-version=${version}-0-g0000000000000000000000000000000000000000" + "--with-version=${lib.versions.majorMinor finalAttrs.version}.0-0-g${finalAttrs.src.rev}" "--with-lg-vaddr=${with stdenv.hostPlatform; toString (if isILP32 then 32 else parsed.cpu.bits)}" ] # see the comment on stripPrefix ++ lib.optional stripPrefix "--with-jemalloc-prefix=" ++ lib.optional disableInitExecTls "--disable-initial-exec-tls" - # jemalloc is unable to correctly detect transparent hugepage support on - # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default - # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ lib.optionals (stdenv.hostPlatform.isAarch32 && lib.versionOlder version "5") [ - "--disable-thp" - "je_cv_thp=no" - ] # The upstream default is dependent on the builders' page size # https://github.com/jemalloc/jemalloc/issues/467 # https://sources.debian.org/src/jemalloc/5.3.0-3/debian/rules/ @@ -106,4 +88,4 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 5d124432e4f8e..65db7cc102e9d 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -53,8 +53,13 @@ stdenv.mkDerivation rec { # stdenv will take care of overriding bindir, sbindir, etc. such that "out" contains the binaries. prefix = placeholder "lib"; - env = lib.optionalAttrs stdenv.hostPlatform.isStatic { - NIX_CFLAGS_COMPILE = "-fcommon"; + env = { + # The release 1.21.3 is not compatible with c23, which changed the meaning of + # + # void foo(); + # + # declaration. + NIX_CFLAGS_COMPILE = "-std=gnu17" + lib.optionalString stdenv.hostPlatform.isStatic " -fcommon"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 3bd6add13ca55..02f93a256c549 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libffi"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = with finalAttrs; "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-+Z62imfH1Uhmt3Bq8kXoe6Bg1BmgYkdLRW07yNSr29E="; + hash = "sha256-86MIKiOzfCk6T80QUxR7Nx8v+R+n6hsqUuM1Z2usgtw="; }; # Note: this package is used for bootstrapping fetchurl, and thus diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0b43fec3275ec..1a00fab8d27b1 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.29.0"; + version = "1.29.1"; outputs = [ "bin" @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-wZRec6zIOALy1O6/NRRl0VxuS16SiL5SjXsley4K+c0="; + hash = "sha256-wNiI6QPwuK0gUJRadSJx+FOx84kpVC4bXhuQ3ybewoY="; }; patches = [ diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index d6a03867000be..f7e71d872ca0e 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -10,21 +10,21 @@ assert zlib != null; let - patchVersion = "1.6.49"; + patchVersion = "1.6.50"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-Zmdtgn4y7hc0ezmjU+kbW4sFR7RArrE/AjzU+irXjTI="; + hash = "sha256-aH3cDHyxKKPqWOFZtRKSUlN8J+3gwyqT8R8DEn8MAWU="; }; whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.49"; + version = "1.6.50"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-QxgqpI451ksatOxrcas+kQtn7tOg//N3fPjPQNbvcCQ="; + hash = "sha256-TfOWUYYgp6o2UUQ+h9Gyhi5OiMrRNai5NCPgFwYjIwc="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index baad5320b2508..a8d63d13125a2 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -54,6 +54,16 @@ stdenv.mkDerivation rec { libxslt ]; + # Fix the build with CMake 4. + # + # See: + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)' \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)' + ''; + meta = { description = "RDF Parser Toolkit"; mainProgram = "rapper"; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 29b2c9664794e..77318e8e14d0f 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libunwind"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "libunwind"; repo = "libunwind"; rev = "v${finalAttrs.version}"; - hash = "sha256-MsUReXFHlj15SgEZHOYhdSfAbSeVVl8LCi4NnUwvhpw="; + hash = "sha256-ed+FUPApDxNHxznXMhiTeNr8yRxRDSCyJJdIhouGNho="; }; postPatch = diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 52889102febc9..08c1cbe5fd033 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -43,13 +43,13 @@ let }; }; libxml2 = callPackage ./common.nix { - version = "2.14.5"; + version = "2.14.6"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libxml2"; tag = "v${packages.libxml2.version}"; - hash = "sha256-vxKlw8Kz+fgUP6bhWG2+4346WJVzqG0QvPG/BT7RftQ="; + hash = "sha256-EIcNL5B/o74hyc1N+ShrlKsPL5tHhiGgkCR1D7FcDjw="; }; extraMeta = { maintainers = with lib.maintainers; [ diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 31105350e6cb6..22d30398fed9b 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -3,4 +3,12 @@ callPackage ./generic.nix { version = "2.28.10"; hash = "sha256-09XWds45TFH7GORrju8pVQQQQomU8MlFAq1jJXrLW0s="; + + patches = [ + # cmake 4 compatibility + (fetchpatch { + url = "https://github.com/Mbed-TLS/mbedtls/commit/be4af04fcffcfebe44fa12d39388817d9949a9f3.patch"; + hash = "sha256-CbDm6CchzoTia7Wbpbe3bo9CmHPOsxY2d055AfbCS0g="; + }) + ]; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index bcd3314b515f9..16ee5939891d7 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; setOutputFlags = false; # some aren't supported + separateDebugInfo = false; patches = [ # linux-gnuabielfv{1,2} is not in ncurses' list of GNU-ish targets (or smth like that?). @@ -57,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ (lib.withFeature (!enableStatic) "shared") - "--without-debug" "--enable-pc-files" "--enable-symlinks" "--with-manpage-format=normal" "--disable-stripping" "--with-versioned-syms" ] + ++ lib.optional (!finalAttrs.separateDebugInfo) "--without-debug" ++ lib.optional unicodeSupport "--enable-widec" ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5" @@ -162,12 +163,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; - postFixup = + postInstall = let abiVersion-extension = if stdenv.hostPlatform.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in + lib.optionalString (!stdenv.hostPlatform.isCygwin && !enableStatic) '' + rm "$out"/lib/*.a '' + + '' # Determine what suffixes our libraries have suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)" '' @@ -241,10 +245,6 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "bin/infocmp" "$out" ''; - preFixup = lib.optionalString (!stdenv.hostPlatform.isCygwin && !enableStatic) '' - rm "$out"/lib/*.a - ''; - # I'm not very familiar with ncurses, but it looks like most of the # exec here will run hard-coded executables. There's one that is # dynamic, but it looks like it only comes from executing a terminfo diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index db366ad7e0a73..9de9314dc37dd 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -1,28 +1,24 @@ { lib, stdenv, - fetchFromGitHub, + fetchurl, cmake, brotli, libev, nghttp3, - quictls, + openssl, withJemalloc ? false, jemalloc, - curlHTTP3, + curl, }: stdenv.mkDerivation (finalAttrs: { pname = "ngtcp2"; - version = "1.14.0"; - - src = fetchFromGitHub { - owner = "ngtcp2"; - repo = "ngtcp2"; - # must match version usage in meta.changelog - tag = "v${finalAttrs.version}"; - hash = "sha256-5Pmk752i/lgO/os2SegevGN+MKaVuQii2HrVWaR15Gg="; - fetchSubmodules = true; + version = "1.15.1"; + + src = fetchurl { + url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${finalAttrs.version}/ngtcp2-${finalAttrs.version}.tar.bz2"; + hash = "sha256-Bbf6cvldAd3fvDVuHL89VPx1h1wvY2CGW5gIsDNM75c="; }; outputs = [ @@ -36,18 +32,28 @@ stdenv.mkDerivation (finalAttrs: { brotli libev nghttp3 - quictls + openssl ] ++ lib.optional withJemalloc jemalloc; - cmakeFlags = [ - (lib.cmakeBool "ENABLE_STATIC_LIB" false) - ]; + cmakeFlags = + if stdenv.hostPlatform.isStatic then + [ + # The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries. + # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`. + (lib.cmakeBool "ENABLE_LIB_ONLY" true) + (lib.cmakeBool "ENABLE_SHARED_LIB" false) + (lib.cmakeBool "ENABLE_STATIC_LIB" true) + ] + else + [ + (lib.cmakeBool "ENABLE_STATIC_LIB" false) + ]; doCheck = true; passthru.tests = { - inherit curlHTTP3; + inherit curl; }; meta = { diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix deleted file mode 100644 index c8c676c27d045..0000000000000 --- a/pkgs/development/libraries/nuspell/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - buildPackages, - pkg-config, - icu, - catch2_3, - enableManpages ? buildPackages.pandoc.compiler.bootstrapAvailable, -}: - -stdenv.mkDerivation rec { - pname = "nuspell"; - version = "5.1.6"; - - src = fetchFromGitHub { - owner = "nuspell"; - repo = "nuspell"; - rev = "v${version}"; - hash = "sha256-U/lHSxpKsBnamf4ikE2aIjEPSU5fxjtuSmhZR0jxMAI="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ] - ++ lib.optionals enableManpages [ - buildPackages.pandoc - ]; - - buildInputs = [ catch2_3 ]; - - propagatedBuildInputs = [ icu ]; - - cmakeFlags = [ - "-DBUILD_TESTING=YES" - ] - ++ lib.optionals (!enableManpages) [ - "-DBUILD_DOCS=OFF" - ]; - - doCheck = true; - - outputs = [ - "out" - "lib" - "dev" - ]; - - meta = with lib; { - description = "Free and open source C++ spell checking library"; - mainProgram = "nuspell"; - homepage = "https://nuspell.github.io/"; - platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; - license = licenses.lgpl3Plus; - changelog = "https://github.com/nuspell/nuspell/blob/v${version}/CHANGELOG.md"; - }; -} diff --git a/pkgs/development/libraries/nuspell/wrapper.nix b/pkgs/development/libraries/nuspell/wrapper.nix deleted file mode 100644 index 4bb97e623d38f..0000000000000 --- a/pkgs/development/libraries/nuspell/wrapper.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - stdenv, - lib, - nuspell, - makeWrapper, - dicts ? [ ], -}: - -let - searchPath = lib.makeSearchPath "share/hunspell" dicts; -in -stdenv.mkDerivation { - name = (lib.appendToName "with-dicts" nuspell).name; - nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' - makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${lib.escapeShellArg searchPath} - ''; - meta = removeAttrs nuspell.meta [ "outputsToInstall" ]; -} diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 4d3c68b6e8e0e..532513e1fe42d 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -69,7 +69,7 @@ tesseract, leptonica, enableTbb ? false, - tbb, + onetbb, enableOvis ? false, ogre, enableGPhoto2 ? false, @@ -406,7 +406,7 @@ effectiveStdenv.mkDerivation { leptonica ] ++ optionals enableTbb [ - tbb + onetbb ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [ bzip2 diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 760af40f0ffb3..8d6a847b235f1 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -387,8 +387,8 @@ in }; openssl_3_5 = common { - version = "3.5.1"; - hash = "sha256-UpBDsVz/pfNgd6TQr4Pz3jmYBxgdYHRB1zQZbYibZB8="; + version = "3.5.2"; + hash = "sha256-xTpH5eRByTDDkoz3v2+wDl0Sm2MOCqhzsIJYZW5zRew="; patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 66d3b5f9ac1bb..10b90dd981867 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.44"; + version = "10.46"; src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-008C4RPPcZOh6/J3DTrFJwiNSF1OBH7RDl0hfG713pY="; + hash = "sha256-FfvFq6a+7gsXrssEYCrjlDI5OroevY45t8q/fbiDKZ8="; }; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index ee526bffeb26b..b16dd5874277b 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -25,6 +25,13 @@ let (./. + "/dont-set-cmake-skip-rpath-${version}.patch") ]; + # https://github.com/icculus/physfs/commit/f7d24ce8486d9229207cca1ff98858fe60ffe583 + # but the patch wouldn't apply to physfs_2, so let's do a fuzzy sed. + postPatch = '' + sed '/^cmake_minimum_required/Is/VERSION [0-9]\.[0-9]/VERSION 3.5/' \ + -i CMakeLists.txt + ''; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index eb22e22afb8d3..ae018111a2c37 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pipewire"; - version = "1.4.7"; + version = "1.4.8"; outputs = [ "out" @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-U9J7f6nDO4tp6OCBtBcZ9HP9KDKLfuuRWDEbgLL9Avs="; + sha256 = "sha256-o4puApKXW4pQ0DRcLgZTDor8CAxKehn7Zi56/PzrSLU="; }; patches = [ @@ -241,9 +241,12 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; doInstallCheck = true; - postUnpack = '' - patchShebangs ${finalAttrs.src.name}/doc/*.py - patchShebangs ${finalAttrs.src.name}/doc/input-filter-h.sh + postPatch = '' + patchShebangs doc/*.py + patchShebangs doc/input-filter-h.sh + + # Remove installed-test that runs forever + sed -i -e "/test-pipewire-alsa-stress/d" pipewire-alsa/tests/meson.build ''; postInstall = '' diff --git a/pkgs/development/libraries/protobuf/32.nix b/pkgs/development/libraries/protobuf/32.nix index 6e01d419168ee..5f0db67dad9c4 100644 --- a/pkgs/development/libraries/protobuf/32.nix +++ b/pkgs/development/libraries/protobuf/32.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "32.0"; - hash = "sha256-kiA0P6ZU0i9vxpNjlusyMsFkvDb5DkoiH6FwE/q8FMI="; + version = "32.1"; + hash = "sha256-wfu1MyCycGpxFB++eicA0F41j886/Y52I/4+ciRUg2o="; } // args ) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 38ecd3c909470..9c34451b9e842 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -65,6 +65,16 @@ let ./qtdeclarative-default-disable-qmlcache.patch # add version specific QML import path ./qtdeclarative-qml-paths.patch + ] + # FIXME: Make unconditional on next staging cycle + ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [ + # Fix an undefined behavior, and fix random-seeming build error with Clang. See: + # - https://codereview.qt-project.org/c/qt/qtdeclarative/+/354847 + # - https://github.com/llvm/llvm-project/issues/74070 + (fetchpatch { + url = "https://github.com/qt/qtdeclarative/commit/636481a31110f1819efaf6500b25fbc395854311.patch"; + hash = "sha256-ACOG3IjR0SIlLYioODGdhkNTGNvnKu6iOihsVdzyvgo="; + }) ]; qtlocation = lib.optionals stdenv.cc.isClang [ # Fix build with Clang 16 diff --git a/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/pkgs/development/libraries/qt-6/modules/qtdoc.nix index fa091d4c6da6b..5e35b4b5d5fb1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdoc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdoc.nix @@ -16,12 +16,7 @@ qtModule { ''; nativeBuildInputs = [ (qttools.override { withClang = true; }) ]; propagatedBuildInputs = [ qtdeclarative ]; - cmakeFlags = [ - "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS" - ]; - dontUseNinjaBuild = true; - buildFlags = [ "docs" ]; - dontUseNinjaInstall = true; - installFlags = [ "install_docs" ]; - outputs = [ "out" ]; + + ninjaFlags = [ "docs" ]; + installTargets = [ "install_docs" ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qttools/default.nix b/pkgs/development/libraries/qt-6/modules/qttools/default.nix index fd68b6fd087e2..4fb69db29359d 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix @@ -6,32 +6,18 @@ qtbase, qtdeclarative, cups, - llvmPackages, + llvmPackages_20, # clang-based c++ parser for qdoc and lupdate withClang ? false, }: qtModule { pname = "qttools"; - buildInputs = lib.optionals withClang [ - llvmPackages.libclang - llvmPackages.llvm - ]; - propagatedBuildInputs = [ - qtbase - qtdeclarative - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups ]; - cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "-DQt6LinguistTools_DIR=${pkgsBuildBuild.qt6.qttools}/lib/cmake/Qt6LinguistTools" - "-DQt6ToolsTools_DIR=${pkgsBuildBuild.qt6.qttools}/lib/cmake/Qt6ToolsTools" - ]; + patches = [ ./paths.patch ]; - env.NIX_CFLAGS_COMPILE = toString [ - "-DNIX_OUTPUT_OUT=\"${placeholder "out"}\"" - ]; + postPatch = '' substituteInPlace \ src/qdoc/catch/CMakeLists.txt \ @@ -39,6 +25,32 @@ qtModule { src/qdoc/catch_conversions/CMakeLists.txt \ --replace ''\'''${CMAKE_INSTALL_INCLUDEDIR}' "$out/include" ''; + + env.NIX_CFLAGS_COMPILE = toString [ + "-DNIX_OUTPUT_OUT=\"${placeholder "out"}\"" + ]; + + # FIXME: update to LLVM 21 with Qt 6.10 + buildInputs = lib.optionals withClang [ + llvmPackages_20.libclang + llvmPackages_20.llvm + ]; + + propagatedBuildInputs = [ + qtbase + qtdeclarative + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups ]; + + cmakeFlags = + lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "-DQt6LinguistTools_DIR=${pkgsBuildBuild.qt6.qttools}/lib/cmake/Qt6LinguistTools" + "-DQt6ToolsTools_DIR=${pkgsBuildBuild.qt6.qttools}/lib/cmake/Qt6ToolsTools" + ] + ++ lib.optionals withClang [ + "-DFEATURE_clang=ON" + ]; + postInstall = '' mkdir -p "$dev" ln -s "$out/bin" "$dev/bin" diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index 7a6559550ad7e..aa8849e5faaaf 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -12,7 +12,6 @@ python3, libarchive, libmsym, - msgpack, qttools, wrapQtAppsHook, }: @@ -78,7 +77,6 @@ stdenv.mkDerivation rec { glew libarchive libmsym - msgpack qttools ]; diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 5118017b247da..3f0168644a181 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -24,7 +24,6 @@ let device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; - libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else (lib.getLib stdenv.cc.cc); in stdenv.mkDerivation { inherit version; @@ -87,9 +86,6 @@ stdenv.mkDerivation { for rpath in $(otool -L $f | grep rpath | awk '{print $1}');do install_name_tool -change $rpath $out/lib/$(basename $rpath) $f done - if otool -L $f | grep /usr/lib/libc++ >& /dev/null; then - install_name_tool -change /usr/lib/libc++.1.dylib ${libcxx-for-libtorch.outPath}/lib/libc++.1.0.dylib $f - fi done for f in $out/lib/*.dylib; do otool -L $f diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 69b51422100be..7f359ebacbdbe 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -194,6 +194,12 @@ stdenv.mkDerivation rec { hash = "sha256-foP2OXUL6ttgYvCxLsxUiVdkPoTvGiHomdNudbSUmSE="; }; + patches = [ + # Remove this once https://github.com/OpenMathLib/OpenBLAS/issues/5414 is + # resolved. + ./disable-sme-sgemm-kernel.patch + ]; + postPatch = '' # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16' substituteInPlace Makefile.arm64 --replace "+sve2+bf16" "" @@ -275,6 +281,9 @@ stdenv.mkDerivation rec { }) ); + # The default "all" target unconditionally builds the "tests" target. + buildFlags = lib.optionals (!doCheck) [ "shared" ]; + doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/libraries/science/math/openblas/disable-sme-sgemm-kernel.patch b/pkgs/development/libraries/science/math/openblas/disable-sme-sgemm-kernel.patch new file mode 100644 index 0000000000000..ae85a039b254e --- /dev/null +++ b/pkgs/development/libraries/science/math/openblas/disable-sme-sgemm-kernel.patch @@ -0,0 +1,13 @@ +diff --git a/interface/gemm.c b/interface/gemm.c +index c5182c266..7056422e1 100644 +--- a/interface/gemm.c ++++ b/interface/gemm.c +@@ -436,7 +436,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANS + #endif + #if defined(ARCH_ARM64) && (defined(USE_SGEMM_KERNEL_DIRECT)||defined(DYNAMIC_ARCH)) + #if defined(DYNAMIC_ARCH) +- if (support_sme1()) ++ if (false) + #endif + if (beta == 0 && alpha == 1.0 && order == CblasRowMajor && TransA == CblasNoTrans && TransB == CblasNoTrans) { + SGEMM_DIRECT(m, n, k, a, lda, b, ldb, c, ldc); diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 8e56d3b70dd41..5a25cb3571d74 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -53,6 +53,22 @@ stdenv.mkDerivation (finalAttrs: { # headers are located in the dev output: substituteInPlace CMakeLists.txt \ --replace-fail ' ''${CMAKE_INSTALL_PREFIX}/include' " ${placeholder "dev"}/include" + + # Fix the build with CMake 4. + # + # See: + badCmakeFiles=( + CMakeLists.txt + src/CMakeLists.txt + tests/{bittwiddling,json,sparsetest,utftest}/CMakeLists.txt + gr2fonttest/CMakeLists.txt + ) + for file in "''${badCmakeFiles[@]}"; do + substituteInPlace "$file" \ + --replace-fail \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)' \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)' + done ''; cmakeFlags = lib.optionals static [ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 382dbf37d9416..5820c50b44972 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -27,17 +27,17 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.50.2"; + version = "3.50.4"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-hKYW/9MXOORZC2W6uzqeHvk3DzY4422yIO4Oc/itIVY="; + hash = "sha256-o9tYehuS7l3awvZrPttBsm+chnJ1eC1Gw6CIl31qWxg="; }; docsrc = fetchurl { url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip"; - hash = "sha256-n4uitTo6oskWbUagLZEbhdO4sLhAxJHTIdX8YhUONBk="; + hash = "sha256-+KA89GFQAxDHp4XJ1vhhIayUZWAZgs3Kxt4MWYfb/C8="; }; outputs = [ diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 0528448da7fff..f4ddd98c692b1 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -19,14 +19,14 @@ let }: stdenv.mkDerivation rec { inherit pname; - version = "3.50.2"; + version = "3.50.4"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-CR7uw64sy5Gqwh0OmkpYlE+yyxEvpnv/w+CMLsothcg="; + hash = "sha256-t7TcBg82BTkC+2WzRLu+1ZLmSyKRomrAb+d+7Al4UOk="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index cd50c40149045..524a3c1a8657f 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -113,6 +113,8 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '"libtpms.so"' '"${libtpms.out}/lib/libtpms.so"' \ --replace-fail '"libtpms.so.0"' '"${libtpms.out}/lib/libtpms.so.0"' done + substituteInPlace src/tss2-fapi/ifapi_config.c \ + --replace-fail 'SYSCONFDIR' '"/etc"' '' # tcti tests rely on mocking function calls, which appears not to be supported # on clang @@ -143,6 +145,14 @@ stdenv.mkDerivation (finalAttrs: { # Do not install the upstream udev rules, they rely on specific # users/groups which aren't guaranteed to exist on the system. rm -R $out/lib/udev + + # write fapi-config suitable for testing + cat > $out/etc/tpm2-tss/fapi-config-test.json < +Date: Sat, 20 Sep 2025 14:11:13 +0200 +Subject: [PATCH] Add missing includes + +These files use types from without including it. Without +the includes, the build fails for musl. +--- +Link: https://github.com/mariadb-corporation/mariadb-connector-odbc/pull/65 + + driver/interface/Exception.h | 1 + + driver/template/CArray.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/driver/interface/Exception.h b/driver/interface/Exception.h +index 1b2eb847..82f06273 100644 +--- a/driver/interface/Exception.h ++++ b/driver/interface/Exception.h +@@ -21,6 +21,7 @@ + #ifndef _EXCEPTION_H_ + #define _EXCEPTION_H_ + ++#include + #include + #include "class/SQLString.h" + +diff --git a/driver/template/CArray.h b/driver/template/CArray.h +index 2c4be514..bd0e9912 100644 +--- a/driver/template/CArray.h ++++ b/driver/template/CArray.h +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +2.51.0 + diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix index aa8b9c1be1bff..66550f31c4eb7 100644 --- a/pkgs/development/libraries/vid-stab/default.nix +++ b/pkgs/development/libraries/vid-stab/default.nix @@ -8,19 +8,27 @@ stdenv.mkDerivation { pname = "vid.stab"; - version = "unstable-2022-05-30"; + version = "1.1.1-unstable-2025-08-21"; src = fetchFromGitHub { owner = "georgmartius"; repo = "vid.stab"; - rev = "90c76aca2cb06c3ff6f7476a7cd6851b39436656"; - sha256 = "sha256-p1VRnkBeUpET3O2FmaJMyN5/EoSOQLdmRIVbzZcQaKY="; + rev = "4bd81e3cdd778e2e0edc591f14bba158ec40cfa1"; + hash = "sha256-imSy1ywpGWbghP65NoPgUJBJmHUY5OsLWmIXk6Q1MQ4="; }; nativeBuildInputs = [ cmake ]; propagatedBuildInputs = lib.optionals stdenv.cc.isClang [ openmp ]; + # Fix the build with CMake 4. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required (VERSION 2.8.5)' \ + 'cmake_minimum_required (VERSION 3.10)' + ''; + meta = with lib; { description = "Video stabilization library"; homepage = "http://public.hronopik.de/vid.stab/"; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 1d7779db9ca5d..43a54152f3da7 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -7,7 +7,7 @@ let in { vtk_9_5 = mkVtk { - version = "9.5.1"; - sourceSha256 = "sha256-FEQ2YcewldBbTjdvs/QGE/Fz40/J1GWCNOnsHWJKYY8="; + version = "9.5.2"; + sourceSha256 = "sha256-zuZLmNJw/3MC2vHvE0WN/11awey0XUdyODX399ViyYk="; }; } diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index baedf3daa8de3..587984f4768b2 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -44,8 +44,6 @@ cgns, adios2, libLAS, - libgeotiff, - laszip_2, gdal, pdal, alembic, @@ -69,7 +67,7 @@ opencascade-occt, # threading - tbb, + onetbb, llvmPackages, # rendering @@ -98,7 +96,6 @@ let vtkPackages = lib.makeScope newScope (self: { inherit - tbb mpi mpiSupport python3Packages @@ -109,7 +106,6 @@ let inherit mpi mpiSupport; cppSupport = !mpiSupport; }; - openvdb = self.callPackage openvdb.override { }; netcdf = self.callPackage netcdf.override { }; catalyst = self.callPackage catalyst.override { }; adios2 = self.callPackage adios2.override { }; @@ -141,8 +137,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libLAS - libgeotiff - laszip_2 gdal pdal alembic @@ -157,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { openturns libarchive libGL - vtkPackages.openvdb + openvdb ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libXfixes @@ -195,13 +189,13 @@ stdenv.mkDerivation (finalAttrs: { libtheora cli11 openslide + onetbb vtkPackages.hdf5 vtkPackages.cgns vtkPackages.adios2 vtkPackages.netcdf vtkPackages.catalyst vtkPackages.viskores - vtkPackages.tbb ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp @@ -225,12 +219,13 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - env = { - CMAKE_PREFIX_PATH = "${lib.getDev openvdb}/lib/cmake/OpenVDB"; - NIX_LDFLAGS = "-L${lib.getLib libmysqlclient}/lib/mariadb"; - }; - cmakeFlags = [ + # During installPhase, keep rpath that came from target_link_libraries() of imported targets. + # Typically libgeotiff,liblaszip propagated from liblas and libmariadb found by pkg-config. + (lib.cmakeBool "CMAKE_INSTALL_RPATH_USE_LINK_PATH" true) + # Required for locating the findOpenVDB.cmake module + # TODO: Add a setup hook in openvdb to append CMAKE_MODULE_PATH to cmakeFlagsArray + (lib.cmakeFeature "CMAKE_MODULE_PATH" "${lib.getDev openvdb}/lib/cmake/OpenVDB") (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") @@ -284,7 +279,7 @@ stdenv.mkDerivation (finalAttrs: { # Remove thirdparty find module that have been provided in nixpkgs. '' rm -rf $out/lib/cmake/vtk/patches - rm $out/lib/cmake/vtk/Find{EXPAT,Freetype,utf8cpp,LibXml2,FontConfig}.cmake + rm $out/lib/cmake/vtk/Find{EXPAT,Freetype,utf8cpp,LibXml2,FontConfig,TBB}.cmake '' # libvtkglad.so will find and load libGL.so at runtime. + lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix index fa788feac4196..06a5e79609806 100644 --- a/pkgs/development/misc/haskell/changelog-d/default.nix +++ b/pkgs/development/misc/haskell/changelog-d/default.nix @@ -19,13 +19,13 @@ }: mkDerivation rec { pname = "changelog-d"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "fgaz"; repo = "changelog-d"; rev = "v${version}"; - hash = "sha256-4TbZD4pXP/5q+t3rTcdCsY5APWIcxhCMM+WsNO/6ke4="; + hash = "sha256-nPvuAkcFfK/NKXNBv8D2ePnB88WnjvmAIbzQHVvEXtk="; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix index 83fab0673a241..7d54778603ea2 100644 --- a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix +++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix @@ -1,7 +1,7 @@ { mkDerivation, base, - fetchFromGitHub, + fetchgit, lib, prettyprinter, prettyprinter-ansi-terminal, @@ -9,16 +9,15 @@ QuickCheck, text, transformers, - transformers-compat, }: mkDerivation { pname = "hercules-ci-optparse-applicative"; - version = "0.18.1.0"; - src = fetchFromGitHub { - owner = "hercules-ci"; - repo = "optparse-applicative"; - sha256 = "1cgxc80zfgzk4rrhspnlj7790jb0ddq7ybj7qjan5xmjjir90763"; - rev = "a123939663ba1cd0f1750343f1c6b9864ac21207"; + version = "0.19.0.0"; + src = fetchgit { + url = "https://github.com/hercules-ci/optparse-applicative.git"; + sha256 = "068rsq9j0afrywbcqf6vg4ivfxbb68ab7f0lvg1na81mfn7sfakk"; + rev = "b55bb38a2aea0cf776aec707cdce7c7418146077"; + fetchSubmodules = true; }; libraryHaskellDepends = [ base @@ -27,7 +26,6 @@ mkDerivation { process text transformers - transformers-compat ]; testHaskellDepends = [ base @@ -36,5 +34,5 @@ mkDerivation { homepage = "https://github.com/hercules-ci/optparse-applicative"; description = "Utilities and combinators for parsing command line options (fork)"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ roberth ]; + maintainers = [ lib.maintainers.roberth ]; } diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index d9afb4a006cbe..9be2133c40406 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.23.2"; + version = "2.24.2"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiobotocore"; tag = version; - hash = "sha256-3aqA+zjXgYGqDRF0x2eS458A0N7Dmc0tfOcnukjf0DM="; + hash = "sha256-Kt/+LboMMurZ00gVYSDCPLJXKPtuyXOTtOgSCUIR9Ho="; }; # Relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 33338418a3eee..e603d8b8e84c1 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -10,17 +10,17 @@ }: buildPythonPackage rec { - version = "3.8.1"; + version = "3.9.1"; pname = "asgiref"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "django"; repo = "asgiref"; tag = version; - hash = "sha256-xepMbxglBpHL7mnJYlnvNUgixrFwf/Tc6b1zL4Wy+to="; + hash = "sha256-VD8OQP+Xq3JpUz3fZRl6g+SL7mGZjeHjOU9Cd+scYzc="; }; propagatedBuildInputs = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index f123d3ccdd50d..7a6da605e338e 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -2,31 +2,37 @@ lib, stdenv, buildPythonPackage, - cython, fetchFromGitHub, + + # build-system + cython, + setuptools, + + # nativeBuildInputs + pkg-config, + + # buildInputs + ffmpeg-headless, + + # dependencies + fetchurl, linkFarm, - ffmpeg-headless, numpy, pillow, - pkg-config, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "av"; - version = "14.1.0"; + version = "15.1.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "PyAV-Org"; repo = "PyAV"; tag = "v${version}"; - hash = "sha256-GYdt6KMMmDSyby447MbShL2GbrH8R1UuOeiVlztGuS4="; + hash = "sha256-VeF6Sti1Ide2LchiCuPut/bdbJUv+5eTH2q0YMcniyA="; }; build-system = [ @@ -87,12 +93,12 @@ buildPythonPackage rec { "av.video" ]; - meta = with lib; { + meta = { description = "Pythonic bindings for FFmpeg"; mainProgram = "pyav"; homepage = "https://github.com/PyAV-Org/PyAV"; changelog = "https://github.com/PyAV-Org/PyAV/blob/v${version}/CHANGELOG.rst"; - license = licenses.bsd2; + license = lib.licenses.bsd2; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index 7d6bb52b5b632..088f52fa6a022 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -10,6 +10,7 @@ # tests freezegun, + glibcLocales, pytestCheckHook, pytz, tzdata, @@ -31,6 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + glibcLocales pytestCheckHook # https://github.com/python-babel/babel/issues/988#issuecomment-1521765563 pytz diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 05ba5ae02f3b8..020c5fe91503d 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "boto"; repo = "boto3"; tag = version; - hash = "sha256-+3UcnKgDIA9PPELnB70La+Lo03SMouVLzvLQ9zyFGsE="; + hash = "sha256-H6iCdOw0eFfd4rKhf5VRhWZhPG1ne+TrZYqxpY5R+T4="; }; build-system = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 49a89d8e3253f..36c1eb51e1791 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.40.4"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.40.18"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; tag = version; - hash = "sha256-VJAd9aCJkwSyurAWF/YAVRcSTR+9ZbkH7H6LZGvcXYY="; + hash = "sha256-m0pmfOzI1mgfthiAShO2oDYlnFqUfDv+FR5X1XlHHkM="; }; build-system = [ diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index e3bea6456b11d..49345a2321326 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -76,6 +76,13 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; + disabledTestPaths = [ + # tests fail starting on 2025-10-01 + # related: https://github.com/aws-cloudformation/cfn-lint/issues/4125 + "test/integration/test_quickstart_templates.py" + "test/integration/test_quickstart_templates_non_strict.py" + ]; + disabledTests = [ # Requires git directory "test_update_docs" diff --git a/pkgs/development/python-modules/cgal/default.nix b/pkgs/development/python-modules/cgal/default.nix index 46251662a624b..0cc475f092124 100644 --- a/pkgs/development/python-modules/cgal/default.nix +++ b/pkgs/development/python-modules/cgal/default.nix @@ -9,7 +9,7 @@ cgal, cmake, gmp, - tbb, + onetbb, LAStools, eigen, mpfr, @@ -45,7 +45,7 @@ buildPythonPackage rec { mpfr boost zlib - tbb + onetbb eigen ] ++ lib.optionals withLAS [ diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index b7b66ffc7dea0..e526925b696b5 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "channels"; - version = "4.2.2"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "django"; repo = "channels"; tag = version; - hash = "sha256-Hx6ItDLt+QAy43SvyYVUY76Sva7+MYjcz0wJeXES/HQ="; + hash = "sha256-dRKK6AQNlPdBQumbLmPyOTW96N/PJ9yUY6GYe5x/c+A="; }; build-system = [ setuptools ]; @@ -46,6 +46,11 @@ buildPythonPackage rec { ] ++ lib.flatten (builtins.attrValues optional-dependencies); + # won't run in sandbox + disabledTestPaths = [ + "tests/sample_project/tests/test_selenium.py" + ]; + pythonImportsCheck = [ "channels" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index 61cfd11b077fe..f0392acde6a69 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -3,6 +3,7 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + isPyPy, mypy, pytestCheckHook, requests, @@ -23,12 +24,12 @@ buildPythonPackage rec { }; build-system = [ - mypy setuptools setuptools-scm - ]; + ] + ++ lib.optional (!isPyPy) mypy; - env.CHARSET_NORMALIZER_USE_MYPYC = "1"; + env.CHARSET_NORMALIZER_USE_MYPYC = lib.optionalString (!isPyPy) "1"; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 24b6d0c315725..030d2bad3028f 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.10.5"; + version = "7.10.6"; pyproject = true; src = fetchFromGitHub { owner = "nedbat"; repo = "coveragepy"; tag = version; - hash = "sha256-jsocpziOu0fSmFn075vj2u1SCZkG7M/kuRujaJ1OeH4="; + hash = "sha256-16t29ftyYBkGvzlV6+imjO+HM1UD/Nrhn+n4pK3h5iU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index c318de33809cb..2c9f3da24333c 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -1,6 +1,6 @@ { lib, - fetchFromRepoOrCz, + fetchurl, buildPythonPackage, flit-core, pillow, @@ -17,12 +17,9 @@ let version = "0.21.2"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchFromRepoOrCz { - repo = "docutils"; - rev = "docutils-${version}"; - hash = "sha256-Q+9yW+BYUEvPYV504368JsAoKKoaTZTeKh4tVeiNv5Y="; + src = fetchurl { + url = "mirror://sourceforge/docutils/docutils-${version}.tar.gz"; + hash = "sha256-OmsYcy7fGC2qPNEndbuzOM9WkUaPke7rEJ3v9uv6mG8="; }; build-system = [ flit-core ]; @@ -34,7 +31,9 @@ let nativeCheckInputs = [ pillow ]; checkPhase = '' + runHook preCheck ${python.interpreter} test/alltests.py + runHook postCheck ''; # Create symlinks lacking a ".py" suffix, many programs depend on these names @@ -44,16 +43,20 @@ let done ''; - meta = with lib; { + pythonImportsCheck = [ "docutils" ]; + + meta = { description = "Python Documentation Utilities"; homepage = "http://docutils.sourceforge.net/"; - license = with licenses; [ + changelog = "https://sourceforge.net/projects/docutils/files/docutils/${version}"; + license = with lib.licenses; [ publicDomain bsd2 psfl gpl3Plus ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ jherland ]; + mainProgram = "docutils"; }; }; in diff --git a/pkgs/development/python-modules/embreex/default.nix b/pkgs/development/python-modules/embreex/default.nix deleted file mode 100644 index 38b2904a2cbf4..0000000000000 --- a/pkgs/development/python-modules/embreex/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchpatch, - buildPythonPackage, - embree2, - cython, - numpy, - setuptools, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "embreex"; - version = "2.17.7.post6"; - pyproject = true; - - src = fetchFromGitHub { - owner = "trimesh"; - repo = "embreex"; - tag = version; - hash = "sha256-iLIfhngorSFOdkOvlCAJQXGQrVuRfBSDGzvjXOlQuHk="; - }; - - patches = [ - # https://github.com/trimesh/embreex/pull/7 - (fetchpatch { - name = "fix-use-after-free.patch"; - url = "https://github.com/trimesh/embreex/commit/c6b047285419f8986fae962e2734a01522be7ef7.patch"; - hash = "sha256-s8x2vsqbsIR3aoNUDrYs2vQttuNY8lLJ6TC7H8FMRyQ="; - }) - ]; - - build-system = [ - setuptools - numpy - cython - ]; - - dependencies = [ - numpy - ]; - - buildInputs = [ - embree2 - embree2.tbb - ]; - - pythonImportsCheck = [ - "embreex" - "embreex.mesh_construction" - "embreex.rtcore" - "embreex.rtcore_scene" - "embreex.triangles" - ]; - - preCheck = '' - # conflicts with $out - rm -rf embreex/ - ''; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - description = "Maintained PyEmbree fork, wrapper for Embree v2"; - homepage = "https://github.com/trimesh/embreex"; - changelog = "https://github.com/trimesh/embreex/releases/tag/${src.tag}"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ pbsds ]; - inherit (embree2.meta) platforms; - }; -} diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index f1077552559ac..2a652cfe73f69 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { hash = "sha256-fzCN+idYQ97nuDVfYn6VYQFBaaMxmnjWzFrmn+Aj+u4="; }; + pythonRelaxDeps = lib.optionals isPyPy [ "greenlet" ]; + nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix index dab9287e1b3e5..1cc0d1fb7648e 100644 --- a/pkgs/development/python-modules/flasgger/default.nix +++ b/pkgs/development/python-modules/flasgger/default.nix @@ -2,12 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, + + # build-system + setuptools, # dependencies flask, jsonschema, mistune, + packaging, pyyaml, six, werkzeug, @@ -19,7 +22,7 @@ buildPythonPackage rec { pname = "flasgger"; version = "0.9.7.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "flasgger"; @@ -28,10 +31,13 @@ buildPythonPackage rec { hash = "sha256-ULEf9DJiz/S2wKlb/vjGto8VCI0QDcm0pkU5rlOwtiE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ flask jsonschema mistune + packaging pyyaml six werkzeug @@ -41,7 +47,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = false; # missing flex dependency + enabledTestPaths = [ + "tests" + ]; + + disabledTestPaths = [ + # missing flex dependency + "tests/test_examples.py" + ]; meta = with lib; { description = "Easy OpenAPI specs and Swagger UI for your Flask API"; diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix index 3735dab43ff8c..c296049807e50 100644 --- a/pkgs/development/python-modules/freud/default.nix +++ b/pkgs/development/python-modules/freud/default.nix @@ -13,7 +13,7 @@ ninja, # buildInputs - tbb_2022, + onetbb, nanobind, # dependencies @@ -65,7 +65,7 @@ buildPythonPackage rec { ]; dontUseCmakeConfigure = true; buildInputs = [ - tbb_2022 + onetbb nanobind ]; diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index ae82882b7ba8c..8503cf2e76ced 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.74.0"; + version = "1.75.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-a4AHm21uNITq+J9OVHQ46Py4ZY8kQCfa+2eAO7vQfUs="; + hash = "sha256-1SGXOjQ4Bqg4S/h86uk88unxD4+rAsEr56Lj1dDk5o8="; }; 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 ea3c3dbb14bc3..419872582d454 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.74.0"; + version = "1.75.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-1nSUUdTO9UPD9iYK6ahshLmrAqkkIc7K5zpjLn/pIL8="; + hash = "sha256-TeXrJwlihA9g4Ynr3b/P4jK17Pz2GN1TQRam9mhLQL8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 35b0e1ca1e0c5..3d5886bfc494f 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.74.0"; + version = "1.75.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-xzJ9JSDc2sIJhy6/V3dMMjlkba2ILkq7Ste+vMrKLIM="; + hash = "sha256-YLuYZfVBGtWJQg6tzdfgwzjAqr7fXUzQc2PVv32pyXI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index c003dda3cd2ba..4c26accf3eba3 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.74.0"; + version = "1.75.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-xYwbJKpFTjDx/Gp+DbvBlMVKQIFDlxqUtfTkC7WDFDI="; + hash = "sha256-adW5G+G4uSbwhsHEg1GalowUZAdzoMzdbAQoJRXb7fc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index b89cc4aa7df87..5537e6a1caca6 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.74.0"; + version = "1.75.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-Ed7bU6QQ/jsqK8mp7ZyaaXlCDJMkPafXh/fM+aJUPjc="; + hash = "sha256-UuDE9gL6rQAK4a/PnZVDdyd+t8lhTMXJ+CspAHbEBbs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index ba25ada573e46..c8af7dfff6913 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.74.0"; + version = "1.75.0"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-iKuesYtqwbSHKt1rOUBzvY1E7ufDLk3GCgIuJf+v+5U="; + hash = "sha256-615AJQNNkto8gf1eNGjDPVrnVxsHpyw4W17BdGZYVz8="; }; outputs = [ diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 7c92d6904ec36..81a5e604af724 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -8,6 +8,7 @@ openssl, pkg-config, protobuf, + typing-extensions, pythonOlder, setuptools, zlib, @@ -18,14 +19,14 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - version = "1.74.0"; + version = "1.75.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gNH0+7NbB0LT49O7ZUtzgc1fAV+ElyeaHpwhumI+AbE="; + hash = "sha256-uYnosJSJR4wtGf7MdEopiTD0DYsnw2OK+/6E0i82zk4="; }; outputs = [ @@ -46,7 +47,10 @@ buildPythonPackage rec { zlib ]; - dependencies = [ protobuf ]; + dependencies = [ + protobuf + typing-extensions + ]; preBuild = '' export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$NIX_BUILD_CORES" diff --git a/pkgs/development/python-modules/gudhi/default.nix b/pkgs/development/python-modules/gudhi/default.nix index 124b2660c5b9a..5b83f1d83ef2b 100644 --- a/pkgs/development/python-modules/gudhi/default.nix +++ b/pkgs/development/python-modules/gudhi/default.nix @@ -9,7 +9,7 @@ gmp, cgal, mpfr, - tbb, + onetbb, numpy, cython, pybind11, @@ -47,7 +47,7 @@ buildPythonPackage rec { cgal mpfr ] - ++ lib.optionals enableTBB [ tbb ]; + ++ lib.optionals enableTBB [ onetbb ]; propagatedBuildInputs = [ numpy scipy diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index eb3682768c0c4..6ba3afe39fde6 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "h2"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; src = fetchFromGitHub { owner = "python-hyper"; repo = "h2"; tag = "v${version}"; - hash = "sha256-rfCwMn2msiRoIvhsdK6hyp3BjDy5AGziX4Or0cb9bKc="; + hash = "sha256-04we2xeh5LtLA4La9WPfXQVczDIz7NpL/6y9TmIELgM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 8ce623caad31e..68dcc85cf483e 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, isPyPy, + fetchpatch, # build-system setuptools, @@ -24,9 +25,10 @@ tifffile, # tests - pytestCheckHook, - gitMinimal, fsspec, + gitMinimal, + pytestCheckHook, + writableTmpDirAsHomeHook, }: let @@ -52,6 +54,19 @@ buildPythonPackage rec { hash = "sha256-/nxJxZrTYX7F2grafIWwx9SyfR47ZXyaUwPHMEOdKkI="; }; + patches = [ + (fetchpatch { + # https://github.com/imageio/imageio/issues/1139 + # https://github.com/imageio/imageio/pull/1144 + name = "fix-pyav-13-1-compat"; + url = "https://github.com/imageio/imageio/commit/eadfc5906f5c2c3731f56a582536dbc763c3a7a9.patch"; + excludes = [ + "setup.py" + ]; + hash = "sha256-ycsW1YXtiO3ZecIF1crYaX6vg/nRW4bF4So5uWCVzME="; + }) + ]; + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace tests/test_core.py \ --replace-fail 'ctypes.util.find_library("GL")' '"${libgl}"' @@ -90,15 +105,16 @@ buildPythonPackage rec { gitMinimal psutil pytestCheckHook + writableTmpDirAsHomeHook ] ++ fsspec.optional-dependencies.github ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlags = [ "--test-images=file://${test_images}" ]; - # These should have had `needs_internet` mark applied but don't so far. - # See https://github.com/imageio/imageio/pull/1142 disabledTests = [ + # These should have had `needs_internet` mark applied but don't so far. + # See https://github.com/imageio/imageio/pull/1142 "test_read_stream" "test_uri_reading" "test_trim_filter" @@ -111,7 +127,6 @@ buildPythonPackage rec { preCheck = '' export IMAGEIO_USERDIR=$(mktemp -d) - export HOME=$(mktemp -d) ''; meta = { diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index a2f8bac3b77a8..bd0bd4544c106 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.4.0"; + version = "9.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wDPG1OeRTD2XaKq+drvoe6HcZqkqBdtr+hEl2B8u4nA="; + hash = "sha256-EpxEuUH+bZuC02/Hp8GBJ92x1vAvePhn9ALi463eMRM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix new file mode 100644 index 0000000000000..2dbf6c1196ce5 --- /dev/null +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -0,0 +1,145 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cmake, + setuptools, + + # dependencies + av, + datasets, + deepdiff, + diffusers, + draccus, + einops, + flask, + gymnasium, + huggingface-hub, + imageio, + jsonlines, + opencv-python-headless, + packaging, + pynput, + pyserial, + rerun-sdk, + termcolor, + torch, + torchvision, + wandb, + + # tests + pytestCheckHook, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "lerobot"; + version = "0.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = "lerobot"; + tag = "v${version}"; + hash = "sha256-JaspLUuSupmk6QD+mUVLuCSczTNjy0w+nsLBcy7tXnE="; + }; + + # ValueError: mutable default for field value is not allowed: use default_factory + postPatch = '' + substituteInPlace tests/processor/test_pipeline.py \ + --replace-fail \ + "from dataclasses import dataclass" \ + "from dataclasses import dataclass, field" \ + --replace-fail \ + "value: PolicyFeature = PolicyFeature(type=FeatureType.STATE, shape=(1,))" \ + "value: PolicyFeature = field(default_factory=lambda: PolicyFeature(type=FeatureType.STATE, shape=(1,)))" + ''; + + build-system = [ + cmake + setuptools + ]; + dontUseCmakeConfigure = true; + + pythonRelaxDeps = [ + "datasets" + "draccus" + "gymnasium" + "rerun-sdk" + "torch" + "torchvision" + ]; + + dependencies = [ + av + datasets + deepdiff + diffusers + draccus + einops + flask + gymnasium + huggingface-hub + imageio + jsonlines + opencv-python-headless + packaging + pynput + pyserial + rerun-sdk + termcolor + torch + torchvision + wandb + ]; + + pythonImportsCheck = [ "lerobot" ]; + + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # RuntimeError: OpenCVCamera(/build/source/tests/artifacts/cameras/image_480x270.png) read failed + "test_async_read" + "test_read" + "test_rotation" + + # Require internet access + "test_act_backbone_lr" + "test_backward_compatibility" + "test_dataset_initialization" + "test_factory" + "test_policy_defaults" + "test_save_and_load_pretrained" + + # TypeError: stack(): argument 'tensors' (position 1) must be tuple of Tensors, not Column + "test_check_timestamps_sync_slightly_off" + "test_check_timestamps_sync_synced" + "test_check_timestamps_sync_unsynced" + "test_check_timestamps_sync_unsynced_no_exception" + "test_compute_sampler_weights_drop_n_last_frames" + "test_compute_sampler_weights_nontrivial_ratio" + "test_compute_sampler_weights_nontrivial_ratio_and_drop_last_n" + "test_compute_sampler_weights_trivial" + "test_record_and_replay" + "test_record_and_resume" + "test_same_attributes_defined" + + # AssertionError between two dicts. One has an extra `'_is_initial': False` entry. + "test_cosine_decay_with_warmup_scheduler" + "test_diffuser_scheduler" + "test_vqbet_scheduler" + ]; + + meta = { + description = "Making AI for Robotics more accessible with end-to-end learning"; + homepage = "https://github.com/huggingface/lerobot"; + changelog = "https://github.com/huggingface/lerobot/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 75a505db15874..c89cdb8daba8e 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "libcst"; - version = "1.8.2"; + version = "1.8.4"; pyproject = true; src = fetchFromGitHub { owner = "Instagram"; repo = "LibCST"; tag = "v${version}"; - hash = "sha256-DsbigWFFYmucOa3uHdvMFd4nbgwKLzRVdI6SjUUdFWU="; + hash = "sha256-OSLaEIfFM/uU3GkcVpvbeesqzr+qXa/BgkDEan7Ybkg="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -39,7 +39,7 @@ buildPythonPackage rec { src cargoRoot ; - hash = "sha256-dwqs9hXedX1jJJANyZ8nMivZBrLcMAi5NMJscW3oSdQ="; + hash = "sha256-F/TaKZpynaCwXU0YvvuTEh5/pvMOpKur7wMSE7dtgNo="; }; cargoRoot = "native"; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index de73a2010d1cf..fee77d75aa2e8 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "lxml"; - version = "6.0.0"; + version = "6.0.1"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml"; tag = "lxml-${version}"; - hash = "sha256-e1Lhtn8cjuDWkBV29icIqe0CJ59Ab05hBGMa+eRBzAw="; + hash = "sha256-iY47nhAbA8ScnjmK2/7lVCBP8f65v1zOs3TcgQULlQ0="; }; build-system = [ diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix index 7c0c181914a1f..7aa05fc2d6bf9 100644 --- a/pkgs/development/python-modules/manifold3d/default.nix +++ b/pkgs/development/python-modules/manifold3d/default.nix @@ -11,7 +11,7 @@ pkg-config, numpy, clipper2, - tbb, + onetbb, pytestCheckHook, trimesh, }: @@ -36,7 +36,7 @@ buildPythonPackage { ]; buildInputs = [ - tbb + onetbb clipper2 ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 39f3dda5f21ec..18711d9c4dd7e 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -1,10 +1,7 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - fetchpatch, - importlib-metadata, pyyaml, setuptools, unittestCheckHook, @@ -12,29 +9,18 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.8.2"; + version = "3.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Python-Markdown"; repo = "markdown"; tag = version; - hash = "sha256-L5OTjllMUrpsKZbK+EHcqlua/6I4onJvRC3povbHgfY="; + hash = "sha256-wrDS7ajP031YKejD9Y83xg5bMl8ihBMSVZGov+1Y7Kg="; }; - patches = [ - (fetchpatch { - url = "https://github.com/Python-Markdown/markdown/commit/23c301de28e12426408656efdfa153b11d4ff558.patch"; - hash = "sha256-85HP97iL1umG60jwUgfnHvKHYmws5FSL0xfgZF95aiQ="; - }) - ]; - build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - nativeCheckInputs = [ unittestCheckHook pyyaml diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 02a0c37d91484..a1e6e5940b55f 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "mistune"; - version = "3.1.3"; + version = "3.1.4"; pyproject = true; src = fetchFromGitHub { owner = "lepture"; repo = "mistune"; tag = "v${version}"; - hash = "sha256-aD+c41nuSmLUoYzK8adP0eLYRU0FihHEqG4e0b0GZ9k="; + hash = "sha256-mCqOcLrgLtUL1le82Y+QVqqXGq+n0ZY76hqtyJsCKhE="; }; dependencies = lib.optionals (pythonOlder "3.11") [ diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 1f4977a40671d..1816bc34f7ed5 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -13,7 +13,7 @@ # buildInputs apple-sdk_14, - fmt_11, + fmt, nanobind, nlohmann_json, pybind11, @@ -96,7 +96,7 @@ let buildInputs = [ apple-sdk_14 - fmt_11 + fmt gguf-tools nanobind nlohmann_json diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index bf54158febbfe..406037dfcfc84 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -26,7 +26,6 @@ pytest-xdist, pytestCheckHook, python-dateutil, - pythonOlder, pyyaml, requests, responses, @@ -37,16 +36,14 @@ buildPythonPackage rec { pname = "moto"; - version = "5.1.9"; + version = "5.1.11"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "getmoto"; repo = "moto"; tag = version; - hash = "sha256-UbCSGpvS8Jvpe8iV1rVplSoGykHSup9pVTd3odbPq6Y="; + hash = "sha256-krZrPzH8/pOGvQTcofT2TzyytDXs9FTpqh9JK0QN44E="; }; build-system = [ diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 61503c3a51d6f..44bc828d36254 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -17,7 +17,11 @@ buildPythonPackage rec { owner = "jcrist"; repo = "msgspec"; tag = version; - hash = "sha256-g2yhw9fMucBHlGx9kAMQL87znXlQT9KbxQ/QcmUetqI="; + # Note that this hash changes after some time after release because they + # use `$Format:%d$` in msgspec/_version.py, and GitHub produces different + # tarballs depending on whether tagged commit is the last commit, see + # https://github.com/NixOS/nixpkgs/issues/84312 + hash = "sha256-CajdPNAkssriY/sie5gR+4k31b3Wd7WzqcsFmrlSoPY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 890201e0db446..e8ada9f849c46 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -88,6 +88,9 @@ buildPythonPackage rec { # https://github.com/python/cpython/commit/8e923f36596370aedfdfb12251447bface41317a # https://github.com/ocrmypdf/OCRmyPDF/blob/9f6e5a48ada5df7006a8c68b84e2aeae61943d8b/src/ocrmypdf/_exec/ghostscript.py#L66 "TestDuplicateFilter" + + "test_masks" + "test_content_preservation" ]; postInstall = '' diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 32937c89d3ed5..0354d1c923a60 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -33,7 +33,7 @@ python, qt6, setuptools, - tbb, + onetbb, withDocs ? false, withOsl ? true, withTools ? false, @@ -126,7 +126,7 @@ buildPythonPackage rec { opencolorio openimageio ptex - tbb + onetbb ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 91abafd91202f..2525586c7f537 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.10.18"; + version = "3.11.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,12 +39,12 @@ buildPythonPackage rec { owner = "ijl"; repo = "orjson"; tag = version; - hash = "sha256-gEShQJrqSFMwc9PreRhbup3yE0RySwJtlgXfhDomiIc="; + hash = "sha256-oTrmDYmUHXMKxgxzBIStw7nnWXcyH9ir0ohnbX4bdjU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-vMuqqUfaYFZ1wC3SZBVF7Wq2OUKd7UkdC8GB93QBq8Y="; + hash = "sha256-y6FmK1RR1DAswVoTlnl19CmoYXAco1dY7lpV/KTypzE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index ae34740c87af0..f1274fa59bf4c 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -5,17 +5,16 @@ distutils, fetchPypi, setuptools, - six, }: buildPythonPackage rec { pname = "pbr"; - version = "6.1.1"; + version = "7.0.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-k+pyzmmJ6y7tmdD3VyFHT2mtiBKK/e9aw3freXxL92s="; + hash = "sha256-PsvLEdK4VRWI7IFrN1ax60OUGGw7aJsX4EhQ38IPflc="; }; build-system = [ setuptools ]; @@ -23,7 +22,6 @@ buildPythonPackage rec { dependencies = [ distutils # for distutils.command in pbr/packaging.py setuptools # for pkg_resources - six ]; # check in passthru.tests.pytest to escape infinite recursion with fixtures diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index c464983fa31a9..99b5c7cc3e187 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -43,12 +43,12 @@ buildPythonPackage { checkPhase = '' stestr run -e <(echo " pbr.tests.test_core.TestCore.test_console_script_develop - pbr.tests.test_core.TestCore.test_console_script_install - pbr.tests.test_wsgi.TestWsgiScripts.test_with_argument - pbr.tests.test_wsgi.TestWsgiScripts.test_wsgi_script_run + pbr.tests.functional.test_console_scripts.TestConsoleScripts.test_console_script_install + pbr.tests.functional.test_wsgi_scripts.TestWsgiScripts.test_with_argument + pbr.tests.functional.test_wsgi_scripts.TestWsgiScripts.test_wsgi_script_run # Tests are failing because of fixture timeouts - pbr.tests.test_packaging.TestPEP517Support.test_pep_517_support - pbr.tests.test_packaging.TestRequirementParsing.test_requirement_parsing + pbr.tests.functional.test_pep517.TestPEP517Support.test_pep_517_support + pbr.tests.functional.test_requirements.TestRequirementParsing.test_requirement_parsing ") ''; } diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index dff804cbb7826..6f92156c4ae9f 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.8.1"; + version = "9.11.0"; pyproject = true; src = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-gFaGHml1F5i+w68xapmPHYUK760rT4GJzTWTkDsIwC8="; + hash = "sha256-mdH7bFfUzjSOOIhRK4GpizohFB82s8v9N2yEX2X/dms="; }; patches = [ diff --git a/pkgs/development/python-modules/pikepdf/paths.patch b/pkgs/development/python-modules/pikepdf/paths.patch index 83cebed5cc234..4392b7799cf2a 100644 --- a/pkgs/development/python-modules/pikepdf/paths.patch +++ b/pkgs/development/python-modules/pikepdf/paths.patch @@ -1,18 +1,18 @@ diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py -index da40043f..4f566f01 100644 +index 62939b47..d4807ef2 100644 --- a/src/pikepdf/_methods.py +++ b/src/pikepdf/_methods.py -@@ -74,7 +74,7 @@ def _mudraw(buffer, fmt) -> bytes: - tmp_in.flush() +@@ -69,7 +69,7 @@ def _single_page_pdf(page: Page) -> bytes: - proc = run( -- ['mutool', 'draw', '-F', fmt, '-o', '-', tmp_in.name], -+ ['@mutool@', 'draw', '-F', fmt, '-o', '-', tmp_in.name], - capture_output=True, - check=True, - ) + def _run_mudraw(in_path: Path, out_pattern: Path) -> Path: + run( +- ['mutool', 'draw', '-o', str(out_pattern), str(in_path)], ++ ['@mutool@', 'draw', '-o', str(out_pattern), str(in_path)], + check=True, + ) + out_path = out_pattern.with_name(out_pattern.name.format(1)) # Replace %d with 1 diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index 901f3b6f..45551820 100644 +index aff8c657..5bcf1b4f 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py @@ -72,7 +72,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): @@ -25,7 +25,7 @@ index 901f3b6f..45551820 100644 "--format", "png", @@ -101,7 +101,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): - def _version(self) -> Version: + def _version(self) -> Version | None: try: proc = self._run( - ['jbig2dec', '--version'], diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 44760b668b177..dd789fdb9727b 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -119,6 +119,7 @@ let }; meta = { + mainProgram = "pip"; description = "PyPA recommended tool for installing Python packages"; license = with lib.licenses; [ mit ]; homepage = "https://pip.pypa.io/"; diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 0d9a5c4ecdee2..c26bd164c72c7 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, build, gitMinimal, pytest-cov-stub, @@ -17,16 +16,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "2.1.3"; + version = "2.2.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-CgaWlqjvBTN7GuerzmO5IiEdXxYH6pmTDj9IsNJlCBE="; + hash = "sha256-WLPG8BiM+927qSC+ly5H2IAE2Htm8+wLEjK2AFnMJ58="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 415d869aa48a7..b88ff4b53babb 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.51"; + version = "3.0.52"; pyproject = true; src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-kxoWLjsn/JDIbxtIux+yxSjCdhR15XycBt4TMRx7VO0="; + hash = "sha256-KM3hkpKcjnMh3oXeHdvnNvE3UUiwLy4X7dhABCsb6FU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix index 500cfc0103482..88b571b65a3b9 100644 --- a/pkgs/development/python-modules/protobuf/6.nix +++ b/pkgs/development/python-modules/protobuf/6.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "6.32.0"; + version = "6.32.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qBQ5BJEnBn/EnsHTbiXG7h0aK3vpMGdfkZJY0DwE59I="; + hash = "sha256-7iRp5KAhR0q5uq/qbNBw5b8nx9KUM1BN3qGk7lhQ9o0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index e4ba0f17a025b..4b49b52abe821 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -2,18 +2,17 @@ stdenv, lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, cmake, ninja, - setuptools, + scikit-build-core, + pybind11, boost, eigen, python, - catch, + catch2, numpy, - pytestCheckHook, - libxcrypt, + pytest, makeSetupHook, }: let @@ -22,86 +21,90 @@ let substitutions = { out = placeholder "out"; pythonInterpreter = python.pythonOnBuildForHost.interpreter; - pythonIncludeDir = "${python}/include/python${python.pythonVersion}"; + pythonIncludeDir = "${python}/include/${python.libPrefix}"; pythonSitePackages = "${python}/${python.sitePackages}"; }; } ./setup-hook.sh; in buildPythonPackage rec { pname = "pybind11"; - version = "2.13.6"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "pybind"; repo = "pybind11"; tag = "v${version}"; - hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU="; + hash = "sha256-ZiwNGsE1FOkhnWv/1ib1akhQ4FZvrXRCDnnBZoPp6r4="; }; build-system = [ cmake ninja - setuptools + pybind11.passthru.scikit-build-core-no-tests + ]; + + buildInputs = [ + # Used only for building tests - something we do even when cross + # compiling. + catch2 + boost + eigen ]; - buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; propagatedNativeBuildInputs = [ setupHook ]; - dontUseCmakeBuildDir = true; + nativeCheckInputs = [ + numpy + pytest + ]; - # Don't build tests if not needed, read the doInstallCheck value at runtime - preConfigure = '' - if [ -n "$doInstallCheck" ]; then - cmakeFlagsArray+=("-DBUILD_TESTING=ON") - fi - ''; + pypaBuildFlags = [ + # Keep the build directory around to run the tests. + "-Cbuild-dir=build" + ]; cmakeFlags = [ - "-DBoost_INCLUDE_DIR=${lib.getDev boost}/include" - "-DEIGEN3_INCLUDE_DIR=${lib.getDev eigen}/include/eigen3" - ] - ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ "-DPYBIND11_CXX_STANDARD=-std=c++17" ]; - - postBuild = '' - # build tests - make -j $NIX_BUILD_CORES - ''; - - postInstall = '' - make install - # Symlink the CMake-installed headers to the location expected by setuptools - mkdir -p $out/include/${python.libPrefix} - ln -sf $out/include/pybind11 $out/include/${python.libPrefix}/pybind11 - ''; + # Always build tests, because even when cross compiling building the tests + # is another confirmation that everything is OK. + (lib.cmakeBool "BUILD_TESTING" true) - nativeCheckInputs = [ - catch - numpy - pytestCheckHook + # Override the `PYBIND11_NOPYTHON = true` in `pyproject.toml`. This + # is required to build the tests. + (lib.cmakeBool "PYBIND11_NOPYTHON" false) ]; - disabledTestPaths = [ - # require dependencies not available in nixpkgs - "tests/test_embed/test_trampoline.py" - "tests/test_embed/test_interpreter.py" - # numpy changed __repr__ output of numpy dtypes - "tests/test_numpy_dtypes.py" - # no need to test internal packaging - "tests/extra_python_package/test_files.py" - # tests that try to parse setuptools stdout - "tests/extra_setuptools/test_setuphelper.py" - ]; + dontUseCmakeConfigure = true; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # expects KeyError, gets RuntimeError - # https://github.com/pybind/pybind11/issues/4243 - "test_cross_module_exception_translator" + ninjaFlags = [ + "-C" + "build" ]; + checkTarget = "check"; + + checkPhase = "ninjaCheckPhase"; + + # Make the headers and CMake/pkg-config files inside the wheel + # discoverable. This simulates the effect of the `pybind11[global]` + # installation but works better for our build. + postInstall = '' + ln -s $out/${python.sitePackages}/pybind11/{include,share} $out/ + ''; + + passthru = { + # scikit-build-core's tests depend upon pybind11, and hence introduce + # infinite recursion. To avoid this, we define here a scikit-build-core + # derivation that doesn't depend on pybind11, and use it for pybind11's + # build-system. + scikit-build-core-no-tests = scikit-build-core.overridePythonAttrs { + doCheck = false; + }; + }; + hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "fortify"; - meta = with lib; { + meta = { homepage = "https://github.com/pybind/pybind11"; changelog = "https://github.com/pybind/pybind11/blob/${src.rev}/docs/changelog.rst"; description = "Seamless operability between C++11 and Python"; @@ -111,8 +114,8 @@ buildPythonPackage rec { C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. ''; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yuriaisaka dotlambda ]; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index d4850147e1ab4..beac9451932a5 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, isPyPy, fetchFromGitHub, + fetchpatch, curl, openssl, bottle, @@ -27,6 +28,14 @@ buildPythonPackage rec { hash = "sha256-M4rO0CaI2SmjdJVS7hWnJZrL72WvayB4aKn707KoNiQ="; }; + patches = [ + # curl 8.16 compatibility + (fetchpatch { + url = "https://github.com/pycurl/pycurl/commit/eb7f52eeef85feb6c117678d52803050bbdd7bc8.patch"; + hash = "sha256-hdwazS7R9duuMd/7S3SNAxVcToo3GhtyWu/1Q6qTMYc="; + }) + ]; + preConfigure = '' substituteInPlace setup.py \ --replace-fail '--static-libs' '--libs' diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 15a7a69ba9478..ed5b711b247bc 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -45,7 +45,7 @@ let in buildPythonPackage rec { pname = "pymupdf"; - version = "1.26.3"; + version = "1.26.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "pymupdf"; repo = "PyMuPDF"; tag = version; - hash = "sha256-djTbALLvdX2jOTGgoyUIBhiqJ6KzM+Dkb4M7d2eVoPM="; + hash = "sha256-bzyScV7vznuBQNP8nTjHL2exIs/rVmJBH+soyuAwIGI="; }; # swig is not wrapped as Python package diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 2354927ec2d7a..2fe17a9825508 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.9.0"; + version = "1.10.0"; pname = "pyperclip"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-t94BQt3IG/xcdQfuoZ2pILkiUrVIuWGGyvlKXiUn0xA="; + hash = "sha256-GAyDRrEYaSHHXf0U2QSKa11Gv8SZd4gRlSxt1uscpr4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 0f2b0dd6012c1..1dc9f25ea63f7 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -11,17 +11,17 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.14.1"; + version = "3.15.0"; pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-mock"; tag = "v${version}"; - hash = "sha256-aOa/MQAgQePX/NivQ6G37r70sZnqBA+y+GXvPVBxmvs="; + hash = "sha256-a9Mu0FfU8rTbMeA1YoM/Kb5R2IUO8FyzQfscBVuBFfo="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 17d42090876cd..81599579f7038 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -76,6 +76,9 @@ buildPythonPackage rec { ''; doCheck = false; + # FIXME(jade): perhaps this should be the default? + # https://github.com/NixOS/nixpkgs/issues/435069 + dontWrapPythonPrograms = true; passthru.tests.pytest = callPackage ./tests.nix { }; # Remove .pytest_cache when using py.test in a Nix build diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix index b1c08a87a0743..49e97e832b5c0 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -1,13 +1,15 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + replaceVars, cmake, numpy, pybind11, setuptools, scipy, pytestCheckHook, + qdldl, }: buildPythonPackage rec { @@ -15,11 +17,20 @@ buildPythonPackage rec { version = "0.1.7.post5"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-CxOZ4cSbW+1arI/WPvCKtwjTQMN/tCb+ABKLwfNrKG4="; + src = fetchFromGitHub { + owner = "osqp"; + repo = "qdldl-python"; + tag = "v${version}"; + hash = "sha256-XHdvYWORHDYy/EIqmlmFQZwv+vK3I+rPIrvcEW1JyIw="; }; + # use up-to-date qdldl for CMake v4 + patches = [ + (replaceVars ./use-qdldl.patch { + inherit qdldl; + }) + ]; + dontUseCmakeConfigure = true; build-system = [ @@ -34,14 +45,18 @@ buildPythonPackage rec { scipy ]; + propagatedBuildInputs = [ + qdldl + ]; + pythonImportsCheck = [ "qdldl" ]; nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { - description = "Free LDL factorization routine"; - homepage = "https://github.com/oxfordcontrol/qdldl"; - downloadPage = "https://github.com/oxfordcontrol/qdldl-python"; - license = licenses.asl20; - maintainers = with maintainers; [ drewrisinger ]; + meta = { + description = "Python interface to the QDLDL"; + homepage = "https://github.com/osqp/qdldl-python"; + changelog = "https://github.com/osqp/qdldl-python/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/qdldl/use-qdldl.patch b/pkgs/development/python-modules/qdldl/use-qdldl.patch new file mode 100644 index 0000000000000..a653ffea56391 --- /dev/null +++ b/pkgs/development/python-modules/qdldl/use-qdldl.patch @@ -0,0 +1,93 @@ +From 0293de5a5bd209386b3c021ee661e85eee1985a9 Mon Sep 17 00:00:00 2001 +From: Guilhem Saurel +Date: Sun, 21 Sep 2025 14:55:32 +0200 +Subject: [PATCH] Use up-to-date qdldl for CMake v4 + +--- + c/CMakeLists.txt | 5 +++-- + c/amd/include/SuiteSparse_config.h | 2 +- + c/amd/include/perm.h | 2 +- + cpp/qdldl.hpp | 2 +- + setup.py | 3 ++- + 5 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt +index 728204d..df15d84 100644 +--- a/c/CMakeLists.txt ++++ b/c/CMakeLists.txt +@@ -12,7 +12,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) + + set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/out) + +-add_subdirectory(qdldl EXCLUDE_FROM_ALL) ++find_package(qdldl REQUIRED CONFIG) + + set( + amd_src +@@ -37,7 +37,8 @@ set( + + + # Add QDLDL+AMD library +-add_library(qdldlamd STATIC ${amd_src} $) ++add_library(qdldlamd STATIC ${amd_src}) ++target_link_libraries(qdldlamd qdldl::qdldl) + target_include_directories(qdldlamd PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/amd/include + ${CMAKE_CURRENT_SOURCE_DIR}/qdldl/include +diff --git a/c/amd/include/SuiteSparse_config.h b/c/amd/include/SuiteSparse_config.h +index ea3cea4..19ac8df 100644 +--- a/c/amd/include/SuiteSparse_config.h ++++ b/c/amd/include/SuiteSparse_config.h +@@ -42,7 +42,7 @@ + extern "C" { + #endif + +-#include "qdldl_types.h" ++#include "qdldl/qdldl_types.h" + #define DLONG + typedef QDLDL_float c_float; + +diff --git a/c/amd/include/perm.h b/c/amd/include/perm.h +index 16c2617..841abe1 100644 +--- a/c/amd/include/perm.h ++++ b/c/amd/include/perm.h +@@ -2,7 +2,7 @@ + extern "C" { + # endif // ifdef __cplusplus + +-#include "qdldl_types.h" ++#include "qdldl/qdldl_types.h" + + /** + * C = A(p,p)= PAP' where A and C are symmetric the upper part stored; +diff --git a/cpp/qdldl.hpp b/cpp/qdldl.hpp +index 83b4970..1a7b5d1 100644 +--- a/cpp/qdldl.hpp ++++ b/cpp/qdldl.hpp +@@ -1,5 +1,5 @@ + // Source code for QDLDL, AMD and permutations +-#include "qdldl/include/qdldl.h" ++#include "qdldl/qdldl.h" + #include "amd/include/amd.h" + #include "amd/include/perm.h" + #include +diff --git a/setup.py b/setup.py +index edb50ed..c0e4c23 100644 +--- a/setup.py ++++ b/setup.py +@@ -97,10 +97,11 @@ class build_ext_qdldl(build_ext): + qdldl = Extension('qdldl', + sources=glob(os.path.join('cpp', '*.cpp')), + include_dirs=[os.path.join('c'), +- os.path.join('c', 'qdldl', 'include'), ++ os.path.join("@qdldl@", "include"), + get_pybind_include(), + get_pybind_include(user=False)], + language='c++', ++ extra_link_args=['-lqdldl'], + extra_compile_args=compile_args + ['-std=c++11'], + extra_objects=[qdldl_lib]) + +-- +2.51.0 + diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index df4590459ed58..4de467cc8a8d6 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -3,21 +3,21 @@ buildPythonPackage, fetchPypi, python, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "regex"; version = "2025.7.34"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-nq2XZSF6/QSoaCLfzU7SdH3+Qm6IfaQTsV/wrCRX4ho="; }; + build-system = [ setuptools ]; + checkPhase = '' ${python.interpreter} -m unittest ''; @@ -26,8 +26,11 @@ buildPythonPackage rec { meta = with lib; { description = "Alternative regular expression module, to replace re"; - homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; - license = licenses.psfl; + homepage = "https://github.com/mrabarnett/mrab-regex"; + license = [ + licenses.asl20 + licenses.cnri-python + ]; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index a56abe5e9b2e4..f2ec75477a1d5 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -18,10 +18,10 @@ buildPythonPackage rec { pname = "requests"; - version = "2.32.4"; + version = "2.32.5"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; __darwinAllowLocalNetworking = true; @@ -29,15 +29,9 @@ buildPythonPackage rec { owner = "psf"; repo = "requests"; tag = "v${version}"; - hash = "sha256-sD9GLCAa3y9L1J+fcd+ZXBtW4jNL40hOesKXORhcjGQ="; + hash = "sha256-cEBalMFoYFaGG8M48k+OEBvzLegzrTNP1NxH2ljP6qg="; }; - patches = [ - # https://github.com/psf/requests/issues/6730 - # https://github.com/psf/requests/pull/6731 - ./ca-load-regression.patch - ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/scikit-build-core/append-cmakeFlags.sh b/pkgs/development/python-modules/scikit-build-core/append-cmakeFlags.sh index 30b05ff99daf5..cdba9eb84d79a 100644 --- a/pkgs/development/python-modules/scikit-build-core/append-cmakeFlags.sh +++ b/pkgs/development/python-modules/scikit-build-core/append-cmakeFlags.sh @@ -1,18 +1,9 @@ scikitBuildFlagsHook() { - OLD_IFS="$IFS" - IFS=';' + concatTo flagsArray cmakeFlags cmakeFlagsArray - local args=() - if [[ -n "$SKBUILD_CMAKE_ARGS" ]]; then - read -ra existing_args <<< "$SKBUILD_CMAKE_ARGS" - args+=("${existing_args[@]}") - fi - args+=($cmakeFlags) - args+=("${cmakeFlagsArray[@]}") - export SKBUILD_CMAKE_ARGS="${args[*]}" - - IFS="$OLD_IFS" - unset OLD_IFS + for arg in "${flagsArray[@]}"; do + appendToVar pypaBuildFlags "-Ccmake.args=$arg" + done } preConfigureHooks+=(scikitBuildFlagsHook) diff --git a/pkgs/development/python-modules/scipp/default.nix b/pkgs/development/python-modules/scipp/default.nix index b58ca86fcaa11..a308e8078d072 100644 --- a/pkgs/development/python-modules/scipp/default.nix +++ b/pkgs/development/python-modules/scipp/default.nix @@ -22,7 +22,7 @@ eigen, gtest, pybind11, - tbb_2022, + onetbb, # tests pytestCheckHook, @@ -75,7 +75,7 @@ buildPythonPackage rec { gtest pybind11 units-llnl.passthru.top-level - tbb_2022 + onetbb ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 398ccd8dd226b..31e38d275587c 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -23,8 +22,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.hostPlatform.isDarwin; - pythonImportsCheck = [ "simplejson" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 5bc964ff493a6..a784a3f7a5425 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.42"; + version = "2.0.43"; pyproject = true; disabled = pythonOlder "3.7"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-e/DkS9CioMLG/qMOf0//DxMFDTep4xEtCVTp/Hn0Wiw="; + hash = "sha256-yZIYcJ6gI1oUsQ/vRd5yz6Tgcl7ARpjxnjZNsfeXinM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index aa6de6c0a2aa5..d9b25ed09bb95 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -187,49 +187,52 @@ let # TODO: Retest after ROCm 6.4 or torch 2.8 "gfx1010" "gfx1012" - - # Strix Halo seems to be broken as well, see - # https://github.com/NixOS/nixpkgs/pull/440359. - "gfx1151" - ] (rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets) + ] rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets else throw "No GPU targets specified" ); + # Use vendored CK as header only dep if rocmPackages' CK doesn't properly support targets + vendorComposableKernel = rocmSupport && !rocmPackages.composable_kernel.anyMfmaTarget; + rocmtoolkit_joined = symlinkJoin { name = "rocm-merged"; - paths = with rocmPackages; [ - rocm-core - clr - rccl - miopen - aotriton - composable_kernel - rocrand - rocblas - rocsparse - hipsparse - rocthrust - rocprim - hipcub - roctracer - rocfft - rocsolver - hipfft - hiprand - hipsolver - hipblas-common - hipblas - hipblaslt - rocminfo - rocm-comgr - rocm-device-libs - rocm-runtime - rocm-smi - clr.icd - hipify - ]; + paths = + with rocmPackages; + [ + rocm-core + clr + rccl + miopen + aotriton + rocrand + rocblas + rocsparse + hipsparse + rocthrust + rocprim + hipcub + roctracer + rocfft + rocsolver + hipfft + hiprand + hipsolver + hipblas-common + hipblas + hipblaslt + rocminfo + rocm-comgr + rocm-device-libs + rocm-runtime + rocm-smi + clr.icd + hipify + ] + ++ lib.optionals (!vendorComposableKernel) [ + composable_kernel + ]; # Fix `setuptools` not being found postBuild = '' @@ -373,8 +376,9 @@ buildPythonPackage rec { # Doesn't pick up the environment variable? substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \ --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}" - - # Use composable kernel as dependency, rather than built-in third-party + '' + # When possible, composable kernel as dependency, rather than built-in third-party + + lib.optionalString (rocmSupport && !vendorComposableKernel) '' substituteInPlace aten/src/ATen/CMakeLists.txt \ --replace-fail "list(APPEND ATen_HIP_INCLUDE \''${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/include)" "" \ --replace-fail "list(APPEND ATen_HIP_INCLUDE \''${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/library/include)" "" @@ -412,7 +416,7 @@ buildPythonPackage rec { export ROCM_PATH=${rocmtoolkit_joined} export ROCM_SOURCE_DIR=${rocmtoolkit_joined} export PYTORCH_ROCM_ARCH="${gpuTargetString}" - export CMAKE_CXX_FLAGS="-I${rocmtoolkit_joined}/include -I${rocmtoolkit_joined}/include/rocblas" + export CMAKE_CXX_FLAGS="-I${rocmtoolkit_joined}/include" python tools/amd_build/build_amd.py ''; diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index e8cdb0ad065a1..35899915eb671 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchPypi, fetchpatch, + fetchpatch2, pythonOlder, asn1crypto, cffi, @@ -35,8 +36,6 @@ buildPythonPackage rec { }; patches = [ - # Fix hardcoded `fapi-config.json` configuration path - ./fapi-config.patch # libtpms (underneath swtpm) bumped the TPM revision # https://github.com/tpm2-software/tpm2-pytss/pull/593 (fetchpatch { @@ -49,6 +48,12 @@ buildPythonPackage rec { url = "https://github.com/tpm2-software/tpm2-pytss/commit/6ab4c74e6fb3da7cd38e97c1f8e92532312f8439.patch"; hash = "sha256-01Qe4qpD2IINc5Z120iVdPitiLBwdr8KNBjLFnGgE7E="; }) + # Properly restore environment variables upon exit from + # FAPIConfig context. Accepted into upstream, not yet released. + (fetchpatch2 { + url = "https://github.com/tpm2-software/tpm2-pytss/commit/afdee627d0639eb05711a2191f2f76e460793da9.patch?full_index=1"; + hash = "sha256-Y6drcBg4gnbSvnCGw69b42Q/QfLI3u56BGRUEkpdB0M="; + }) ] ++ lib.optionals isCross [ # pytss will regenerate files from headers of tpm2-tss. @@ -63,10 +68,6 @@ buildPythonPackage rec { }) ]; - postPatch = '' - sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py - ''; - # Hardening has to be disabled # due to pycparsing handling it poorly. # See https://github.com/NixOS/nixpkgs/issues/252023 @@ -95,6 +96,10 @@ buildPythonPackage rec { swtpm ]; + preCheck = '' + export TSS2_FAPICONF=${tpm2-tss.out}/etc/tpm2-tss/fapi-config-test.json + ''; + pythonImportsCheck = [ "tpm2_pytss" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch b/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch deleted file mode 100644 index f6245ef304674..0000000000000 --- a/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/tpm2_pytss/FAPI.py b/src/tpm2_pytss/FAPI.py -index 916eda6..1afba3f 100644 ---- a/src/tpm2_pytss/FAPI.py -+++ b/src/tpm2_pytss/FAPI.py -@@ -23,6 +23,7 @@ logger = logging.getLogger(__name__) - - FAPI_CONFIG_ENV = "TSS2_FAPICONF" - FAPI_CONFIG_PATHS = [ -+ "@TPM2_TSS@/etc/tpm2-tss/fapi-config.json", - "/etc/tpm2-tss/fapi-config.json", - "/usr/local/etc/tpm2-tss/fapi-config.json", - ] diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 4853f77352184..d28bb529c52cc 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -24,7 +24,6 @@ scipy, pillow, mapbox-earcut, - embreex, }: buildPythonPackage rec { @@ -63,9 +62,7 @@ buildPythonPackage rec { pillow # vhacdx # not packaged mapbox-earcut - ] - ++ lib.optionals embreex.meta.available [ - embreex + # embreex # not packaged ]; }; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index a3f0f97008bcd..0dc38d643bf34 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - stdenv, # build-system setuptools, @@ -59,8 +58,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; - # tests are failing on Darwin - doCheck = !stdenv.hostPlatform.isDarwin; + __darwinAllowLocalNetworking = true; nativeCheckInputs = [ astor diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index 10094f9accee5..a8bb1aab043db 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -62,8 +62,14 @@ buildPythonPackage rec { ]; postPatch = - # Avoid downloading dependencies remove any downloads + # Allow CMake 4 + # Upstream issue: https://github.com/triton-lang/triton/issues/8245 + '' + substituteInPlace pyproject.toml \ + --replace-fail "cmake>=3.20,<4.0" "cmake>=3.20" '' + # Avoid downloading dependencies remove any downloads + + '' substituteInPlace setup.py \ --replace-fail "[get_json_package_info()]" "[]" \ --replace-fail "[get_llvm_package_info()]" "[]" \ diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index d4b5380459de3..7b8d2a1b2289b 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = package; - version = "0.16.0"; + version = "0.17.4"; pyproject = true; src = fetchFromGitHub { owner = "fastapi"; repo = "typer"; tag = version; - hash = "sha256-WB9PIxagTHutfk3J+mNTVK8bC7TMDJquu3GLBQgaras="; + hash = "sha256-gd4GgoRnQVVmwmW5DprmNRxgjFiRRa8HB6xO9U9wHI8="; }; env.TIANGOLO_BUILD_PACKAGE = package; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 5b462a1c37697..5c4743fdbae2c 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -73,7 +73,10 @@ buildPythonPackage rec { tensorflow-probability ]; - tbb = [ tbb ]; + tbb = [ + # Not packaged. + #tbb + ]; all = plot ++ parametric_umap ++ tbb; }; diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix index c32bfe946fec2..d42f7ac4c35ec 100644 --- a/pkgs/development/python-modules/vfblib/default.nix +++ b/pkgs/development/python-modules/vfblib/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "vfblib"; - version = "0.10.2"; + version = "0.10.4"; pyproject = true; src = fetchFromGitHub { owner = "LucasFonts"; repo = "vfbLib"; tag = "v${version}"; - hash = "sha256-lcYk6h2kWFIknCHKkrxdSKab7szvSZhFwmFvkT6VTEo="; + hash = "sha256-fAczRejHDe02iWMWXQzNHLmxRX5ApIPvUzsYnwqrKn8="; }; build-system = [ diff --git a/pkgs/development/rocm-modules/6/amdsmi/default.nix b/pkgs/development/rocm-modules/6/amdsmi/default.nix index 2b4db7be7aa69..6f26889ab01b6 100644 --- a/pkgs/development/rocm-modules/6/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/6/amdsmi/default.nix @@ -15,24 +15,26 @@ let esmi_ib_src = fetchFromGitHub { owner = "amd"; repo = "esmi_ib_library"; - rev = "esmi_pkg_ver-3.0.3"; - hash = "sha256-q0w5c5c+CpXkklmSyfzc+sbkt4cHNxscGJA3AXwvHxQ="; + rev = "esmi_pkg_ver-4.2"; + hash = "sha256-czF9ezkAO0PuDkXh8y639AcOZH+KVcWiXPX74H5W/nw="; }; in stdenv.mkDerivation (finalAttrs: { pname = "amdsmi"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "rocm"; repo = "amdsmi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-hrPqd4ZWqzTG7JRfVwc1SZx6TNS0Q/LFg8yDxrM3mPo="; + hash = "sha256-9O29O4HGkQxFDglAhHKv5KWA7p97RwMGG2x/fkOS2jE="; }; postPatch = '' substituteInPlace goamdsmi_shim/CMakeLists.txt \ --replace-fail "amd_smi)" ${"'"}''${AMD_SMI_TARGET})' \ --replace-fail 'target_link_libraries(''${GOAMDSMI_SHIM_TARGET} -L' '#' + substituteInPlace CMakeLists.txt \ + --replace-fail "if(NOT latest_esmi_tag STREQUAL current_esmi_tag)" "if(OFF)" # Manually unpack esmi_ib_src and add amd_hsmp.h so execute-process git clone doesn't run cp -rf --no-preserve=mode ${esmi_ib_src} ./esmi_ib_library @@ -41,10 +43,10 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - # Fix ld.lld undefined reference: drmGetVersion (fetchpatch { - url = "https://github.com/ROCm/amdsmi/commit/c3864bf6171970d86dc50fd23f06377736823997.patch"; - hash = "sha256-zRG1tBD8sIQCWdKfCbXC/Z/6d6NTrRYvRpddPWdM4j8="; + name = "esmi-to-tag-4.2.patch"; + url = "https://github.com/ROCm/amdsmi/commit/49aa2af045a4bc688e6f3ee0545f12afc45c1efe.patch"; + hash = "sha256-5dH9N4m+2mJIGVEB86SvdK3uAYyGFTfbCBJ8e09iQ3w="; }) ]; diff --git a/pkgs/development/rocm-modules/6/aotriton/default.nix b/pkgs/development/rocm-modules/6/aotriton/default.nix index 26b22e61d8c1f..99d0c1d46bda8 100644 --- a/pkgs/development/rocm-modules/6/aotriton/default.nix +++ b/pkgs/development/rocm-modules/6/aotriton/default.nix @@ -23,17 +23,21 @@ let "gfx90a" "gfx942" "gfx950" + # some gfx1100 kernels fail with error: branch size exceeds simm16 + # but build proceeds and those ops will fallback so it's ok "gfx1100" "gfx1151" "gfx1150" "gfx1201" "gfx1200" ] gpuTargets; - supportedTargets' = lib.concatStringsSep ";" supportedTargets; anySupportedTargets = supportedTargets != [ ]; + # Pick a single arbitrary target to speed up shim build when we can't support our target + supportedTargets' = + if anySupportedTargets then lib.concatStringsSep ";" supportedTargets else "gfx1200"; in stdenv.mkDerivation (finalAttrs: { - pname = "aotriton"; + pname = "aotriton${lib.optionalString (!anySupportedTargets) "-shim"}"; version = "0.10b"; src = fetchFromGitHub { @@ -132,13 +136,16 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "AOTRITON_NOIMAGE_MODE" (!anySupportedTargets)) # Use preinstalled triton from our python's site-packages (lib.cmakeBool "AOTRITON_INHERIT_SYSTEM_SITE_TRITON" true) + # FP32 kernels are optional, turn them off to speed up builds and save space + # Perf sensitive code should be using BF16 or F16 + (lib.cmakeBool "AOTRITON_ENABLE_FP32_INPUTS" false) + # Avoid kernels being skipped if build host is overloaded + (lib.cmakeFeature "AOTRITON_GPU_BUILD_TIMEOUT" "0") # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") - ] - ++ lib.optionals anySupportedTargets [ # Note: build will warn "AMDGPU_TARGETS was not set, and system GPU detection was unsuccsesful." # but this can safely be ignored, aotriton uses a different approach to pass targets (lib.cmakeFeature "AOTRITON_TARGET_ARCH" supportedTargets') diff --git a/pkgs/development/rocm-modules/6/aqlprofile/default.nix b/pkgs/development/rocm-modules/6/aqlprofile/default.nix new file mode 100644 index 0000000000000..e1f492515922c --- /dev/null +++ b/pkgs/development/rocm-modules/6/aqlprofile/default.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + clr, + cmake, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "aqlprofile"; + version = "6.4.3"; + + src = fetchFromGitHub { + # TODO: Will move to rocm-systems repo and have proper tags in 7.x + # pinned to oddly named tag for now + owner = "ROCm"; + repo = "aqlprofile"; + tag = "rocm-42"; + hash = "sha256-avL78ZfB+rJ1TYaejSUzU6i5L9JeMawMwIxaTQINQdE="; + }; + + env.CXXFLAGS = "-DROCP_LD_AQLPROFILE=1"; + + nativeBuildInputs = [ + cmake + clr + ]; + + meta = with lib; { + description = "AQLPROFILE library for AMD HSA runtime API extension support"; + homepage = "https://github.com/ROCm/aqlprofile/"; + license = with licenses; [ mit ]; + teams = [ teams.rocm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix index 11a8cd2447430..15c742fc4b702 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/6/clr/default.nix @@ -47,26 +47,29 @@ let "--set ROCM_PATH $out" ]; amdclang = writeShellScriptBin "amdclang" '' - exec clang "$@" + exec ${hipClang}/bin/clang "$@" ''; amdclangxx = writeShellScriptBin "amdclang++" '' - exec clang++ "$@" + exec ${hipClang}/bin/clang++ "$@" ''; in stdenv.mkDerivation (finalAttrs: { pname = "clr"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" "icd" ]; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "ROCm"; repo = "clr"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-4qjfnn0kto2sNaSumXxHRHFrf3a3RZILOdhVSxkEs1I="; + hash = "sha256-DOAAuC9TN1//v56GXyUMJwQHgOuctC+WsC5agrgL+QM="; }; nativeBuildInputs = [ @@ -99,8 +102,10 @@ stdenv.mkDerivation (finalAttrs: { rocminfo ]; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_POLICY_DEFAULT_CMP0072=NEW" # Prefer newer OpenGL libraries "-DCLR_BUILD_HIP=ON" "-DCLR_BUILD_OCL=ON" @@ -124,33 +129,27 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./cmake-find-x11-libgl.patch - - (fetchpatch { - # Fix handling of old fatbin version https://github.com/ROCm/clr/issues/99 - sha256 = "sha256-CK/QwgWJQEruiG4DqetF9YM0VEWpSiUMxAf1gGdJkuA="; - url = "https://src.fedoraproject.org/rpms/rocclr/raw/rawhide/f/0001-handle-v1-of-compressed-fatbins.patch"; - }) (fetchpatch { - # improve rocclr isa compatibility check - sha256 = "sha256-wUrhpYN68AbEXeFU5f366C6peqHyq25kujJXY/bBJMs="; - url = "https://github.com/GZGavinZhao/clr/commit/22c17a0ac09c6b77866febf366591f669a1ed133.patch"; + # [PATCH] improve rocclr isa compatibility check + sha256 = "sha256-oj1loBEuqzuMihOKoN0wR92Wo25AshN5MpBuTq/9TMw="; + url = "https://github.com/GZGavinZhao/clr/commit/f675b9b46d9f7bb8e003f4f47f616fa86a0b7a5e.patch"; }) (fetchpatch { - # [PATCH] Improve hipamd compat check - sha256 = "sha256-uZQ8rMrWH61CCbxwLqQGggDmXFmYTi6x8OcgYPrZRC8="; - url = "https://github.com/GZGavinZhao/clr/commit/63c6ee630966744d4199fdfb854e98d2da9e1122.patch"; - }) - (fetchpatch { - # [PATCH] SWDEV-504340 - Move cast of cl_mem inside the condition - # Fixes crash due to UB in KernelBlitManager::setArgument - sha256 = "sha256-nL4CZ7EOXqsTVUtYhuu9DLOMpnMeMRUhkhylEQLTg9I="; - url = "https://github.com/ROCm/clr/commit/fa63919a6339ea2a61111981ba2362c97fbdf743.patch"; + # [PATCH] improve hipamd isa compatibility check + sha256 = "sha256-E3ERoVjUVWCiYHuE1GaVY5jMrAVx3B1cAVHM4/HPuaQ="; + url = "https://github.com/GZGavinZhao/clr/commit/aec0fc56ee2d10a2bc269c418fa847da2ee9969a.patch"; }) (fetchpatch { # [PATCH] SWDEV-507104 - Removes alignment requirement for Semaphore class to resolve runtime misaligned memory issues sha256 = "sha256-nStJ22B/CM0fzQTvYjbHDbQt0GlE8DXxVK+UDU9BAx4="; url = "https://github.com/ROCm/clr/commit/21d764518363d74187deaef2e66c1a127bc5aa64.patch"; }) + (fetchpatch { + # CMake 4 compat + # [PATCH] SWDEV-509213 - make cmake_minimum_required consistent across clr + url = "https://github.com/ROCm/clr/commit/fcaefe97b862afe12aaac0147f1004e6dc595fce.patch"; + hash = "sha256-hRZXbASbIOOETe+T4mDyyiRWLXd6RDKRieN2ns1w/rs="; + }) ]; postPatch = '' @@ -207,6 +206,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${rocm-core}/.info/ $out/.info ln -s ${hipClang} $out/llvm + ln -s ${hipClang}/bin/{ld.lld,lld,clang-offload-bundler,llvm-objcopy,clang,clang++} $out/bin/ ''; disallowedRequisites = [ @@ -217,28 +217,33 @@ stdenv.mkDerivation (finalAttrs: { # All known and valid general GPU targets # We cannot use this for each ROCm library, as each defines their own supported targets # See: https://github.com/ROCm/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix - # Generic targets are not yet available in rocm-6.3.1 llvm gpuTargets = lib.forEach [ - # "9-generic" + # "9-generic" # can handle all Vega variants "900" # MI25, Vega 56/64 - "906" # MI50/60, Radeon VII - "908" # MI100 - "90a" # MI210 / MI250 - # "9-4-generic" + # "902" # Vega 8 + # "909" # Renoir Vega APU + # "90c" # Renoir Vega APU + # Past this point cards need their own kernels for perf despite gfx9-generic compat + "906" # MI50/60, Radeon VII - adds dot product & mixed precision FMA ops + "908" # MI100 - adds MFMA (matrix fused multiply-add) ops + "90a" # MI210/MI250 - additional MFMA variants + # "9-4-generic" - since only 942 is valid for 6.4 target it directly # 940/1 - never released publicly, maybe HPE cray specific MI3xx? - "942" # MI300 - # "10-1-generic" + "942" # MI300A/X, MI325X + # "950" # MI350X TODO: Expected in ROCm 7.x + # "10-1-generic" # fine for all RDNA1 cards "1010" - "1012" # "10-3-generic" "1030" # W6800, various Radeon cards - # "11-generic" + # "11-generic" # will handle 7600, hopefully ryzen AI series iGPUs "1100" "1101" "1102" + # 7.x "1150" "1151" # Strix Halo - "1200" # RX 9070 - "1201" # RX 9070 XT + # "12-generic" + "1200" # RX 9060 + "1201" # RX 9070 + XT ] (target: "gfx${target}"); inherit hipClangPath; diff --git a/pkgs/development/rocm-modules/6/composable_kernel/avoid-extra-host-compile.patch b/pkgs/development/rocm-modules/6/composable_kernel/avoid-extra-host-compile.patch new file mode 100644 index 0000000000000..b1ba9929b64f6 --- /dev/null +++ b/pkgs/development/rocm-modules/6/composable_kernel/avoid-extra-host-compile.patch @@ -0,0 +1,40 @@ +From 6ac72ec84269737626b1f5e43e64729f0922d182 Mon Sep 17 00:00:00 2001 +From: "Ding, Yi" +Date: Wed, 9 Jul 2025 03:12:39 +0000 +Subject: [PATCH] Avoid compile kernel in host pass + +--- + include/ck_tile/host/kernel_launch.hpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/include/ck_tile/host/kernel_launch.hpp b/include/ck_tile/host/kernel_launch.hpp +index 9770e99738..f6ccb6968b 100644 +--- a/include/ck_tile/host/kernel_launch.hpp ++++ b/include/ck_tile/host/kernel_launch.hpp +@@ -4,11 +4,12 @@ + #pragma once + + #include "ck_tile/core/config.hpp" +-#include "ck_tile/host/stream_config.hpp" ++#include "ck_tile/core/utility/ignore.hpp" + #include "ck_tile/host/hip_check_error.hpp" ++#include "ck_tile/host/stream_config.hpp" + #include "ck_tile/host/timer.hpp" +-#include + #include ++#include + + namespace ck_tile { + +@@ -24,7 +25,11 @@ __launch_bounds__(MaxThreadPerBlock, MinBlockPerCu) + #endif + __global__ void kentry(Args... args) + { ++#if defined(__HIP_DEVICE_COMPILE__) + Kernel{}(args...); ++#else ++ (..., (ignore = args, 0)); ++#endif + } + + // diff --git a/pkgs/development/rocm-modules/6/composable_kernel/base.nix b/pkgs/development/rocm-modules/6/composable_kernel/base.nix index 6856b33785761..a4f59c2e1d5f8 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/base.nix @@ -32,6 +32,10 @@ ), }: +# TODO: in 7.x CK is likely to gain support for +# a) miopen kernel only build (MIOPEN_REQ_LIBS_ONLY) +# b) header only build (useful for torch) https://github.com/ROCm/composable_kernel/issues/2030 +# that will likely allow us to get rid of this complicated split part build! stdenv.mkDerivation (finalAttrs: { preBuild = '' echo "This derivation isn't intended to be built directly and only exists to be overridden and built in chunks"; @@ -39,9 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ''; pname = "composable_kernel_base"; - # Picked this version over 6.3 because much easier to get to build - # and it matches the version torch 2.6 wants - version = "6.4.0-unstable-2024-12-20"; + version = "6.4-unstable-2025-05-22"; outputs = [ "out" @@ -56,8 +58,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; repo = "composable_kernel"; - rev = "07339c738396ebeae57374771ded4dcf11bddf1e"; - hash = "sha256-EvEBxlOpQ71BF57VW79WBo/cdxAwTKFXFMiYKyGyyEs="; + # Using a dev snapshot, trying to get MIOpen to work + rev = "bc2551ac3b27edc31f20863e3a873508fb73aad2"; + hash = "sha256-bfmwbgR1ya+zkME3wOyaZX/e+1+ie0sSlugK/kozLsI="; }; nativeBuildInputs = [ @@ -100,7 +103,9 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DBUILD_DEV=OFF" + "-DBUILD_MHA_LIB=ON" "-DROCM_PATH=${clr}" + "-DENABLE_CLANG_CPP_CHECKS=OFF" "-DCMAKE_HIP_COMPILER_ROCM_ROOT=${clr}" # FP8 can build for 908/90a but very slow build @@ -118,6 +123,11 @@ stdenv.mkDerivation (finalAttrs: { "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names ]; + patches = [ + # Significant build performance improvement + ./avoid-extra-host-compile.patch + ]; + # No flags to build selectively it seems... postPatch = # Reduce configure time by preventing thousands of clang-tidy targets being added @@ -128,6 +138,14 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail clang_tidy_check '#clang_tidy_check' substituteInPlace CMakeLists.txt \ --replace-fail "add_subdirectory(profiler)" "" + substituteInPlace cmake/EnableCompilerWarnings.cmake \ + --replace-fail "-Werror" "" + + # Apply equivalent change to https://github.com/ROCm/composable_kernel/pull/2564 + # TODO: Remove after ROCm 7.1 + find include/ck/tensor_operation/ -type f -name "*.hpp" -exec sed -i \ + -e 's/!defined(__HIP_DEVICE_COMPILE__)/false/g' \ + {} + '' # Optionally remove tests + lib.optionalString (!buildTests) '' @@ -152,20 +170,29 @@ stdenv.mkDerivation (finalAttrs: { mv $out/bin/example_* $example/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + passthru = { + inherit gpuTargets; + updateScript = rocmUpdateScript { + name = finalAttrs.pname; + inherit (finalAttrs.src) owner; + inherit (finalAttrs.src) repo; + }; + anyGfx9Target = lib.lists.any (lib.strings.hasPrefix "gfx9") gpuTargets; + anyMfmaTarget = + (lib.lists.intersectLists gpuTargets [ + "gfx908" + "gfx90a" + "gfx942" + "gfx950" + ]) != [ ]; }; - passthru.anyGfx9Target = lib.lists.any (lib.strings.hasPrefix "gfx9") gpuTargets; - meta = with lib; { description = "Performance portable programming model for machine learning tensor operators"; homepage = "https://github.com/ROCm/composable_kernel"; license = with licenses; [ mit ]; teams = [ teams.rocm ]; platforms = platforms.linux; - broken = true; + broken = true; # this base package shouldn't be built directly }; }) diff --git a/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix b/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix index f7068c5479559..c60552c490a25 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix @@ -14,7 +14,7 @@ buildPythonPackage { setuptools setuptools-scm ]; - version = "6.4.0"; + version = "6.4.3"; inherit (composable_kernel) src; pythonImportsCheck = [ "ck4inductor" diff --git a/pkgs/development/rocm-modules/6/composable_kernel/default.nix b/pkgs/development/rocm-modules/6/composable_kernel/default.nix index 0ec02b962cc1e..42c634f0aa942 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/default.nix @@ -17,61 +17,90 @@ let targets = [ "device_mha_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; extraCmakeFlags = [ "-DHIP_CLANG_NUM_PARALLEL_JOBS=2" ]; }; gemm_multiply_multiply = { targets = [ "device_gemm_multiply_multiply_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; extraCmakeFlags = [ "-DHIP_CLANG_NUM_PARALLEL_JOBS=2" ]; + onlyFor = [ + "gfx942" + "gfx950" + ]; }; - grouped_conv = { + gemm_multiply_multiply_wp = { + targets = [ + "device_gemm_multiply_multiply_wp_instance" + ]; + extraCmakeFlags = [ "-DHIP_CLANG_NUM_PARALLEL_JOBS=2" ]; + onlyFor = [ + "gfx942" + "gfx950" + ]; + }; + grouped_conv_bwd = { targets = [ "device_grouped_conv1d_bwd_weight_instance" "device_grouped_conv2d_bwd_data_instance" "device_grouped_conv2d_bwd_weight_instance" + ]; + }; + grouped_conv_fwd = { + targets = [ "device_grouped_conv1d_fwd_instance" "device_grouped_conv2d_fwd_instance" + "device_grouped_conv2d_fwd_bias_relu_instance" "device_grouped_conv2d_fwd_dynamic_op_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; }; - grouped_conv_bwd_3d = { + grouped_conv_bwd_3d1 = { targets = [ "device_grouped_conv3d_bwd_data_instance" "device_grouped_conv3d_bwd_data_bilinear_instance" "device_grouped_conv3d_bwd_data_scale_instance" + ]; + }; + grouped_conv_bwd_3d2 = { + targets = [ "device_grouped_conv3d_bwd_weight_instance" "device_grouped_conv3d_bwd_weight_bilinear_instance" "device_grouped_conv3d_bwd_weight_scale_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; }; - grouped_conv_fwd_3d = { + grouped_conv_fwd_3d1 = { targets = [ "device_grouped_conv3d_fwd_instance" + "device_grouped_conv3d_fwd_bias_relu_instance" "device_grouped_conv3d_fwd_bilinear_instance" "device_grouped_conv3d_fwd_convinvscale_instance" "device_grouped_conv3d_fwd_convscale_instance" "device_grouped_conv3d_fwd_convscale_add_instance" + ]; + }; + grouped_conv_fwd_3d2 = { + targets = [ "device_grouped_conv3d_fwd_convscale_relu_instance" "device_grouped_conv3d_fwd_dynamic_op_instance" "device_grouped_conv3d_fwd_scale_instance" "device_grouped_conv3d_fwd_scaleadd_ab_instance" "device_grouped_conv3d_fwd_scaleadd_scaleadd_relu_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; }; - batched_gemm = { + batched_gemm1 = { targets = [ "device_batched_gemm_instance" + "device_batched_gemm_b_scale_instance" + "device_batched_gemm_multi_d_instance" "device_batched_gemm_add_relu_gemm_add_instance" "device_batched_gemm_bias_permute_instance" "device_batched_gemm_gemm_instance" "device_batched_gemm_reduce_instance" "device_batched_gemm_softmax_gemm_instance" + ]; + }; + batched_gemm2 = { + targets = [ "device_batched_gemm_softmax_gemm_permute_instance" "device_grouped_gemm_instance" "device_grouped_gemm_bias_instance" @@ -80,27 +109,33 @@ let "device_grouped_gemm_fixed_nk_multi_abd_instance" "device_grouped_gemm_tile_loop_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; }; - gemm_universal = { + gemm_universal1 = { targets = [ "device_gemm_universal_instance" "device_gemm_universal_batched_instance" + ]; + }; + gemm_universal2 = { + targets = [ "device_gemm_universal_reduce_instance" "device_gemm_universal_streamk_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; - extraCmakeFlags = [ "-DHIP_CLANG_NUM_PARALLEL_JOBS=2" ]; }; - gemm_other = { + gemm_other1 = { targets = [ "device_gemm_instance" + "device_gemm_b_scale_instance" "device_gemm_ab_scale_instance" "device_gemm_add_instance" "device_gemm_add_add_fastgelu_instance" "device_gemm_add_fastgelu_instance" "device_gemm_add_multiply_instance" "device_gemm_add_relu_instance" + ]; + }; + gemm_other2 = { + targets = [ "device_gemm_add_relu_add_layernorm_instance" "device_gemm_add_silu_instance" "device_gemm_bias_add_reduce_instance" @@ -112,7 +147,6 @@ let "device_gemm_splitk_instance" "device_gemm_streamk_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; }; conv = { targets = [ @@ -123,7 +157,6 @@ let "device_conv2d_fwd_bias_relu_add_instance" "device_conv3d_bwd_data_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; }; pool = { targets = [ @@ -141,11 +174,7 @@ let "device_contraction_scale_instance" "device_elementwise_instance" "device_elementwise_normalization_instance" - "device_normalization_bwd_data_instance" - "device_normalization_bwd_gamma_beta_instance" - "device_normalization_fwd_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; }; other2 = { targets = [ @@ -154,10 +183,16 @@ let "device_permute_scale_instance" "device_quantization_instance" "device_reduce_instance" + ]; + }; + other3 = { + targets = [ + "device_normalization_bwd_data_instance" + "device_normalization_bwd_gamma_beta_instance" + "device_normalization_fwd_instance" "device_softmax_instance" "device_transpose_instance" ]; - requiredSystemFeatures = [ "big-parallel" ]; }; }; tensorOpBuilder = @@ -165,51 +200,59 @@ let part, targets, extraCmakeFlags ? [ ], - requiredSystemFeatures ? [ ], + requiredSystemFeatures ? [ "big-parallel" ], + onlyFor ? [ ], }: - composable_kernel_base.overrideAttrs (old: { - inherit requiredSystemFeatures; - pname = "composable_kernel${clr.gpuArchSuffix}-${part}"; - makeTargets = targets; - preBuild = '' - echo "Building ${part}" - makeFlagsArray+=($makeTargets) - substituteInPlace Makefile \ - --replace-fail '.NOTPARALLEL:' "" - ''; + let + supported = + onlyFor == [ ] || (lib.lists.intersectLists composable_kernel_base.gpuTargets onlyFor) != [ ]; + in + if supported then + (composable_kernel_base.overrideAttrs (old: { + inherit requiredSystemFeatures; + pname = "composable_kernel${clr.gpuArchSuffix}-${part}"; + makeTargets = targets; + preBuild = '' + echo "Building ${part}" + makeFlagsArray+=($makeTargets) + substituteInPlace $(find ./ -name "Makefile" -type f) \ + --replace-fail '.NOTPARALLEL:' '.UNUSED_NOTPARALLEL:' + ''; - # Compile parallelism adjusted based on available RAM - # Never uses less than NIX_BUILD_CORES/4, never uses more than NIX_BUILD_CORES - # CK uses an unusually high amount of memory per core in the build step - # Nix/nixpkgs doesn't really have any infra to tell it that this build is unusually memory hungry - # So, bodge. Otherwise you end up having to build all of ROCm with a low core limit when - # it's only this package that has trouble. - preConfigure = old.preConfigure or "" + '' - MEM_GB_TOTAL=$(awk '/MemTotal/ { printf "%d \n", $2/1024/1024 }' /proc/meminfo) - MEM_GB_AVAILABLE=$(awk '/MemAvailable/ { printf "%d \n", $2/1024/1024 }' /proc/meminfo) - APPX_GB=$((MEM_GB_AVAILABLE > MEM_GB_TOTAL ? MEM_GB_TOTAL : MEM_GB_AVAILABLE)) - MAX_CORES=$((1 + APPX_GB/3)) - MAX_CORES=$((MAX_CORES < NIX_BUILD_CORES/3 ? NIX_BUILD_CORES/3 : MAX_CORES)) - export NIX_BUILD_CORES="$((NIX_BUILD_CORES > MAX_CORES ? MAX_CORES : NIX_BUILD_CORES))" - echo "Picked new core limit NIX_BUILD_CORES=$NIX_BUILD_CORES based on available mem: $APPX_GB GB" - cmakeFlagsArray+=( - "-DCK_PARALLEL_COMPILE_JOBS=$NIX_BUILD_CORES" - ) - ''; - cmakeFlags = old.cmakeFlags ++ extraCmakeFlags; - # Early exit after build phase with success, skips fixups etc - # Will get copied back into /build of the final CK - postBuild = '' - find . -name "*.o" -type f | while read -r file; do - mkdir -p "$out/$(dirname "$file")" - cp --reflink=auto "$file" "$out/$file" - done - exit 0 - ''; - meta = old.meta // { - broken = false; - }; - }); + # Compile parallelism adjusted based on available RAM + # Never uses less than NIX_BUILD_CORES/4, never uses more than NIX_BUILD_CORES + # CK uses an unusually high amount of memory per core in the build step + # Nix/nixpkgs doesn't really have any infra to tell it that this build is unusually memory hungry + # So, bodge. Otherwise you end up having to build all of ROCm with a low core limit when + # it's only this package that has trouble. + preConfigure = old.preConfigure or "" + '' + MEM_GB_TOTAL=$(awk '/MemTotal/ { printf "%d \n", $2/1024/1024 }' /proc/meminfo) + MEM_GB_AVAILABLE=$(awk '/MemAvailable/ { printf "%d \n", $2/1024/1024 }' /proc/meminfo) + APPX_GB=$((MEM_GB_AVAILABLE > MEM_GB_TOTAL ? MEM_GB_TOTAL : MEM_GB_AVAILABLE)) + MAX_CORES=$((1 + APPX_GB/3)) + MAX_CORES=$((MAX_CORES < NIX_BUILD_CORES/3 ? NIX_BUILD_CORES/3 : MAX_CORES)) + export NIX_BUILD_CORES="$((NIX_BUILD_CORES > MAX_CORES ? MAX_CORES : NIX_BUILD_CORES))" + echo "Picked new core limit NIX_BUILD_CORES=$NIX_BUILD_CORES based on available mem: $APPX_GB GB" + cmakeFlagsArray+=( + "-DCK_PARALLEL_COMPILE_JOBS=$NIX_BUILD_CORES" + ) + ''; + cmakeFlags = old.cmakeFlags ++ extraCmakeFlags; + # Early exit after build phase with success, skips fixups etc + # Will get copied back into /build of the final CK + postBuild = '' + find . -name "*.o" -type f | while read -r file; do + mkdir -p "$out/$(dirname "$file")" + cp --reflink=auto "$file" "$out/$file" + done + exit 0 + ''; + meta = old.meta // { + broken = false; + }; + })) + else + null; composable_kernel_parts = builtins.mapAttrs ( part: targets: tensorOpBuilder (targets // { inherit part; }) ) parts; @@ -218,8 +261,8 @@ in composable_kernel_base.overrideAttrs ( finalAttrs: old: { pname = "composable_kernel${clr.gpuArchSuffix}"; - parts_dirs = builtins.attrValues composable_kernel_parts; - disallowedReferences = builtins.attrValues composable_kernel_parts; + parts_dirs = builtins.filter (x: x != null) (builtins.attrValues composable_kernel_parts); + disallowedReferences = builtins.filter (x: x != null) (builtins.attrValues composable_kernel_parts); preBuild = '' for dir in $parts_dirs; do find "$dir" -type f -name "*.o" | while read -r file; do @@ -240,7 +283,7 @@ composable_kernel_base.overrideAttrs ( parts = composable_kernel_parts; }; meta = old.meta // { - # Builds which don't don't target any gfx9 cause cmake errors in dependent projects + # Builds without any gfx9 fail broken = !finalAttrs.passthru.anyGfx9Target; }; } diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 043bf9f8dd181..6446a862f34d8 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -6,15 +6,12 @@ recurseIntoAttrs, symlinkJoin, fetchFromGitHub, - ffmpeg_4, boost179, opencv, libjpeg_turbo, python3Packages, - triton-llvm, openmpi, stdenv, - rocmGpuArches ? [ ], }: let @@ -22,14 +19,16 @@ let self: let inherit (self) llvm; + origStdenv = stdenv; pyPackages = python3Packages; openmpi-orig = openmpi; + rocmClangStdenv = llvm.rocmClangStdenv; in { - inherit rocmGpuArches; + inherit rocmClangStdenv; + stdenv = rocmClangStdenv; buildTests = false; buildBenchmarks = false; - stdenv = llvm.rocmClangStdenv; rocmPath = self.callPackage ./rocm-path { }; rocmUpdateScript = self.callPackage ./update.nix { }; @@ -37,38 +36,43 @@ let ## ROCm ## llvm = recurseIntoAttrs ( callPackage ./llvm/default.nix { - inherit (self) rocm-device-libs rocm-runtime; + # rocm-device-libs is used for .src only + # otherwise would cause infinite recursion + inherit (self) rocm-device-libs; } ); inherit (self.llvm) rocm-merged-llvm clang openmp; - rocm-core = self.callPackage ./rocm-core { }; - amdsmi = pyPackages.callPackage ./amdsmi { - inherit (self) rocmUpdateScript; - }; + rocm-core = self.callPackage ./rocm-core { stdenv = origStdenv; }; - rocm-cmake = self.callPackage ./rocm-cmake { }; - - rocm-smi = pyPackages.callPackage ./rocm-smi { - inherit (self) rocmUpdateScript; - }; + rocm-cmake = self.callPackage ./rocm-cmake { stdenv = origStdenv; }; rocm-device-libs = self.callPackage ./rocm-device-libs { + stdenv = origStdenv; inherit (llvm) rocm-merged-llvm; }; rocm-runtime = self.callPackage ./rocm-runtime { + stdenv = origStdenv; inherit (llvm) rocm-merged-llvm; }; rocm-comgr = self.callPackage ./rocm-comgr { + stdenv = origStdenv; inherit (llvm) rocm-merged-llvm; }; - rocminfo = self.callPackage ./rocminfo { }; + rocminfo = self.callPackage ./rocminfo { stdenv = origStdenv; }; - # Unfree - hsa-amd-aqlprofile-bin = self.callPackage ./hsa-amd-aqlprofile-bin { }; + amdsmi = pyPackages.callPackage ./amdsmi { + inherit (self) rocmUpdateScript; + }; + + rocm-smi = pyPackages.callPackage ./rocm-smi { + inherit (self) rocmUpdateScript; + }; + + aqlprofile = self.callPackage ./aqlprofile { }; rdc = self.callPackage ./rdc { }; @@ -76,17 +80,18 @@ let hip-common = self.callPackage ./hip-common { }; - # Eventually will be in the LLVM repo hipcc = self.callPackage ./hipcc { + stdenv = origStdenv; inherit (llvm) rocm-merged-llvm; }; # Replaces hip, opencl-runtime, and rocclr clr = self.callPackage ./clr { }; - aotriton = self.callPackage ./aotriton { inherit stdenv; }; + aotriton = self.callPackage ./aotriton { stdenv = origStdenv; }; hipify = self.callPackage ./hipify { + stdenv = origStdenv; inherit (llvm) clang rocm-merged-llvm @@ -103,7 +108,6 @@ let inherit (llvm) clang; }; - # Needs GCC roctracer = self.callPackage ./roctracer { }; rocgdb = self.callPackage ./rocgdb { }; @@ -128,13 +132,6 @@ let rccl = self.callPackage ./rccl { }; - # RCCL with sanitizers and tests - # Can't have with sanitizer build as dep of other packages without - # runtime crashes due to ASAN not loading first - rccl-tests = self.callPackage ./rccl { - buildTests = true; - }; - hipcub = self.callPackage ./hipcub { }; hipsparse = self.callPackage ./hipsparse { }; @@ -194,7 +191,7 @@ let miopen-hip = self.miopen; - migraphx = self.callPackage ./migraphx { }; + migraphx = self.callPackage ./migraphx { stdenv = origStdenv; }; rpp = self.callPackage ./rpp { }; @@ -214,10 +211,8 @@ let }; mivisionx = self.callPackage ./mivisionx { + stdenv = origStdenv; opencv = opencv.override { enablePython = true; }; - # TODO: Remove this pin in ROCm 6.4+ - # FFMPEG support was improved in https://github.com/ROCm/MIVisionX/pull/1460 - ffmpeg = ffmpeg_4; # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice # See: https://github.com/ROCm/MIVisionX/issues/1051 libjpeg_turbo = libjpeg_turbo.overrideAttrs { @@ -275,7 +270,7 @@ let rocm-developer-tools = symlinkJoin { name = "rocm-developer-tools-meta"; paths = [ - hsa-amd-aqlprofile-bin + aqlprofile rocm-core rocr-debug-agent roctracer @@ -298,7 +293,6 @@ let name = "rocm-ml-libraries-meta"; paths = [ llvm.clang - llvm.mlir llvm.openmp rocm-core miopen-hip @@ -357,7 +351,6 @@ let paths = [ rocm-core llvm.clang - llvm.mlir llvm.openmp # openmp-extras-devel (https://github.com/ROCm/aomp) rocm-language-runtime ]; @@ -389,7 +382,6 @@ let hipify rocm-cmake llvm.clang - llvm.mlir llvm.openmp rocm-runtime rocm-hip-runtime @@ -440,6 +432,10 @@ let }; } // lib.optionalAttrs config.allowAliases { + hsa-amd-aqlprofile-bin = lib.warn '' + 'hsa-amd-aqlprofile-bin' has been replaced by 'aqlprofile'. + '' self.aqlprofile; # Added 2025-08-27 + triton = throw '' 'rocmPackages.triton' has been removed. Please use python3Packages.triton ''; # Added 2025-08-24 diff --git a/pkgs/development/rocm-modules/6/half/default.nix b/pkgs/development/rocm-modules/6/half/default.nix index 953152b37e0ff..429439591ffd1 100644 --- a/pkgs/development/rocm-modules/6/half/default.nix +++ b/pkgs/development/rocm-modules/6/half/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "half"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/6/hip-common/default.nix b/pkgs/development/rocm-modules/6/hip-common/default.nix index a169c97cae549..1c967cf065b8e 100644 --- a/pkgs/development/rocm-modules/6/hip-common/default.nix +++ b/pkgs/development/rocm-modules/6/hip-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-eKDbuG57KCg/nZpy+RcDsjyw0pP68qO9K/3ZpSPuMNw="; + hash = "sha256-B4Gc119iff3ak9tmpz3rUJBtCk5T1AA8z67K9PshTLQ="; }; dontConfigure = true; diff --git a/pkgs/development/rocm-modules/6/hipblas-common/default.nix b/pkgs/development/rocm-modules/6/hipblas-common/default.nix index 626c36833d636..8763e916c034e 100644 --- a/pkgs/development/rocm-modules/6/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/6/hipblas-common/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hipblas-common"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipBLAS-common"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-tvNz4ymQ1y3YSUQxAtNu2who79QzSKR+3JEevr+GDWo="; + hash = "sha256-eTwoAXH2HGdSAOLTZHJUFHF+c2wWHixqeMqr60KxJrc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipblas/default.nix b/pkgs/development/rocm-modules/6/hipblas/default.nix index ca236f1b85ffc..0622f6f0b2637 100644 --- a/pkgs/development/rocm-modules/6/hipblas/default.nix +++ b/pkgs/development/rocm-modules/6/hipblas/default.nix @@ -18,12 +18,14 @@ buildTests ? false, buildBenchmarks ? false, buildSamples ? false, + # for passthru.tests + hipblas, }: # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -42,15 +44,16 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Rz1KAhBUbvErHTF2PM1AkVhqo4OHldfSNMSpp5Tx9yk="; + hash = "sha256-lQv8Ik6+0ldqyeJ05CSGB0309nIpzlRL3CRYeQxVfd0="; }; patches = [ - # https://github.com/ROCm/hipBLAS/pull/952 (fetchpatch { - name = "transitively-depend-hipblas-common.patch"; - url = "https://github.com/ROCm/hipBLAS/commit/54220fdaebf0fb4fd0921ee9e418ace5b143ec8f.patch"; - hash = "sha256-MFEhv8Bkrd2zD0FFIDg9oJzO7ztdyMAF+R9oYA0rmwQ="; + # Subject: [PATCH] Add gfx1150, gfx1150, gfx1200, gfx1201 support (#1055) + # This was merged to release/rocm-rel-6.4 but AMD forgot to tag it for 6.4.3 + name = "release-6.4-arch-extra.patch"; + url = "https://github.com/ROCm/hipBLAS/commit/0100b32ccff9a0f12134694315b4e44884e25a8e.patch"; + hash = "sha256-BmktlLJpYaTcogHzEKpZdCnksIIysEO47WMezXoxvCs="; }) ]; @@ -82,15 +85,13 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_CXX_COMPILER=${lib.getExe' clr "hipcc"}" - # Upstream is migrating to amdclang++, it is likely this will be correct in next version bump - #"-DCMAKE_CXX_COMPILER=${lib.getBin clr}/bin/amdclang++" + "-DCMAKE_CXX_COMPILER=${lib.getExe' clr "amdclang++"}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DBUILD_WITH_SOLVER=ON" "-DAMDGPU_TARGETS=${rocblas.amdgpu_targets}" ] ++ lib.optionals buildTests [ @@ -125,6 +126,11 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs.src) owner; inherit (finalAttrs.src) repo; }; + passthru.tests.hipblas-tested = hipblas.override { + buildTests = true; + buildBenchmarks = true; + buildSamples = true; + }; meta = with lib; { description = "ROCm BLAS marshalling library"; diff --git a/pkgs/development/rocm-modules/6/hipblaslt/default.nix b/pkgs/development/rocm-modules/6/hipblaslt/default.nix index cbcca61af76f6..47bfd00909fc9 100644 --- a/pkgs/development/rocm-modules/6/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/6/hipblaslt/default.nix @@ -1,232 +1,229 @@ { lib, stdenv, - fetchpatch, fetchFromGitHub, + writableTmpDirAsHomeHook, cmake, rocm-cmake, + rocm-smi, + pkg-config, clr, gfortran, gtest, - msgpack, + boost, + msgpack-cxx, + amd-blis, libxml2, python3, python3Packages, openmp, hipblas-common, - tensile, lapack-reference, ncurses, + ninja, libffi, zlib, zstd, rocmUpdateScript, buildTests ? false, - buildBenchmarks ? false, buildSamples ? false, # hipblaslt supports only devices with MFMA or WMMA - # WMMA on gfx1100 may be broken - # MFMA on MI100 may be broken - # MI200/MI300 known to work - gpuTargets ? ( - clr.localGpuTargets or [ - # "gfx908" FIXME: confirm MFMA on MI100 works + gpuTargets ? (clr.localGpuTargets or clr.gpuTargets), +}: + +let + # hipblaslt is extremely particular about what it will build with + # so intersect with a known supported list and use only those + supportedTargets = ( + lib.lists.intersectLists gpuTargets [ + "gfx908" "gfx90a" "gfx942" - # "gfx1100" FIXME: confirm WMMA targets work + "gfx950" + "gfx1100" + "gfx1101" + # 7.x "gfx1150" + "gfx1151" + "gfx1200" + "gfx1201" ] - ), -}: + ); + supportsTargetArches = supportedTargets != [ ]; + py = python3.withPackages (ps: [ + ps.pyyaml + ps.setuptools + ps.packaging + ps.nanobind + ps.joblib + ps.msgpack + ]); + # workaround: build for one working target if no targets are supported + # a few CXX files are still build for the device + gpuTargets' = + if supportsTargetArches then (lib.concatStringsSep ";" supportedTargets) else "gfx1200"; + compiler = "amdclang++"; + # no-switch due to spammy warnings on some cases with fixme messages + # FIXME(LunNova@): cmake files need patched to include this properly or + # maybe we improve the toolchain to use config files + assemble a sysroot + # so system wide include assumptions work + cFlags = "-Wno-switch -fopenmp -I${lib.getDev zstd}/include -I${amd-blis}/include/blis/ -I${lib.getDev msgpack-cxx}/include"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hipblaslt${clr.gpuArchSuffix}"; + version = "6.5-unstable-2025-08-21"; -stdenv.mkDerivation ( - finalAttrs: - let - supportsTargetArches = - (builtins.any (lib.strings.hasPrefix "gfx9") gpuTargets) - || (builtins.any (lib.strings.hasPrefix "gfx11") gpuTargets); - tensile' = (tensile.override { isTensileLite = true; }).overrideAttrs { - inherit (finalAttrs) src; - sourceRoot = "${finalAttrs.src.name}/tensilelite"; - }; - py = python3.withPackages (ps: [ - ps.pyyaml - ps.setuptools - ps.packaging - ]); - gpuTargets' = lib.optionalString supportsTargetArches (lib.concatStringsSep ";" gpuTargets); - compiler = "amdclang++"; - cFlags = "-O3 -I${msgpack}/include"; # FIXME: cmake files need patched to include this properly - in - { - pname = "hipblaslt${clr.gpuArchSuffix}"; - version = "6.3.3"; + src = fetchFromGitHub { + owner = "ROCm"; + repo = "rocm-libraries"; + rev = "a676499add42941ff6af1e8d3f0504416dac7429"; + hash = "sha256-zIYdHFbHyP2V6dkx6Ueb6NBqWu8tJji2hSWF9zWEJa4="; + sparseCheckout = [ "projects/hipblaslt" ]; + }; + sourceRoot = "${finalAttrs.src.name}/projects/hipblaslt"; + env.CXX = compiler; + env.CFLAGS = cFlags; + env.CXXFLAGS = cFlags; + env.ROCM_PATH = "${clr}"; + env.TENSILE_ROCM_ASSEMBLER_PATH = lib.getExe' clr "amdclang++"; + env.TENSILE_GEN_ASSEMBLY_TOOLCHAIN = lib.getExe' clr "amdclang++"; + requiredSystemFeatures = [ "big-parallel" ]; - src = fetchFromGitHub { - owner = "ROCm"; - repo = "hipBLASLt"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ozfHwsxcczzYXN9SIkyfRvdtaCqlDN4bh3UHZNS2oVQ="; - }; - env.CXX = compiler; - env.CFLAGS = cFlags; - env.CXXFLAGS = cFlags; - env.ROCM_PATH = "${clr}"; - env.TENSILE_ROCM_ASSEMBLER_PATH = lib.getExe' clr "amdclang++"; - env.TENSILE_GEN_ASSEMBLY_TOOLCHAIN = lib.getExe' clr "amdclang++"; - # Some tensile scripts look for this as an env var rather than a cmake flag - env.CMAKE_CXX_COMPILER = lib.getExe' clr "amdclang++"; - requiredSystemFeatures = [ "big-parallel" ]; + __structuredAttrs = true; + strictDeps = true; - outputs = [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ] - ++ lib.optionals buildSamples [ - "sample" - ]; + outputs = [ + "out" + # benchmarks are non-optional + "benchmark" + ] + ++ lib.optionals buildTests [ + "test" + ] + ++ lib.optionals buildSamples [ + "sample" + ]; - postPatch = '' - mkdir -p build/Tensile/library - # git isn't needed and we have no .git - substituteInPlace cmake/Dependencies.cmake \ - --replace-fail "find_package(Git REQUIRED)" "" - substituteInPlace CMakeLists.txt \ - --replace-fail "include(virtualenv)" "" \ - --replace-fail "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" \ - --replace-fail "virtualenv_install(\''${CMAKE_SOURCE_DIR}/tensilelite)" "" \ - --replace-fail 'find_package(Tensile 4.33.0 EXACT REQUIRED HIP LLVM OpenMP PATHS "''${INSTALLED_TENSILE_PATH}")' "find_package(Tensile)" \ - --replace-fail 'Tensile_CPU_THREADS ""' 'Tensile_CPU_THREADS "$ENV{NIX_BUILD_CORES}"' - # FIXME: TensileCreateExtOpLibraries build failure due to unsupported null operand - # Working around for now by disabling the ExtOp libs - substituteInPlace library/src/amd_detail/rocblaslt/src/CMakeLists.txt \ - --replace-fail 'TensileCreateExtOpLibraries("' '# skipping TensileCreateExtOpLibraries' - substituteInPlace library/src/amd_detail/rocblaslt/src/kernels/compile_code_object.sh \ - --replace-fail '${"\${rocm_path}"}/bin/' "" - ''; + patches = [ + # Upstream issue requesting properly specifying + # parallel-jobs for these invocations + # https://github.com/ROCm/rocm-libraries/issues/1242 + ./parallel-buildSourceCodeObjectFile.diff + # Support loading zstd compressed .dat files, required to keep output under + # hydra size limit + ./messagepack-compression-support.patch + ]; - # Apply patches to allow building without a target arch if we need to do that - patches = lib.optionals (!supportsTargetArches) [ - # Add ability to build without specitying any arch. - (fetchpatch { - sha256 = "sha256-VW3bPzmQvfo8+iKsVfpn4sbqAe41fLzCEUfBh9JxVyk="; - url = "https://raw.githubusercontent.com/gentoo/gentoo/refs/heads/master/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch"; - }) - # Followup to above patch for 6.3.x - (fetchpatch { - sha256 = "sha256-GCsrne6BiWzwj8TMAfFuaYz1Pij97hoCc6E3qJhWb10="; - url = "https://raw.githubusercontent.com/gentoo/gentoo/refs/heads/master/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-no-arch-extra.patch"; - }) - ]; + postPatch = '' + # git isn't needed and we have no .git + substituteInPlace cmake/dependencies.cmake \ + --replace-fail "find_package(Git REQUIRED)" "" + substituteInPlace CMakeLists.txt \ + --replace-fail " LANGUAGES CXX" " LANGUAGES CXX C ASM" + ''; - doCheck = false; - doInstallCheck = false; + doCheck = false; + doInstallCheck = false; - nativeBuildInputs = [ - cmake - rocm-cmake - py - clr - gfortran - # need make to get streaming console output so nix knows build is still running - # so deliberately not using ninja - ]; + nativeBuildInputs = [ + cmake + rocm-cmake + py + clr + gfortran + pkg-config + ninja + rocm-smi + ]; - buildInputs = [ - hipblas-common - tensile' - openmp - libffi - ncurses + buildInputs = [ + clr + rocm-cmake + hipblas-common + amd-blis + rocm-smi + openmp + libffi + ncurses + lapack-reference - # Tensile deps - not optional, building without tensile isn't actually supported - msgpack # FIXME: not included in cmake! - libxml2 - python3Packages.msgpack - python3Packages.joblib - zlib - zstd - ] - ++ lib.optionals buildTests [ - gtest - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - lapack-reference - ]; + # Tensile deps - not optional, building without tensile isn't actually supported + msgpack-cxx + libxml2 + python3Packages.msgpack + python3Packages.joblib + zlib + zstd + ] + ++ lib.optionals buildTests [ + gtest + ]; - cmakeFlags = [ - "-Wno-dev" - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_VERBOSE_MAKEFILE=ON" - "-DVIRTUALENV_PYTHON_EXENAME=${lib.getExe py}" - "-DTENSILE_USE_HIP=ON" - "-DTENSILE_BUILD_CLIENT=OFF" - "-DTENSILE_USE_FLOAT16_BUILTIN=ON" - "-DCMAKE_CXX_COMPILER=${compiler}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DHIPBLASLT_ENABLE_MARKER=Off" - # FIXME what are the implications of hardcoding this? - "-DTensile_CODE_OBJECT_VERSION=V5" - "-DTensile_COMPILER=${compiler}" - "-DAMDGPU_TARGETS=${gpuTargets'}" - "-DGPU_TARGETS=${gpuTargets'}" - "-DTensile_LIBRARY_FORMAT=msgpack" - ] - ++ lib.optionals (!supportsTargetArches) [ - "-DBUILD_WITH_TENSILE=OFF" - ] - ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ] - ++ lib.optionals buildSamples [ - "-DBUILD_CLIENTS_SAMPLES=ON" - ]; + cmakeFlags = [ + (lib.cmakeFeature "Boost_INCLUDE_DIR" "${lib.getDev boost}/include") # msgpack FindBoost fails to find boost + (lib.cmakeFeature "GPU_TARGETS" gpuTargets') + (lib.cmakeBool "BUILD_TESTING" buildTests) + (lib.cmakeBool "HIPBLASLT_ENABLE_BLIS" true) + (lib.cmakeBool "HIPBLASLT_BUILD_TESTING" buildTests) + (lib.cmakeBool "HIPBLASLT_ENABLE_SAMPLES" buildSamples) + (lib.cmakeBool "HIPBLASLT_ENABLE_DEVICE" supportsTargetArches) + # FIXME: Enable for ROCm 7.x + (lib.cmakeBool "HIPBLASLT_ENABLE_ROCROLLER" false) + "-DCMAKE_C_COMPILER=amdclang" + "-DCMAKE_HIP_COMPILER=${compiler}" + "-DCMAKE_CXX_COMPILER=${compiler}" + "-DROCM_FOUND=ON" # hipblaslt tries to download rocm-cmake if this isn't set + "-DBLIS_ROOT=${amd-blis}" + "-DBLIS_LIB=${amd-blis}/lib/libblis-mt.so" + "-DBLIS_INCLUDE_DIR=${amd-blis}/include/blis/" + "-DBLA_PREFER_PKGCONFIG=ON" + "-DFETCHCONTENT_SOURCE_DIR_NANOBIND=${python3Packages.nanobind.src}" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DHIPBLASLT_ENABLE_MARKER=Off" + ]; - postInstall = - lib.optionalString buildTests '' + postInstall = + # Compress msgpack .dat files to stay under hydra output size limit + # Relies on messagepack-compression-support.patch + '' + for file in $out/lib/hipblaslt/library/*.dat; do + zstd -19 --long -f "$file" -o "$file.tmp" && mv "$file.tmp" "$file" + done + '' + # Move binaries to appropriate outputs and delete leftover /bin + + '' + mkdir -p $benchmark/bin + mv $out/bin/hipblaslt-{api-overhead,sequence,bench*} $out/bin/*.yaml $out/bin/*.py $benchmark/bin + ${lib.optionalString buildTests '' mkdir -p $test/bin mv $out/bin/hipblas-test $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/hipblas-bench $benchmark/bin - '' - + lib.optionalString buildSamples '' + ''} + ${lib.optionalString buildSamples '' mkdir -p $sample/bin mv $out/bin/example-* $sample/bin - '' - + lib.optionalString (buildTests || buildBenchmarks || buildSamples) '' - rmdir $out/bin - ''; - # If this is false there are no kernels in the output lib - # and it's useless at runtime - # so if it's an optional dep it's best to not depend on it - # Some packages like torch need hipblaslt to compile - # and are fine ignoring it at runtime if it's not supported - # so we have to support building an empty hipblaslt - passthru.supportsTargetArches = supportsTargetArches; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; - passthru.tensilelite = tensile'; - meta = with lib; { - description = "Library that provides general matrix-matrix operations with a flexible API"; - homepage = "https://github.com/ROCm/hipBLASlt"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - }; - } -) + ''} + rmdir $out/bin + ''; + + # If this is false there are no kernels in the output lib + # supporting the target device + # so if it's an optional dep it's best to not depend on it + # Some packages like torch need hipblaslt to compile + # and are fine ignoring it at runtime if it's not supported + # so we have to support building an empty hipblaslt + passthru.supportsTargetArches = supportsTargetArches; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + inherit (finalAttrs.src) owner repo; + }; + meta = with lib; { + description = "Library that provides general matrix-matrix operations with a flexible API"; + homepage = "https://github.com/ROCm/hipBLASlt"; + license = with licenses; [ mit ]; + teams = [ teams.rocm ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/rocm-modules/6/hipblaslt/messagepack-compression-support.patch b/pkgs/development/rocm-modules/6/hipblaslt/messagepack-compression-support.patch new file mode 100644 index 0000000000000..ace6b2b728ad2 --- /dev/null +++ b/pkgs/development/rocm-modules/6/hipblaslt/messagepack-compression-support.patch @@ -0,0 +1,56 @@ +diff --git a/Tensile/Source/lib/source/msgpack/MessagePack.cpp b/Tensile/Source/lib/source/msgpack/MessagePack.cpp +index de97929c..dbc397e0 100644 +--- a/tensilelite/src/msgpack/MessagePack.cpp ++++ b/tensilelite/src/msgpack/MessagePack.cpp +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + #include + + namespace Tensile +@@ -86,6 +88,34 @@ namespace Tensile + return nullptr; + } + ++ // Check if the file is zstd compressed ++ char magic[4]; ++ in.read(magic, 4); ++ bool isCompressed = (in.gcount() == 4 && magic[0] == '\x28' && magic[1] == '\xB5' && magic[2] == '\x2F' && magic[3] == '\xFD'); ++ // Reset file pointer to the beginning ++ in.seekg(0, std::ios::beg); ++ ++ if (isCompressed) { ++ // Decompress zstd file ++ std::vector compressedData((std::istreambuf_iterator(in)), std::istreambuf_iterator()); ++ ++ size_t decompressedSize = ZSTD_getFrameContentSize(compressedData.data(), compressedData.size()); ++ if (decompressedSize == ZSTD_CONTENTSIZE_ERROR || decompressedSize == ZSTD_CONTENTSIZE_UNKNOWN) { ++ if(Debug::Instance().printDataInit()) ++ std::cout << "Error: Unable to determine decompressed size for " << filename << std::endl; ++ return false; ++ } ++ ++ std::vector decompressedData(decompressedSize); ++ size_t dSize = ZSTD_decompress(decompressedData.data(), decompressedSize, compressedData.data(), compressedData.size()); ++ if (ZSTD_isError(dSize)) { ++ if(Debug::Instance().printDataInit()) ++ std::cout << "Error: ZSTD decompression failed for " << filename << std::endl; ++ return false; ++ } ++ ++ msgpack::unpack(result, decompressedData.data(), dSize); ++ } else { + msgpack::unpacker unp; + bool finished_parsing; + constexpr size_t buffer_size = 1 << 19; +@@ -109,6 +139,7 @@ namespace Tensile + + return nullptr; + } ++ } + } + catch(std::runtime_error const& exc) + { diff --git a/pkgs/development/rocm-modules/6/hipblaslt/parallel-buildSourceCodeObjectFile.diff b/pkgs/development/rocm-modules/6/hipblaslt/parallel-buildSourceCodeObjectFile.diff new file mode 100644 index 0000000000000..019e7a6123b16 --- /dev/null +++ b/pkgs/development/rocm-modules/6/hipblaslt/parallel-buildSourceCodeObjectFile.diff @@ -0,0 +1,12 @@ +diff --git a/tensilelite/Tensile/Toolchain/Source.py b/tensilelite/Tensile/Toolchain/Source.py +index c9862e6c..dfa5ba40 100644 +--- a/tensilelite/Tensile/Toolchain/Source.py ++++ b/tensilelite/Tensile/Toolchain/Source.py +@@ -102,6 +102,7 @@ def buildSourceCodeObjectFiles( + coPaths= [] + + objPath = str(tmpObjDir / objFilename) ++ compiler.default_args += ["-parallel-jobs=8"] + compiler(str(includeDir), cmdlineArchs, str(kernelPath), objPath) + + for target in bundler.targets(objPath): diff --git a/pkgs/development/rocm-modules/6/hipcub/default.nix b/pkgs/development/rocm-modules/6/hipcub/default.nix index c559760738aaf..137b7e76f9c49 100644 --- a/pkgs/development/rocm-modules/6/hipcub/default.nix +++ b/pkgs/development/rocm-modules/6/hipcub/default.nix @@ -17,7 +17,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipCUB"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-uECOQWG9C64tg5YZdm9/3+fZXaZVGslu8vElK3m23GY="; + hash = "sha256-yRJxhYFZYiKNR2xrn5fif/+vjHKKcKdn0JKPi972g+0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipfft/default.nix b/pkgs/development/rocm-modules/6/hipfft/default.nix index 21507e774c6da..1002b0b3d16fd 100644 --- a/pkgs/development/rocm-modules/6/hipfft/default.nix +++ b/pkgs/development/rocm-modules/6/hipfft/default.nix @@ -22,7 +22,7 @@ # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Jq/YHEtOo7a0/Ki7gxZATKmSqPU6cyLf5gx3A4MAZNw="; + hash = "sha256-4W93OOKTqNteoQ4GKycr06cjvGy5NF7RR08F+rfn+0o="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/6/hipfort/default.nix b/pkgs/development/rocm-modules/6/hipfort/default.nix index d3916bf6d20c7..7a803c1fe3b0d 100644 --- a/pkgs/development/rocm-modules/6/hipfort/default.nix +++ b/pkgs/development/rocm-modules/6/hipfort/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchFromGitHub, rocmUpdateScript, cmake, @@ -10,15 +11,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-V5XDNM0bYHKnpkcnaDyxIS1zwsgaByJj+znFxJ6VxR0="; + hash = "sha256-Nks1+0X8bLtZ9HqZXJOtrAWQlJquMH+feuu1stf/9Vo="; }; + patches = [ + (fetchpatch { + name = "hipfort-fix-cmake-4.patch"; + url = "https://github.com/ROCm/hipfort/commit/75552c7ec48e3bd6a914c57c9475ec573ccb37d9.patch"; + hash = "sha256-S9r1V6cUo9QbKbu/NK4wIvXMV6BFv7+/n9mjCScVk40="; + includes = [ "bin/*" ]; + }) + ]; + nativeBuildInputs = [ cmake rocm-cmake diff --git a/pkgs/development/rocm-modules/6/hipify/default.nix b/pkgs/development/rocm-modules/6/hipify/default.nix index 8747dba16b96a..1fe6e969a776f 100644 --- a/pkgs/development/rocm-modules/6/hipify/default.nix +++ b/pkgs/development/rocm-modules/6/hipify/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipify"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIPIFY"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-o/1LNsNtAyQcSug1gf7ujGNRRbvC33kwldrJKZi2LA0="; + hash = "sha256-uj25WmGCpwouS1yzW9Oil5Vyrbyj5yRITvWF9WaGozM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hiprand/default.nix b/pkgs/development/rocm-modules/6/hiprand/default.nix index d39e01ac2a789..d22dd2ee67088 100644 --- a/pkgs/development/rocm-modules/6/hiprand/default.nix +++ b/pkgs/development/rocm-modules/6/hiprand/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiprand"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-TVc+qFwRiS5tAo1OKI1Wu5hadlwPZmSVZ9SvVvH1w7Y="; + hash = "sha256-f/AWDV7vkjt8BnjhLwT2m1Y6dlZy054+z6J0UW9Glg8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipsolver/default.nix b/pkgs/development/rocm-modules/6/hipsolver/default.nix index d87c58eb3dbff..17b888d2a269d 100644 --- a/pkgs/development/rocm-modules/6/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/6/hipsolver/default.nix @@ -21,7 +21,7 @@ # Can also use cuSOLVER stdenv.mkDerivation (finalAttrs: { pname = "hipsolver"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ZQUKU3L4DgZ5zM7pCYEix0ulRkl78x/5wJnyCndTAwk="; + hash = "sha256-YP88fSM27Do0/tZ676Pvv2tr+lnlQa4vr3UnVNaVpLA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipsparse/default.nix b/pkgs/development/rocm-modules/6/hipsparse/default.nix index 0a1795d3ab16d..f10280335ba0d 100644 --- a/pkgs/development/rocm-modules/6/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/6/hipsparse/default.nix @@ -20,7 +20,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-3a7fKpYyiqG3aGOg7YrTHmKoH4rgTVLD16DvrZ3YY1g="; + hash = "sha256-fbh9fKlzxuIBTeCV/bEQbUS3lO6O3KoGF7/tTqRaCpE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix b/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix deleted file mode 100644 index 68d7a337f89d6..0000000000000 --- a/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - callPackage, - dpkg, - rocm-core, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hsa-amd-aqlprofile-bin"; - version = "6.3.3"; - - src = - let - inherit (finalAttrs) version; - patch = rocm-core.ROCM_LIBPATCH_VERSION; - majorMinor = lib.versions.majorMinor version; - poolVersion = if majorMinor + ".0" == version then majorMinor else version; - incremental = "74"; - osRelease = "22.04"; - in - fetchurl { - url = "https://repo.radeon.com/rocm/apt/${poolVersion}/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.${patch}-${incremental}~${osRelease}_amd64.deb"; - hash = "sha256-Lo6gU9ywkujtsKvnOAwL3L8qQNPwjjm0Pm4OyzoUYao="; - }; - - nativeBuildInputs = [ dpkg ]; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -a opt/rocm-${finalAttrs.version}*/* $out - chmod +x $out/lib/libhsa-amd-aqlprofile64.so.1.* - chmod +x $out/lib/hsa-amd-aqlprofile/librocprofv2_att.so - - runHook postInstall - ''; - - passthru.updateScript = (callPackage ./update.nix { }) { inherit (finalAttrs) version; }; - - meta = with lib; { - description = "AQLPROFILE library for AMD HSA runtime API extension support"; - homepage = "https://rocm.docs.amd.com/en/latest/"; - license = with licenses; [ unfree ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/update.nix b/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/update.nix deleted file mode 100644 index ed834c84a6780..0000000000000 --- a/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/update.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - writeScript, -}: - -{ version }: - -let - prefix = "hsa-amd-aqlprofile"; - extVersion = lib.strings.concatStrings ( - lib.strings.intersperse "0" (lib.versions.splitVersion version) - ); - major = lib.versions.major version; - minor = lib.versions.minor version; - patch = lib.versions.patch version; - - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts - apt="https://repo.radeon.com/rocm/apt" - pool="pool/main/h/${prefix}/" - url="$apt/latest/$pool" - res="$(curl -sL "$url")" - deb="${prefix}$(echo "$res" | grep -o -P "(?<=href=\"${prefix}).*(?=\">)" | tail -1)" - patch="${patch}" - - # Try up to 10 patch versions - for i in {1..10}; do - ((patch++)) - extVersion="$(echo "$deb" | grep -o -P "(?<=\.....).*(?=\..*-)")" - - if (( ''${#extVersion} == 6 )) && (( $extVersion <= ${extVersion} )); then - url="https://repo.radeon.com/rocm/apt/${major}.${minor}.$patch/pool/main/h/${prefix}/" - res="$(curl -sL "$url")" - deb="${prefix}$(echo "$res" | grep -o -P "(?<=href=\"${prefix}).*(?=\">)" | tail -1)" - else - break - fi - done - - extVersion="$(echo $deb | grep -o -P "(?<=\.....).*(?=\..*-)")" - version="$(echo $extVersion | sed "s/0/./1" | sed "s/0/./1")" - IFS='.' read -a version_arr <<< "$version" - - if (( ''${version_arr[0]} > 6 )); then - echo "'rocmPackages_6.${prefix}-bin' is already at it's maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${prefix}-bin'." 1>&2 - exit 1 - fi - - if (( ''${#extVersion} == 6 )); then - repoVersion="$version" - - if (( ''${version:4:1} == 0 )); then - repoVersion=''${version:0:3} - fi - - update-source-version rocmPackages_6.${prefix}-bin "$version" "" "$apt/$repoVersion/$pool$deb" --ignore-same-hash - fi - ''; -in -[ updateScript ] diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix index b45fe071041e6..448fae103ae3a 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/6/llvm/default.nix @@ -1,16 +1,15 @@ { lib, stdenv, - llvmPackages_18, + # LLVM version closest to ROCm fork to override + llvmPackages_19, overrideCC, rocm-device-libs, - rocm-runtime, fetchFromGitHub, runCommand, symlinkJoin, rdfind, wrapBintoolsWith, - emptyDirectory, zstd, zlib, gcc-unwrapped, @@ -21,33 +20,48 @@ removeReferencesTo, fetchpatch, # Build compilers and stdenv suitable for profiling - # compressed line tables (-g1 -gz) and - # frame pointers for sampling profilers (-fno-omit-frame-pointer -momit-leaf-frame-pointer) - # TODO: Should also apply to downstream packages which use rocmClangStdenv + # leaving compressed line tables (-g1 -gz) unstripped + # TODO: Should also apply to downstream packages which use rocmClangStdenv? profilableStdenv ? false, -}: + # Whether to use LTO when building the ROCm toolchain + # Slows down this toolchain's build, for typical ROCm usecase + # time saved building composable_kernel and other heavy packages + # will outweight that. ~3-4% speedup multiplied by thousands + # of corehours. + withLto ? true, + # whether rocm stdenv uses libcxx (clang c++ stdlib) instead of gcc stdlibc++ + withLibcxx ? false, +}@args: let - llvmPackagesNoBintools = llvmPackages_18.override { + version = "6.4.3"; + # major version of this should be the clang version ROCm forked from + rocmLlvmVersion = "19.0.0-rocm"; + # llvmPackages_base version should match rocmLlvmVersion + # so libllvm's bitcode is compatible with the built toolchain + llvmPackages_base = llvmPackages_19; + llvmPackagesNoBintools = llvmPackages_base.override { bootBintools = null; bootBintoolsNoLibc = null; }; - useLibcxx = false; # whether rocm stdenv uses libcxx (clang c++ stdlib) instead of gcc stdlibc++ - llvmStdenv = overrideCC llvmPackagesNoBintools.libcxxStdenv llvmPackagesNoBintools.clangUseLLVM; - llvmLibstdcxxStdenv = overrideCC llvmPackagesNoBintools.stdenv ( - llvmPackagesNoBintools.libstdcxxClang.override { - inherit (llvmPackages_18) bintools; - } - ); - stdenvToBuildRocmLlvm = if useLibcxx then llvmStdenv else llvmLibstdcxxStdenv; + stdenvToBuildRocmLlvm = + if withLibcxx then + overrideCC llvmPackagesNoBintools.libcxxStdenv llvmPackagesNoBintools.clangUseLLVM + else + # oddly fuse-ld=lld fails without this override + overrideCC llvmPackagesNoBintools.stdenv ( + llvmPackagesNoBintools.libstdcxxClang.override { + inherit (llvmPackages_base) bintools; + } + ); + gcc-include = runCommand "gcc-include" { } '' mkdir -p $out ln -s ${gcc-unwrapped}/include/ $out/ ln -s ${gcc-unwrapped}/lib/ $out/ ''; - # A prefix for use as the GCC prefix when building rocmcxx disallowedRefsForToolchain = [ stdenv.cc stdenv.cc.cc @@ -57,40 +71,47 @@ let stdenvToBuildRocmLlvm.cc stdenvToBuildRocmLlvm.cc.cc ]; - gcc-prefix = - let - gccPrefixPaths = [ - gcc-unwrapped - gcc-unwrapped.lib - glibc.dev - ]; - in - symlinkJoin { - name = "gcc-prefix"; - paths = gccPrefixPaths ++ [ - glibc - ]; - disallowedRequisites = gccPrefixPaths; - postBuild = '' - rm -rf $out/{bin,libexec,nix-support,lib64,share,etc} - rm $out/lib/gcc/x86_64-unknown-linux-gnu/*/plugin/include/auto-host.h - - mkdir /build/tmpout - mv $out/* /build/tmpout - cp -Lr --no-preserve=mode /build/tmpout/* $out/ - set -x - versionedIncludePath="$(echo $out/include/c++/*/)" - mv $versionedIncludePath/* $out/include/c++/ - rm -rf $versionedIncludePath/ - - find $out/lib -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${gcc-unwrapped.lib} {} + + # A prefix for use as the GCC prefix when building rocmcxx + gcc-prefix-headers = symlinkJoin { + name = "gcc-prefix-headers"; + paths = [ + glibc.dev + gcc-unwrapped.out + ]; + disallowedRequisites = [ + glibc.dev + gcc-unwrapped.out + ]; + postBuild = '' + rm -rf $out/{bin,libexec,nix-support,lib64,share,etc} + rm $out/lib/gcc/x86_64-unknown-linux-gnu/*/plugin/include/auto-host.h - ln -s $out $out/x86_64-unknown-linux-gnu - ''; - }; - version = "6.3.1"; - # major version of this should be the clang version ROCm forked from - rocmLlvmVersion = "18.0.0-${llvmSrc.rev}"; + mkdir /build/tmpout + mv $out/* /build/tmpout + cp -Lr --no-preserve=mode /build/tmpout/* $out/ + set -x + versionedIncludePath="$(echo $out/include/c++/*/)" + mv $versionedIncludePath/* $out/include/c++/ + rm -rf $versionedIncludePath/ + ''; + }; + gcc-prefix = symlinkJoin { + name = "gcc-prefix"; + paths = [ + gcc-prefix-headers + glibc + gcc-unwrapped.lib + ]; + disallowedRequisites = [ + glibc.dev + gcc-unwrapped.out + ]; + postBuild = '' + rm -rf $out/{bin,libexec,nix-support,lib64,share,etc} + rm $out/lib/ld-linux-x86-64.so.2 + ln -s $out $out/x86_64-unknown-linux-gnu + ''; + }; usefulOutputs = drv: builtins.filter (x: x != null) [ @@ -100,27 +121,24 @@ let ]; listUsefulOutputs = builtins.concatMap usefulOutputs; llvmSrc = fetchFromGitHub { - # Performance improvements cherry-picked on top of rocm-6.3.x - # most importantly, amdgpu-early-alwaysinline memory usage fix - owner = "LunNova"; - repo = "llvm-project-rocm"; - rev = "4182046534deb851753f0d962146e5176f648893"; - hash = "sha256-sPmYi1WiiAqnRnHVNba2nPUxGflBC01FWCTNLPlYF9c="; + owner = "ROCm"; + repo = "llvm-project"; + rev = "rocm-${version}"; + hash = "sha256-12ftH5fMPAsbcEBmhADwW1YY/Yxo/MAK1FafKczITMg="; }; - llvmSrcFixed = llvmSrc; llvmMajorVersion = lib.versions.major rocmLlvmVersion; # An llvmPackages (pkgs/development/compilers/llvm/) built from ROCm LLVM's source tree - # optionally using LLVM libcxx - llvmPackagesRocm = llvmPackages_18.override (_old: { - stdenv = stdenvToBuildRocmLlvm; # old.stdenv #llvmPackagesNoBintools.libcxxStdenv; + llvmPackagesRocm = llvmPackages_base.override (_old: { + stdenv = stdenvToBuildRocmLlvm; # not setting gitRelease = because that causes patch selection logic to use git patches - # ROCm LLVM is closer to 18 official + # ROCm LLVM is closer to 20 official # gitRelease = {}; officialRelease = null; officialRelease = { }; # Set but empty because we're overriding everything from it. + # this version determines which patches are applied version = rocmLlvmVersion; - src = llvmSrcFixed; - monorepoSrc = llvmSrcFixed; + src = llvmSrc; + monorepoSrc = llvmSrc; doCheck = false; }); sysrootCompiler = @@ -158,82 +176,111 @@ let sed -i 's|set(CLANG_INCLUDE_DIRS.*$|set(CLANG_INCLUDE_DIRS "${cc.dev}/include")|g' $out/lib/cmake/clang/ClangConfig.cmake ${lib.getExe rdfind} -makesymlinks true $out/ # create links *within* the sysroot to save space ''; - findClangNostdlibincPatch = + # Removes patches which either aren't desired, or don't apply against ROCm LLVM + removeInapplicablePatches = x: ( (lib.strings.hasSuffix "add-nostdlibinc-flag.patch" (baseNameOf x)) || (lib.strings.hasSuffix "clang-at-least-16-LLVMgold-path.patch" (baseNameOf x)) ); + tablegenUsage = x: !(lib.strings.hasInfix "llvm-tblgen" x); llvmTargetsFlag = "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${ { "x86_64" = "X86"; "aarch64" = "AArch64"; } - .${llvmStdenv.targetPlatform.parsed.cpu.name} - or (throw "Unsupported CPU architecture: ${llvmStdenv.targetPlatform.parsed.cpu.name}") + .${stdenv.targetPlatform.parsed.cpu.name} + or (throw "Unsupported CPU architecture: ${stdenv.targetPlatform.parsed.cpu.name}") }"; - # -ffat-lto-objects = emit LTO object files that are compatible with non-LTO-supporting builds too - # FatLTO objects are a special type of fat object file that contain LTO compatible IR in addition to generated object code, - # instead of containing object code for multiple target architectures. This allows users to defer the choice of whether to - # use LTO or not to link-time, and has been a feature available in other compilers, like GCC, for some time. + llvmMeta = { + # TODO(@LunNova): it would be nice to support aarch64 for rocmPackages + platforms = [ "x86_64-linux" ]; + }; + # TODO(@LunNova): Some of this might be worth supporting in llvmPackages, dropping from here + commonCmakeFlags = [ + llvmTargetsFlag + # Compression support is required for compressed offload kernels + # Set FORCE_ON so that failure to find the compression libs will be a build error + (lib.cmakeFeature "LLVM_ENABLE_ZSTD" "FORCE_ON") + (lib.cmakeFeature "LLVM_ENABLE_ZLIB" "FORCE_ON") + # required for threaded ThinLTO to work + (lib.cmakeBool "LLVM_ENABLE_THREADS" true) + # LLVM tries to call git to embed VCS info if FORCE_VC_ aren't set + (lib.cmakeFeature "LLVM_FORCE_VC_REVISION" "rocm-${version}") + (lib.cmakeFeature "LLVM_FORCE_VC_REPOSITORY" "https://github.com/ROCm/llvm-project") + (lib.cmakeFeature "LLVM_VERSION_SUFFIX" "") + (lib.cmakeBool "LLVM_ENABLE_LIBCXX" withLibcxx) + (lib.cmakeFeature "CLANG_DEFAULT_CXX_STDLIB" (if withLibcxx then "libc++" else "libstdc++")) + (lib.cmakeFeature "CLANG_VENDOR" "nixpkgs-AMD") + (lib.cmakeFeature "CLANG_REPOSITORY_STRING" "https://github.com/ROCm/llvm-project/tree/rocm-${version}") + ] + ++ lib.optionals withLibcxx [ + (lib.cmakeFeature "CLANG_DEFAULT_RTLIB" "compiler-rt") + ] + ++ lib.optionals withLto [ + (lib.cmakeBool "CMAKE_INTERPROCEDURAL_OPTIMIZATION" true) + (lib.cmakeBool "LLVM_ENABLE_FATLTO" false) + ] + ++ lib.optionals (withLto && stdenvToBuildRocmLlvm.cc.isClang) [ + (lib.cmakeFeature "LLVM_ENABLE_LTO" "FULL") + (lib.cmakeFeature "LLVM_USE_LINKER" "lld") + ]; - tablegenUsage = x: !(lib.strings.hasInfix "llvm-tblgen" x); - addGccLtoCmakeFlags = !llvmPackagesRocm.stdenv.cc.isClang; - llvmExtraCflags = - "-O3 -DNDEBUG -march=skylake -mtune=znver3" - + (lib.optionalString addGccLtoCmakeFlags " -D_GLIBCXX_USE_CXX11_ABI=0 -flto -ffat-lto-objects -flto-compression-level=19 -Wl,-flto") - + (lib.optionalString llvmPackagesRocm.stdenv.cc.isClang " -flto=thin -ffat-lto-objects") - + (lib.optionalString profilableStdenv " -fno-omit-frame-pointer -momit-leaf-frame-pointer -gz -g1"); + llvmExtraCflags = lib.concatStringsSep " " ( + lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ + # Unprincipled decision to build x86_64 ROCm clang for at least skylake and tune for zen3+ + # In practice building the ROCm package set with anything earlier than zen3 is annoying + # and earlier than skylake is implausible due to too few cores and too little RAM + # Speeds up composable_kernel builds by ~4% + # If this causes trouble in practice we can drop this. Set since 2025-03-24. + "-march=skylake" + "-mtune=znver3" + ] + ++ lib.optionals profilableStdenv [ + # compressed line only debug info for profiling + "-gz" + "-g1" + ] + ); in rec { - inherit (llvmPackagesRocm) libunwind; inherit (llvmPackagesRocm) libcxx; + inherit args; # Pass through original attrs for debugging where non-overridden llvm/clang is getting used # llvm-orig = llvmPackagesRocm.llvm; # nix why-depends --derivation .#rocmPackages.clr .#rocmPackages.llvm.llvm-orig # clang-orig = llvmPackagesRocm.clang; # nix why-depends --derivation .#rocmPackages.clr .#rocmPackages.llvm.clang-orig - llvm = (llvmPackagesRocm.llvm.override { ninja = emptyDirectory; }).overrideAttrs (old: { + llvm = llvmPackagesRocm.llvm.overrideAttrs (old: { + patches = old.patches ++ [ + (fetchpatch { + # fix compile error in tools/gold/gold-plugin.cpp + name = "gold-plugin-fix.patch"; + url = "https://github.com/llvm/llvm-project/commit/b0baa1d8bd68a2ce2f7c5f2b62333e410e9122a1.patch"; + hash = "sha256-yly93PvGIXOnFeDGZ2W+W6SyhdWFM6iwA+qOeaptrh0="; + relative = "llvm"; + }) + (fetchpatch { + # fix tools/llvm-exegesis/X86/latency/ failing with glibc 2.4+ + name = "exegesis-latency-glibc-fix.patch"; + sha256 = "sha256-CjKxQlYwHXTM0mVnv8k/ssg5OXuKpJxRvBZGXjrFZAg="; + url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch"; + relative = "llvm"; + }) + ./perf-increase-namestring-size.patch + # TODO: consider reapplying "Don't include aliases in RegisterClassInfo::IgnoreCSRForAllocOrder" + # it was reverted as it's a pessimization for non-GPU archs, but this compiler + # is used mostly for amdgpu + ]; dontStrip = profilableStdenv; + hardeningDisable = [ "all" ]; nativeBuildInputs = old.nativeBuildInputs ++ [ removeReferencesTo ]; buildInputs = old.buildInputs ++ [ zstd zlib ]; - env.NIX_BUILD_ID_STYLE = "fast"; - postPatch = '' - ${old.postPatch or ""} - patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh - ''; - LDFLAGS = "-Wl,--build-id=sha1,--icf=all,--compress-debug-sections=zlib"; - cmakeFlags = - (builtins.filter tablegenUsage old.cmakeFlags) - ++ [ - llvmTargetsFlag - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_ENABLE_ZSTD=FORCE_ON" - "-DLLVM_ENABLE_ZLIB=FORCE_ON" - "-DLLVM_ENABLE_THREADS=ON" - "-DLLVM_ENABLE_LTO=Thin" - "-DLLVM_USE_LINKER=lld" - (lib.cmakeBool "LLVM_ENABLE_LIBCXX" useLibcxx) - "-DCLANG_DEFAULT_CXX_STDLIB=${if useLibcxx then "libc++" else "libstdc++"}" - ] - ++ lib.optionals addGccLtoCmakeFlags [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" - "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" - ] - ++ lib.optionals useLibcxx [ - "-DLLVM_ENABLE_LTO=Thin" - "-DLLVM_USE_LINKER=lld" - "-DLLVM_ENABLE_LIBCXX=ON" - ]; - preConfigure = '' - ${old.preConfigure or ""} - cmakeFlagsArray+=( - '-DCMAKE_C_FLAGS_RELEASE=${llvmExtraCflags}' - '-DCMAKE_CXX_FLAGS_RELEASE=${llvmExtraCflags}' - ) - ''; + env = (old.env or { }) // { + NIX_CFLAGS_COMPILE = "${(old.env or { }).NIX_CFLAGS_COMPILE or ""} ${llvmExtraCflags}"; + }; + cmakeFlags = (builtins.filter tablegenUsage old.cmakeFlags) ++ commonCmakeFlags; # Ensure we don't leak refs to compiler that was used to bootstrap this LLVM disallowedReferences = (old.disallowedReferences or [ ]) ++ disallowedRefsForToolchain; postFixup = '' @@ -243,48 +290,26 @@ rec { find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc} {} + find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} + ''; + meta = old.meta // llvmMeta; }); lld = (llvmPackagesRocm.lld.override { libllvm = llvm; - ninja = emptyDirectory; }).overrideAttrs (old: { - patches = builtins.filter ( - x: !(lib.strings.hasSuffix "more-openbsd-program-headers.patch" (baseNameOf x)) - ) old.patches; dontStrip = profilableStdenv; + hardeningDisable = [ "all" ]; nativeBuildInputs = old.nativeBuildInputs ++ [ - llvmPackagesNoBintools.lld removeReferencesTo ]; buildInputs = old.buildInputs ++ [ zstd zlib ]; - env.NIX_BUILD_ID_STYLE = "fast"; - LDFLAGS = "-Wl,--build-id=sha1,--icf=all,--compress-debug-sections=zlib"; - cmakeFlags = - (builtins.filter tablegenUsage old.cmakeFlags) - ++ [ - llvmTargetsFlag - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_ENABLE_ZSTD=FORCE_ON" - "-DLLVM_ENABLE_ZLIB=FORCE_ON" - "-DLLVM_ENABLE_THREADS=ON" - "-DLLVM_ENABLE_LTO=Thin" - "-DLLVM_USE_LINKER=lld" - (lib.cmakeBool "LLVM_ENABLE_LIBCXX" useLibcxx) - "-DCLANG_DEFAULT_CXX_STDLIB=${if useLibcxx then "libc++" else "libstdc++"}" - ] - ++ lib.optionals addGccLtoCmakeFlags [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" - "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" - ] - ++ lib.optionals useLibcxx [ - "-DLLVM_ENABLE_LIBCXX=ON" - ]; + env = (old.env or { }) // { + NIX_CFLAGS_COMPILE = "${(old.env or { }).NIX_CFLAGS_COMPILE or ""} ${llvmExtraCflags}"; + }; + cmakeFlags = (builtins.filter tablegenUsage old.cmakeFlags) ++ commonCmakeFlags; # Ensure we don't leak refs to compiler that was used to bootstrap this LLVM disallowedReferences = (old.disallowedReferences or [ ]) ++ disallowedRefsForToolchain; postFixup = '' @@ -292,36 +317,40 @@ rec { find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} + find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} + ''; - preConfigure = '' - ${old.preConfigure or ""} - cmakeFlagsArray+=( - '-DCMAKE_C_FLAGS_RELEASE=${llvmExtraCflags}' - '-DCMAKE_CXX_FLAGS_RELEASE=${llvmExtraCflags}' - ) - ''; + meta = old.meta // llvmMeta; }); clang-unwrapped = ( (llvmPackagesRocm.clang-unwrapped.override { libllvm = llvm; - ninja = emptyDirectory; }).overrideAttrs ( old: let - filteredPatches = builtins.filter (x: !(findClangNostdlibincPatch x)) old.patches; + filteredPatches = builtins.filter (x: !(removeInapplicablePatches x)) old.patches; in { - meta.platforms = [ - "x86_64-linux" - ]; - pname = "${old.pname}-rocm"; - patches = filteredPatches ++ [ + passthru = old.passthru // { + inherit gcc-prefix; + }; + patches = [ + (fetchpatch { + # [PATCH] [clang] Install scan-build-py into plain "lib" directory + # Backported so 19/clang/gnu-install-dirs patch applies to AMD's LLVM fork + hash = "sha256-bOqAjBwRKcERpQkiBpuojGs6ddd5Ht3zL5l3TuJK2w8="; + url = "https://github.com/llvm/llvm-project/commit/816fde1cbb700ebcc8b3df81fb93d675c04c12cd.patch"; + relative = "clang"; + }) + ] + ++ filteredPatches + ++ [ # Never add FHS include paths ./clang-bodge-ignore-systemwide-incls.diff # Prevents builds timing out if a single compiler invocation is very slow but # per-arch jobs are completing by ensuring there's terminal output ./clang-log-jobs.diff + ./opt-offload-compress-on-by-default.patch + ./perf-shorten-gcclib-include-paths.patch (fetchpatch { # [ClangOffloadBundler]: Add GetBundleIDsInFile to OffloadBundler sha256 = "sha256-G/mzUdFfrJ2bLJgo4+mBcR6Ox7xGhWu5X+XxT4kH2c8="; @@ -334,65 +363,41 @@ rec { libllvmLibdir = "${llvm.lib}/lib"; }) ]; + hardeningDisable = [ "all" ]; nativeBuildInputs = old.nativeBuildInputs ++ [ - llvmPackagesNoBintools.lld removeReferencesTo ]; buildInputs = old.buildInputs ++ [ zstd zlib ]; - dontStrip = profilableStdenv; - LDFLAGS = "-Wl,--build-id=sha1,--icf=all,--compress-debug-sections=zlib"; env = (old.env or { }) // { - NIX_BUILD_ID_STYLE = "fast"; + NIX_CFLAGS_COMPILE = "${(old.env or { }).NIX_CFLAGS_COMPILE or ""} ${llvmExtraCflags}"; }; + dontStrip = profilableStdenv; # 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 = (builtins.filter tablegenUsage old.cmakeFlags) - ++ [ - llvmTargetsFlag - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_ENABLE_ZSTD=FORCE_ON" - "-DLLVM_ENABLE_ZLIB=FORCE_ON" - "-DLLVM_ENABLE_THREADS=ON" - "-DLLVM_ENABLE_LTO=Thin" - "-DLLVM_USE_LINKER=lld" - (lib.cmakeBool "LLVM_ENABLE_LIBCXX" useLibcxx) - "-DCLANG_DEFAULT_CXX_STDLIB=${if useLibcxx then "libc++" else "libstdc++"}" - ] - ++ lib.optionals addGccLtoCmakeFlags [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" - "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" - ] - ++ lib.optionals useLibcxx [ - "-DLLVM_ENABLE_LTO=Thin" - "-DLLVM_ENABLE_LIBCXX=ON" - "-DLLVM_USE_LINKER=lld" - "-DCLANG_DEFAULT_RTLIB=compiler-rt" - ] - ++ lib.optionals (!useLibcxx) [ + ++ commonCmakeFlags + ++ lib.optionals (!withLibcxx) [ # FIXME: Config file in rocmcxx instead of GCC_INSTALL_PREFIX? + # Expected to be fully removed eventually + "-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON" "-DGCC_INSTALL_PREFIX=${gcc-prefix}" ]; postFixup = (old.postFixup or "") + '' + find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm} {} + find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc} {} + + find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc.cc} {} + find $lib -type f -exec remove-references-to -t ${stdenv.cc} {} + find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} + find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} + ''; - preConfigure = (old.preConfigure or "") + '' - cmakeFlagsArray+=( - '-DCMAKE_C_FLAGS_RELEASE=${llvmExtraCflags}' - '-DCMAKE_CXX_FLAGS_RELEASE=${llvmExtraCflags}' - ) - ''; + meta = old.meta // llvmMeta; } ) ) @@ -409,11 +414,12 @@ rec { clang-unwrapped bintools compiler-rt + openmp ] - ++ (lib.optionals useLibcxx [ + ++ (lib.optionals withLibcxx [ libcxx ]) - ++ (lib.optionals (!useLibcxx) [ + ++ (lib.optionals (!withLibcxx) [ gcc-include glibc glibc.dev @@ -438,7 +444,14 @@ rec { hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g="; relative = "compiler-rt"; }) + (fetchpatch { + # Fixes fortify hardening compile error related to openat usage + hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs="; + url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch"; + relative = "compiler-rt"; + }) ]; + meta = old.meta // llvmMeta; }); compiler-rt = compiler-rt-libc; bintools = wrapBintoolsWith { @@ -450,6 +463,7 @@ rec { clang = rocmcxx; # Emulate a monolithic ROCm LLVM build to support building ROCm's in-tree LLVM projects + # TODO(@LunNova): destroy this rocm-merged-llvm = symlinkJoin { name = "rocm-llvm-merge"; paths = [ @@ -458,13 +472,11 @@ rec { lld lld.lib lld.dev - libunwind - libunwind.dev compiler-rt compiler-rt.dev rocmcxx ] - ++ lib.optionals useLibcxx [ + ++ lib.optionals withLibcxx [ libcxx libcxx.out libcxx.dev @@ -489,37 +501,32 @@ rec { }; rocmClangStdenv = overrideCC ( - if useLibcxx then llvmPackagesRocm.libcxxStdenv else llvmPackagesRocm.stdenv + if withLibcxx then llvmPackagesRocm.libcxxStdenv else llvmPackagesRocm.stdenv ) clang; # Projects openmp = (llvmPackagesRocm.openmp.override { - stdenv = rocmClangStdenv; - llvm = rocm-merged-llvm; - targetLlvm = rocm-merged-llvm; - clang-unwrapped = clang; + llvm = llvm; + targetLlvm = llvm; + clang-unwrapped = clang-unwrapped; }).overrideAttrs (old: { disallowedReferences = (old.disallowedReferences or [ ]) ++ disallowedRefsForToolchain; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ removeReferencesTo ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + removeReferencesTo + ]; cmakeFlags = old.cmakeFlags + ++ commonCmakeFlags ++ [ "-DDEVICELIBS_ROOT=${rocm-device-libs.src}" - # OMPD support is broken in ROCm 6.3. Haven't investigated why. + # OMPD support is broken in ROCm 6.3+ Haven't investigated why. "-DLIBOMP_OMPD_SUPPORT:BOOL=FALSE" "-DLIBOMP_OMPD_GDB_SUPPORT:BOOL=FALSE" - ] - ++ lib.optionals addGccLtoCmakeFlags [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; - env.LLVM = "${rocm-merged-llvm}"; - env.LLVM_DIR = "${rocm-merged-llvm}"; buildInputs = old.buildInputs ++ [ - rocm-device-libs - rocm-runtime + clang-unwrapped zlib zstd libxml2 diff --git a/pkgs/development/rocm-modules/6/llvm/opt-offload-compress-on-by-default.patch b/pkgs/development/rocm-modules/6/llvm/opt-offload-compress-on-by-default.patch new file mode 100644 index 0000000000000..5b43528c3271e --- /dev/null +++ b/pkgs/development/rocm-modules/6/llvm/opt-offload-compress-on-by-default.patch @@ -0,0 +1,22 @@ +From 762511ad9c9cac7769a795cc4df888a1559dca02 Mon Sep 17 00:00:00 2001 +From: Luna Nova +Date: Mon, 16 Dec 2024 14:56:57 -0800 +Subject: [PATCH] [AMDGPU] CommonArgs: Enable offload compression by default + +--- + clang/lib/Driver/ToolChains/CommonArgs.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp +index 33f12fb2d075d..ba35f65210c7a 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -2914,7 +2914,7 @@ void tools::addHIPRuntimeLibArgs(const ToolChain &TC, Compilation &C, + void tools::addOffloadCompressArgs(const llvm::opt::ArgList &TCArgs, + llvm::opt::ArgStringList &CmdArgs) { + if (TCArgs.hasFlag(options::OPT_offload_compress, +- options::OPT_no_offload_compress, false)) ++ options::OPT_no_offload_compress, true)) + CmdArgs.push_back("-compress"); + if (TCArgs.hasArg(options::OPT_v)) + CmdArgs.push_back("-verbose"); diff --git a/pkgs/development/rocm-modules/6/llvm/perf-increase-namestring-size.patch b/pkgs/development/rocm-modules/6/llvm/perf-increase-namestring-size.patch new file mode 100644 index 0000000000000..84046a588630a --- /dev/null +++ b/pkgs/development/rocm-modules/6/llvm/perf-increase-namestring-size.patch @@ -0,0 +1,28 @@ +From a57eb548d46a37e4aed33eefccc9e6374b579ff9 Mon Sep 17 00:00:00 2001 +From: Luna Nova +Date: Mon, 16 Dec 2024 13:58:54 -0800 +Subject: [PATCH] [AMDGPU] TargetMachine: increase NameString size to 256 + +128 is too small a default for compilers used to build +AMD's rocBLAS, composable_kernel and similar libs because +they use very long symbol names such as +device_gemm_xdl_universal_bf16_bf16_bf16_mk_nk_mn_comp_default_instance + +This fixes spending ~10% of compile time in malloc inside this function. +--- + llvm/lib/Target/TargetMachine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp +index abd0fdf2390c0..86ce468b75643 100644 +--- a/lib/Target/TargetMachine.cpp ++++ b/lib/Target/TargetMachine.cpp +@@ -270,7 +270,7 @@ MCSymbol *TargetMachine::getSymbol(const GlobalValue *GV) const { + if (MCSymbol *TargetSymbol = TLOF->getTargetSymbol(GV, *this)) + return TargetSymbol; + +- SmallString<128> NameStr; ++ SmallString<256> NameStr; + getNameWithPrefix(NameStr, GV, TLOF->getMangler()); + return TLOF->getContext().getOrCreateSymbol(NameStr); + } diff --git a/pkgs/development/rocm-modules/6/llvm/perf-shorten-gcclib-include-paths.patch b/pkgs/development/rocm-modules/6/llvm/perf-shorten-gcclib-include-paths.patch new file mode 100644 index 0000000000000..a973851725d8e --- /dev/null +++ b/pkgs/development/rocm-modules/6/llvm/perf-shorten-gcclib-include-paths.patch @@ -0,0 +1,57 @@ +From ef6c5b353861be727c98f1319c81d0c6b609d644 Mon Sep 17 00:00:00 2001 +From: Luna Nova +Date: Tue, 17 Dec 2024 04:29:11 -0800 +Subject: [PATCH] HACK: Get canonical GCC include path so doesn't have + ../../../../ + +This allows more of the strings used in compilation to fit inside +fixed size stack allocated buffers instead of spilling into the heap + +--- + clang/lib/Driver/ToolChains/Gnu.cpp | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp +index af9fd46f0ce7b..a63a7a93f6a78 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -3394,29 +3394,33 @@ bool Generic_GCC::addLibStdCXXIncludePaths(Twine IncludeDir, StringRef Triple, + if (!getVFS().exists(IncludeDir)) + return false; + ++ SmallString<260> CanonicalIncludeDir; ++ if (getVFS().getRealPath(IncludeDir, CanonicalIncludeDir)) ++ return false; ++ + // Debian native gcc uses g++-multiarch-incdir.diff which uses + // include/x86_64-linux-gnu/c++/10$IncludeSuffix instead of + // include/c++/10/x86_64-linux-gnu$IncludeSuffix. +- std::string Dir = IncludeDir.str(); + StringRef Include = +- llvm::sys::path::parent_path(llvm::sys::path::parent_path(Dir)); ++ llvm::sys::path::parent_path(llvm::sys::path::parent_path(CanonicalIncludeDir)); + std::string Path = +- (Include + "/" + Triple + Dir.substr(Include.size()) + IncludeSuffix) ++ (Include + "/" + Triple + CanonicalIncludeDir.substr(Include.size()) + IncludeSuffix) + .str(); + if (DetectDebian && !getVFS().exists(Path)) + return false; + + // GPLUSPLUS_INCLUDE_DIR +- addSystemInclude(DriverArgs, CC1Args, IncludeDir); ++ addSystemInclude(DriverArgs, CC1Args, CanonicalIncludeDir); + // GPLUSPLUS_TOOL_INCLUDE_DIR. If Triple is not empty, add a target-dependent + // include directory. + if (DetectDebian) + addSystemInclude(DriverArgs, CC1Args, Path); + else if (!Triple.empty()) + addSystemInclude(DriverArgs, CC1Args, +- IncludeDir + "/" + Triple + IncludeSuffix); ++ CanonicalIncludeDir + "/" + Triple + IncludeSuffix); + // GPLUSPLUS_BACKWARD_INCLUDE_DIR +- addSystemInclude(DriverArgs, CC1Args, IncludeDir + "/backward"); ++ if (getVFS().exists(CanonicalIncludeDir + "/backward")) ++ addSystemInclude(DriverArgs, CC1Args, CanonicalIncludeDir + "/backward"); + return true; + } + diff --git a/pkgs/development/rocm-modules/6/migraphx/default.nix b/pkgs/development/rocm-modules/6/migraphx/default.nix index b1b88b1c170c2..646bddf0fdf33 100644 --- a/pkgs/development/rocm-modules/6/migraphx/default.nix +++ b/pkgs/development/rocm-modules/6/migraphx/default.nix @@ -18,7 +18,8 @@ abseil-cpp, half, nlohmann_json, - msgpack, + boost, + msgpack-cxx, sqlite, oneDNN, blaze, @@ -28,6 +29,7 @@ docutils, ghostscript, python3Packages, + writableTmpDirAsHomeHook, buildDocs ? false, buildTests ? false, gpuTargets ? clr.gpuTargets, @@ -63,7 +65,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -79,9 +81,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-h9cTbrMwHeRGVJS/uHQnCXplNcrBqxbhwz2AcAEso0M="; + hash = "sha256-8iOBoRBygTvn9eX5f9cG0kBHKgKSeflqHkV6Qwh/ruA="; }; + patches = [ + ./msgpack-6-compat.patch + ]; + nativeBuildInputs = [ pkg-config cmake @@ -97,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: { ghostscript python3Packages.sphinx-rtd-theme python3Packages.breathe + writableTmpDirAsHomeHook ]; buildInputs = [ @@ -110,7 +117,8 @@ stdenv.mkDerivation (finalAttrs: { protobuf half nlohmann_json - msgpack + boost + msgpack-cxx sqlite oneDNN' blaze @@ -136,9 +144,6 @@ stdenv.mkDerivation (finalAttrs: { # migraphxs relies on miopen which relies on current composable_kernel # impossible to build with this ON; we can't link both of them even if we package both "-DMIGRAPHX_USE_COMPOSABLEKERNEL=OFF" - "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_omp_LIBRARY=${openmp}/lib" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -166,7 +171,6 @@ stdenv.mkDerivation (finalAttrs: { # Unfortunately, it seems like we have to call make on this manually preInstall = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) make -j$NIX_BUILD_CORES doc cd ../doc/pdf make -j$NIX_BUILD_CORES diff --git a/pkgs/development/rocm-modules/6/migraphx/msgpack-6-compat.patch b/pkgs/development/rocm-modules/6/migraphx/msgpack-6-compat.patch new file mode 100644 index 0000000000000..5c4890a02ce26 --- /dev/null +++ b/pkgs/development/rocm-modules/6/migraphx/msgpack-6-compat.patch @@ -0,0 +1,29 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1dba2c8d..7795ba78 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -358,13 +358,19 @@ target_link_libraries(migraphx PRIVATE nlohmann_json::nlohmann_json) + find_package(SQLite3 REQUIRED) + target_link_libraries(migraphx PRIVATE SQLite::SQLite3) + +-find_package(msgpackc-cxx QUIET) +-if(NOT msgpackc-cxx_FOUND) +- find_package(msgpack REQUIRED) ++# See: https://github.com/msgpack/msgpack-c/wiki/Q%26A#how-to-support-both-msgpack-c-c-version-5x-and-6x- ++# Prefer 6.x (msgpack-cxx) ++find_package(msgpack-cxx) ++if(msgpack-cxx_FOUND) ++ message(STATUS "Found msgpack-cxx (>=6.x)") ++else() ++ find_package(msgpackc-cxx REQUIRED NAMES msgpackc-cxx msgpack) ++ message(STATUS "Found msgpackc-cxx (<=5.x)") ++ add_library(msgpack-cxx ALIAS msgpackc-cxx) + endif() +-target_link_libraries(migraphx PRIVATE msgpackc-cxx) ++target_link_libraries(migraphx PRIVATE msgpack-cxx) + # Make this available to the tests +-target_link_libraries(migraphx INTERFACE $) ++target_link_libraries(migraphx INTERFACE $) + + add_library(migraphx_all_targets INTERFACE) + diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix index d3d64b2605be4..47d79a9bf19c3 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/6/miopen/default.nix @@ -35,41 +35,50 @@ rocm-comgr, roctracer, python3Packages, - # FIXME: should be able to use all clr targets - gpuTargets ? [ + gpuTargets ? clr.localGpuTargets or clr.gpuTargets, + buildDocs ? false, # Needs internet because of rocm-docs-core + buildTests ? false, + withComposableKernel ? composable_kernel.anyMfmaTarget, +}: + +let + # FIXME: cmake files need patched to include this properly + cFlags = "-Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include"; + version = "6.4.3"; + + # Targets outside this list will get + # error: use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD' + supportedTargets = lib.intersectLists [ "gfx900" "gfx906" "gfx908" "gfx90a" "gfx942" + "gfx950" "gfx1030" + "gfx1031" "gfx1100" "gfx1101" "gfx1102" - ], # clr.gpuTargets - buildDocs ? false, # Needs internet because of rocm-docs-core - buildTests ? false, - withComposableKernel ? composable_kernel.anyGfx9Target, -}: - -let - # FIXME: cmake files need patched to include this properly - cFlags = "-O3 -DNDEBUG -Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include"; - version = "6.3.3"; + "gfx1150" + "gfx1151" + "gfx1200" + "gfx1201" + ] gpuTargets; src = fetchFromGitHub { owner = "ROCm"; repo = "MIOpen"; rev = "rocm-${version}"; - hash = "sha256-rX+BE6wBDMnLyc6eai3bDVvmfahomDO0s10n6HhWu7c="; + hash = "sha256-DEcVj2vOwIYYyNKEKFqZ0fb9o+/QRpwiSksxwnmgEMc="; fetchLFS = true; fetchSubmodules = true; # WORKAROUND: .lfsconfig is incorrectly set to exclude everything upstream leaveDotGit = true; + # FIXME: if someone can reduce the level of awful here that would be really nice postFetch = '' export HOME=$(mktemp -d) cd $out - set -x git remote add origin $url git fetch origin +refs/tags/rocm-${version}:refs/tags/rocm-${version} git clean -fdx @@ -78,8 +87,8 @@ let rm .lfsconfig git lfs install git lfs track "*.kdb.bz2" - GIT_TRACE=1 git lfs fetch --include="src/kernels/**" - GIT_TRACE=1 git lfs pull --include="src/kernels/**" + git lfs fetch --include="src/kernels/**" + git lfs pull --include="src/kernels/**" git lfs checkout rm -rf .git @@ -133,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { # Find zstd and add to target. Mainly for torch. patches = [ ./skip-preexisting-dbs.patch - ./fix-isnan.patch # https://github.com/ROCm/MIOpen/pull/3448 (fetchpatch { url = "https://github.com/ROCm/MIOpen/commit/e608b4325646afeabb5e52846997b926d2019d19.patch"; hash = "sha256-oxa3qlIC2bzbwGxrQOZXoY/S7CpLsMrnWRB7Og0tk0M="; @@ -206,9 +214,9 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DGPU_ARCHS=${lib.concatStringsSep ";" gpuTargets}" + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" supportedTargets}" + "-DGPU_TARGETS=${lib.concatStringsSep ";" supportedTargets}" + "-DGPU_ARCHS=${lib.concatStringsSep ";" supportedTargets}" "-DMIOPEN_USE_SQLITE_PERFDB=ON" "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DCMAKE_MODULE_PATH=${clr}/hip/cmake" @@ -272,7 +280,7 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = '' - rm $out/bin/install_precompiled_kernels.sh + rm $out/libexec/miopen/install_precompiled_kernels.sh ln -sf ${gfx900} $out/share/miopen/db/gfx900.kdb ln -sf ${gfx906} $out/share/miopen/db/gfx906.kdb ln -sf ${gfx908} $out/share/miopen/db/gfx908.kdb diff --git a/pkgs/development/rocm-modules/6/miopen/fix-isnan.patch b/pkgs/development/rocm-modules/6/miopen/fix-isnan.patch deleted file mode 100644 index 71c140d57c8ed..0000000000000 --- a/pkgs/development/rocm-modules/6/miopen/fix-isnan.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 17f67e0aa31cd2f1c1cb012d3858abf6956acc72 Mon Sep 17 00:00:00 2001 -From: "Sv. Lockal" -Date: Tue, 24 Dec 2024 14:43:10 +0000 -Subject: [PATCH] Fix missing isnan definition on libstdc++ >=14 systems - -Closes #3441 ---- - driver/reducecalculation_driver.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/driver/reducecalculation_driver.hpp b/driver/reducecalculation_driver.hpp -index 8226b3c953..2001969509 100644 ---- a/driver/reducecalculation_driver.hpp -+++ b/driver/reducecalculation_driver.hpp -@@ -33,6 +33,7 @@ - #include "random.hpp" - #include - #include -+#include - #include - #include - #include -@@ -77,7 +78,7 @@ int32_t mloReduceCalculationForwardRunHost(miopenTensorDescriptor_t inputDesc, - for(size_t i = 0; i < reduce_size; ++i) - { - Tcheck val = static_cast(input[input_idx]); -- if(nanPropagation && isnan(val)) -+ if(nanPropagation && std::isnan(val)) - { - val = 0.0f; - } diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/6/mivisionx/default.nix index 0008b69f404af..324f8d884acf0 100644 --- a/pkgs/development/rocm-modules/6/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/6/mivisionx/default.nix @@ -5,7 +5,6 @@ rocmUpdateScript, cmake, rocm-cmake, - rocm-device-libs, clr, pkg-config, rpp, @@ -42,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "MIVisionX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-SisCbUDCAiWQ1Ue7qrtoT6vO/1ztzqji+3cJD6MXUNw="; + hash = "sha256-07MivgCYmKLnhGDjOYsFBfwIxEoQLYNoRbOo3MPpVzE="; }; patches = [ @@ -58,19 +57,18 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake rocm-cmake - clr pkg-config ] + ++ lib.optionals (!useOpenCL && !useCPU) [ + clr + ] ++ lib.optionals buildDocs [ rocm-docs-core python3Packages.python ]; buildInputs = [ - miopen - migraphx rpp - rocblas openmp half protobuf @@ -83,28 +81,31 @@ stdenv.mkDerivation (finalAttrs: { rapidjson python3Packages.pybind11 python3Packages.numpy - python3Packages.torchWithRocm + ] + ++ lib.optionals (!useOpenCL && !useCPU) [ + miopen + rocblas + migraphx ]; cmakeFlags = [ - "-DROCM_PATH=${clr}" - "-DAMDRPP_PATH=${rpp}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_PREFIX_PYTHON=lib" - "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_omp_LIBRARY=${openmp}/lib" # "-DAMD_FP16_SUPPORT=ON" `error: typedef redefinition with different types ('__half' vs 'half_float::half')` ] ++ lib.optionals (gpuTargets != [ ]) [ "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals (!useOpenCL && !useCPU) [ + "-DROCM_PATH=${clr}" + "-DAMDRPP_PATH=${rpp}" "-DBACKEND=HIP" + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" ] ++ lib.optionals (useOpenCL && !useCPU) [ "-DBACKEND=OCL" @@ -114,17 +115,17 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # We need to not use hipcc and define the CXXFLAGS manually due to `undefined hidden symbol: tensorflow:: ...` - export CXXFLAGS+=" --rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" - # Properly find miopen, fix ffmpeg version detection - substituteInPlace amd_openvx_extensions/CMakeLists.txt \ - --replace-fail "miopen PATHS \''${ROCM_PATH} QUIET" "miopen PATHS ${miopen} QUIET" \ - --replace-fail "\''${ROCM_PATH}/include/miopen/config.h" "${miopen}/include/miopen/config.h" - # Properly find turbojpeg substituteInPlace cmake/FindTurboJpeg.cmake \ --replace-fail "\''${TURBO_JPEG_PATH}/include" "${libjpeg_turbo.dev}/include" \ --replace-fail "\''${TURBO_JPEG_PATH}/lib" "${libjpeg_turbo.out}/lib" + + ${lib.optionalString (!useOpenCL && !useCPU) '' + # Properly find miopen + substituteInPlace amd_openvx_extensions/CMakeLists.txt \ + --replace-fail "miopen PATHS \''${ROCM_PATH} QUIET" "miopen PATHS ${miopen} QUIET" \ + --replace-fail "\''${ROCM_PATH}/include/miopen/config.h" "${miopen}/include/miopen/config.h" + ''} ''; postBuild = lib.optionalString buildDocs '' diff --git a/pkgs/development/rocm-modules/6/rccl/default.nix b/pkgs/development/rocm-modules/6/rccl/default.nix index b4c24708eeced..32c096c475e5d 100644 --- a/pkgs/development/rocm-modules/6/rccl/default.nix +++ b/pkgs/development/rocm-modules/6/rccl/default.nix @@ -7,6 +7,7 @@ rocm-cmake, rocm-smi, rocm-core, + pkg-config, clr, mscclpp, perl, @@ -14,11 +15,14 @@ python3, gtest, chrpath, + roctracer, rocprofiler, rocprofiler-register, autoPatchelfHook, buildTests ? false, gpuTargets ? (clr.localGpuTargets or [ ]), + # for passthru.tests + rccl, }: let @@ -35,7 +39,7 @@ in # infiniband ib_peer_mem support isn't in the mainline kernel but is carried by some distros stdenv.mkDerivation (finalAttrs: { pname = "rccl${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -48,13 +52,14 @@ stdenv.mkDerivation (finalAttrs: { ./fix-mainline-support-and-ub.diff ./enable-mscclpp-on-all-gfx9.diff ./rccl-test-missing-iomanip.diff + ./fix_hw_reg_hw_id_gt_gfx10.patch ]; src = fetchFromGitHub { owner = "ROCm"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-998tDiC0Qp9hhcXtFpiCWqwdKPVT2vNp0GU/rng03Bw="; + hash = "sha256-XpD+UjgdbAoGYK5UvvTX3f8rny4tiEDH/vYoCdZhtjo="; }; nativeBuildInputs = [ @@ -64,12 +69,14 @@ stdenv.mkDerivation (finalAttrs: { perl hipify python3 + pkg-config autoPatchelfHook # ASAN doesn't add rpath without this ]; buildInputs = [ rocm-smi gtest + roctracer rocprofiler rocprofiler-register mscclpp @@ -88,8 +95,9 @@ stdenv.mkDerivation (finalAttrs: { "-DROCM_VERSION=${rocm-core.ROCM_LIBPATCH_VERSION}" "-DBUILD_BFD=OFF" # Can't get it to detect bfd.h "-DENABLE_MSCCL_KERNEL=ON" - "-DENABLE_MSCCLPP=ON" - "-DMSCCLPP_ROOT=${mscclpp}" + # FIXME: this is still running a download because if(NOT mscclpp_nccl_FOUND) is commented out T_T + "-DENABLE_MSCCLPP=OFF" + #"-DMSCCLPP_ROOT=${mscclpp}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -107,11 +115,15 @@ stdenv.mkDerivation (finalAttrs: { # -O2 and -fno-strict-aliasing due to UB issues in RCCL :c # Reported upstream - env.CFLAGS = "-I${clr}/include -O2 -fno-strict-aliasing ${san}-fno-omit-frame-pointer -momit-leaf-frame-pointer"; - env.CXXFLAGS = "-I${clr}/include -O2 -fno-strict-aliasing ${san}-fno-omit-frame-pointer -momit-leaf-frame-pointer"; + env.CFLAGS = "-I${clr}/include -I${roctracer}/include -O2 -fno-strict-aliasing ${san}-fno-omit-frame-pointer -momit-leaf-frame-pointer"; + env.CXXFLAGS = "-I${clr}/include -I${roctracer}/include -O2 -fno-strict-aliasing ${san}-fno-omit-frame-pointer -momit-leaf-frame-pointer"; env.LDFLAGS = "${san}"; postPatch = '' patchShebangs src tools + substituteInPlace CMakeLists.txt \ + --replace-fail '${"\${HOST_OS_ID}"}' '"ubuntu"' \ + --replace-fail 'target_include_directories(rccl PRIVATE ''${ROCM_SMI_INCLUDE_DIR})' \ + 'target_include_directories(rccl PRIVATE ''${ROCM_SMI_INCLUDE_DIRS})' ''; postInstall = @@ -130,6 +142,12 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs.src) repo; }; + # This package with sanitizers + manual integration test binaries built + # must be ran manually + passthru.tests.rccl = rccl.override { + buildTests = true; + }; + meta = with lib; { description = "ROCm communication collectives library"; homepage = "https://github.com/ROCm/rccl"; diff --git a/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff b/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff index 15efac82c5abd..e65b23940c4cf 100644 --- a/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff +++ b/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff @@ -92,13 +92,7 @@ index 6d77784..49762d3 100644 } if (moduleLoaded == -1) { -@@ -586,13 +586,14 @@ ncclResult_t ncclIbGdrSupport() { - // or created under a different path like `/sys/kernel/` or `/sys/` (depending on your ib_peer_mem module) - const char* memory_peers_paths[] = {"/sys/kernel/mm/memory_peers/amdkfd/version", - "/sys/kernel/memory_peers/amdkfd/version", -- "/sys/memory_peers/amdkfd/version"}; -+ "/sys/memory_peers/amdkfd/version", -+ NULL}; +@@ -586,9 +586,9 @@ ncclResult_t ncclIbGdrSupport() { int i = 0; while (memory_peers_paths[i]) { diff --git a/pkgs/development/rocm-modules/6/rccl/fix_hw_reg_hw_id_gt_gfx10.patch b/pkgs/development/rocm-modules/6/rccl/fix_hw_reg_hw_id_gt_gfx10.patch new file mode 100644 index 0000000000000..c69000814a8a6 --- /dev/null +++ b/pkgs/development/rocm-modules/6/rccl/fix_hw_reg_hw_id_gt_gfx10.patch @@ -0,0 +1,33 @@ +fix: __trace_hwreg should use HW_REG_HW_ID1 for all gfx10/11/12 +diff --git a/src/device/common.h b/src/device/common.h +index c6c61021..742885f4 100644 +--- a/src/device/common.h ++++ b/src/device/common.h +@@ -26,8 +26,9 @@ + { __atomic_store_n((DST), (SRC), __ATOMIC_SEQ_CST); } + #endif + +-#if defined(__gfx1100__) || defined(__gfx1101__) || defined(__gfx1102__) || defined(__gfx1200__) || defined(__gfx1201__) +-#define __trace_hwreg() ++#if defined(__GFX10__) || defined(__GFX11__) || defined(__GFX12__) ++#define __trace_hwreg() \ ++ asm volatile ("s_getreg_b32 %0, hwreg(HW_REG_HW_ID1)" : "=s" (collTrace->data_0)); + #else + #define __trace_hwreg() \ + asm volatile ("s_getreg_b32 %0, hwreg(HW_REG_HW_ID)" : "=s" (collTrace->data_0)); +diff --git a/tools/JitterBench/Common.hpp b/tools/JitterBench/Common.hpp +index bad12a1b..b59856a8 100644 +--- a/tools/JitterBench/Common.hpp ++++ b/tools/JitterBench/Common.hpp +@@ -43,9 +43,9 @@ THE SOFTWARE. + #endif + + // Macro for collecting HW_REG_HW_ID +-#if defined(__gfx1100__) || defined(__gfx1101__) || defined(__gfx1102__) || defined(__NVCC__) ++#if defined(__GFX10__) || defined(__GFX11__) || defined(__GFX12__) + #define GetHwId(val) \ +- val = 0 ++ asm volatile ("s_getreg_b32 %0, hwreg(HW_REG_HW_ID1)" : "=s" (val)); + #else + #define GetHwId(val) \ + asm volatile ("s_getreg_b32 %0, hwreg(HW_REG_HW_ID)" : "=s" (val)); diff --git a/pkgs/development/rocm-modules/6/rdc/default.nix b/pkgs/development/rocm-modules/6/rdc/default.nix index 36f85f90c3dc6..315e922feb5ae 100644 --- a/pkgs/development/rocm-modules/6/rdc/default.nix +++ b/pkgs/development/rocm-modules/6/rdc/default.nix @@ -48,7 +48,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rdc"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-s/31b8/Kn5l1QJ941UMSB8SCzpvODsPfOLMmEBUYYmY="; + hash = "sha256-zILZPW9Lx5T+cMDqTg/zWy3ro+Nypzc9bDNTupZjt4s="; }; nativeBuildInputs = [ @@ -95,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_VERBOSE_MAKEFILE=OFF" "-DRDC_INSTALL_PREFIX=${placeholder "out"}" + "-DBUILD_RVS=OFF" # TODO: Needs RVS package "-DBUILD_ROCRTEST=ON" "-DRSMI_INC_DIR=${rocm-smi}/include" "-DRSMI_LIB_DIR=${rocm-smi}/lib" diff --git a/pkgs/development/rocm-modules/6/rocalution/default.nix b/pkgs/development/rocm-modules/6/rocalution/default.nix index c0b7222747fd4..0fbf4025bf3fb 100644 --- a/pkgs/development/rocm-modules/6/rocalution/default.nix +++ b/pkgs/development/rocm-modules/6/rocalution/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocALUTION"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-xdZ3HUiRGsreHfJH8RgL/s3jGyC5ABmBKcEfgtqWg8Y="; + hash = "sha256-bZx1Cc2jcIfysohKCKzj5mowM3IeCelRhVaBU73KnTo="; }; nativeBuildInputs = [ @@ -65,11 +65,7 @@ stdenv.mkDerivation (finalAttrs: { gtest ]; - CXXFLAGS = "-I${openmp.dev}/include"; cmakeFlags = [ - "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_omp_LIBRARY=${openmp}/lib" "-DROCM_PATH=${clr}" "-DHIP_ROOT_DIR=${clr}" "-DSUPPORT_HIP=ON" diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index b155bfebcc86b..768ab094b38f6 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -4,12 +4,14 @@ fetchFromGitHub, fetchpatch, rocmUpdateScript, + writableTmpDirAsHomeHook, cmake, rocm-cmake, clr, python3, tensile, - msgpack, + boost, + msgpack-cxx, libxml2, gtest, gfortran, @@ -17,46 +19,19 @@ git, amd-blis, zstd, + roctracer, hipblas-common, hipblaslt, python3Packages, rocm-smi, + pkg-config, buildTensile ? true, buildTests ? true, buildBenchmarks ? true, - # https://github.com/ROCm/Tensile/issues/1757 - # Allows gfx101* users to use rocBLAS normally. - # Turn the below two values to `true` after the fix has been cherry-picked - # into a release. Just backporting that single fix is not enough because it - # depends on some previous commits. tensileSepArch ? true, tensileLazyLib ? true, withHipBlasLt ? true, - # `gfx940`, `gfx941` are not present in this list because they are early - # engineering samples, and all final MI300 hardware are `gfx942`: - # https://github.com/NixOS/nixpkgs/pull/298388#issuecomment-2032791130 - # - # `gfx1012` is not present in this list because the ISA compatibility patches - # would force all `gfx101*` GPUs to run as `gfx1010`, so `gfx101*` GPUs will - # always try to use `gfx1010` code objects, hence building for `gfx1012` is - # useless: https://github.com/NixOS/nixpkgs/pull/298388#issuecomment-2076327152 - gpuTargets ? ( - clr.localGpuTargets or [ - "gfx900" - "gfx906" - "gfx908" - "gfx90a" - "gfx942" - "gfx1010" - "gfx1030" - "gfx1100" - "gfx1101" - "gfx1102" - "gfx1151" - "gfx1200" - "gfx1201" - ] - ), + gpuTargets ? (clr.localGpuTargets or clr.gpuTargets), }: let @@ -64,17 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocblas${clr.gpuArchSuffix}"; - version = "6.3.3"; - - outputs = [ - "out" - ]; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-IYcrVcGH4yZDkFZeNOJPfG0qsPS/WiH0fTSUSdo1BH4="; + hash = "sha256-FCzo/BOk4xLEFkdOdqcCXh4a9t3/OIIBEy8oz6oOMWg="; }; nativeBuildInputs = [ @@ -83,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { rocm-cmake clr git + pkg-config ] ++ lib.optionals buildTensile [ tensile @@ -91,13 +63,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ python3 hipblas-common + roctracer + openmp + amd-blis ] ++ lib.optionals withHipBlasLt [ hipblaslt ] ++ lib.optionals buildTensile [ zstd - msgpack + msgpack-cxx libxml2 python3Packages.msgpack python3Packages.zstandard @@ -107,27 +82,19 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (buildTests || buildBenchmarks) [ gfortran - openmp - amd-blis rocm-smi ] ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [ python3Packages.pyyaml ]; - dontStrip = true; - env.CXXFLAGS = - "-O3 -DNDEBUG -I${hipblas-common}/include" - + lib.optionalString (buildTests || buildBenchmarks) " -I${amd-blis}/include/blis"; - # Fails to link tests if we don't add amd-blis libs - env.LDFLAGS = lib.optionalString ( - buildTests || buildBenchmarks - ) "-Wl,--as-needed -L${amd-blis}/lib -lblis-mt -lcblas"; + env.CXXFLAGS = "-fopenmp -I${lib.getDev boost}/include -I${hipblas-common}/include -I${roctracer}/include"; + # Fails to link tests with undefined symbol: cblas_* + env.LDFLAGS = lib.optionalString (buildTests || buildBenchmarks) "-Wl,--as-needed -lcblas"; env.TENSILE_ROCM_ASSEMBLER_PATH = "${stdenv.cc}/bin/clang++"; cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") - (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) + (lib.cmakeFeature "Boost_INCLUDE_DIR" "${lib.getDev boost}/include") # msgpack FindBoost fails to find boost (lib.cmakeFeature "CMAKE_EXECUTE_PROCESS_COMMAND_ECHO" "STDERR") (lib.cmakeFeature "CMAKE_Fortran_COMPILER" "${lib.getBin gfortran}/bin/gfortran") (lib.cmakeFeature "CMAKE_Fortran_COMPILER_AR" "${lib.getBin gfortran}/bin/ar") @@ -144,8 +111,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks) (lib.cmakeBool "BUILD_CLIENTS_SAMPLES" buildBenchmarks) (lib.cmakeBool "BUILD_OFFLOAD_COMPRESS" true) - # Temporarily set variables to work around upstream CMakeLists issue - # Can be removed once https://github.com/ROCm/rocm-cmake/issues/121 is fixed + # # Temporarily set variables to work around upstream CMakeLists issue + # # Can be removed once https://github.com/ROCm/rocm-cmake/issues/121 is fixed "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" @@ -153,6 +120,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals buildTensile [ "-DCPACK_SET_DESTDIR=OFF" "-DLINK_BLIS=ON" + "-DBLIS_LIB=${amd-blis}/lib/libblis-mt.so" + "-DBLIS_INCLUDE_DIR=${amd-blis}/include/blis/" + "-DBLA_PREFER_PKGCONFIG=ON" "-DTensile_CODE_OBJECT_VERSION=default" "-DTensile_LOGIC=asm_full" "-DTensile_LIBRARY_FORMAT=msgpack" @@ -169,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/GZGavinZhao/rocBLAS/commit/89b75ff9cc731f71f370fad90517395e117b03bb.patch"; hash = "sha256-W/ohOOyNCcYYLOiQlPzsrTlNtCBdJpKVxO8s+4G7sjo="; }) + ./hiplaslt-unstable-compat.patch ]; # Pass $NIX_BUILD_CORES to Tensile @@ -176,7 +147,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace cmake/build-options.cmake \ --replace-fail 'Tensile_CPU_THREADS ""' 'Tensile_CPU_THREADS "$ENV{NIX_BUILD_CORES}"' substituteInPlace CMakeLists.txt \ - --replace-fail "4.42.0" "4.43.0" + --replace-fail "4.43.0" "4.44.0" \ + --replace-fail '0.10' '1.0' ''; passthru.updateScript = rocmUpdateScript { diff --git a/pkgs/development/rocm-modules/6/rocblas/hiplaslt-unstable-compat.patch b/pkgs/development/rocm-modules/6/rocblas/hiplaslt-unstable-compat.patch new file mode 100644 index 0000000000000..4d8c885c8d398 --- /dev/null +++ b/pkgs/development/rocm-modules/6/rocblas/hiplaslt-unstable-compat.patch @@ -0,0 +1,99 @@ +diff --git a/library/src/hipblaslt_host.cpp b/library/src/hipblaslt_host.cpp +index 8080070c..97d5216e 100644 +--- a/library/src/hipblaslt_host.cpp ++++ b/library/src/hipblaslt_host.cpp +@@ -155,22 +155,22 @@ namespace + hipblaslt_compute_type); + + hipblaslt_ext::GemmProblemType problemType; +- problemType.op_a = (hipblasOperation_t)prob.trans_a; +- problemType.op_b = (hipblasOperation_t)prob.trans_b; +- problemType.type_a = hipblaslt_datatype; +- problemType.type_b = hipblaslt_datatype; +- problemType.type_c = hipblaslt_datatype; +- problemType.type_d = hipblaslt_datatype; +- problemType.type_compute = hipblaslt_compute_type; ++ problemType.setOpA((hipblasOperation_t)prob.trans_a); ++ problemType.setOpB((hipblasOperation_t)prob.trans_b); ++ problemType.setTypeA(hipblaslt_datatype); ++ problemType.setTypeB(hipblaslt_datatype); ++ problemType.setTypeC(hipblaslt_datatype); ++ problemType.setTypeD(hipblaslt_datatype); ++ problemType.setTypeCompute(hipblaslt_compute_type); + + hipblaslt_ext::GemmEpilogue epilogue; + hipblaslt_ext::GemmInputs inputs; +- inputs.a = (void*)(prob.A + prob.buffer_offset_a); +- inputs.b = (void*)(prob.B + prob.buffer_offset_b); +- inputs.c = (void*)(prob.C + prob.buffer_offset_c); +- inputs.d = (void*)(prob.D + prob.buffer_offset_d); +- inputs.alpha = (void*)prob.alpha; +- inputs.beta = (void*)prob.beta; ++ inputs.setA((void*)(prob.A + prob.buffer_offset_a)); ++ inputs.setB((void*)(prob.B + prob.buffer_offset_b)); ++ inputs.setC((void*)(prob.C + prob.buffer_offset_c)); ++ inputs.setD((void*)(prob.D + prob.buffer_offset_d)); ++ inputs.setAlpha((void*)prob.alpha); ++ inputs.setBeta((void*)prob.beta); + + gemm.setProblem(prob.m, + prob.n, +@@ -214,13 +214,13 @@ namespace + hipblaslt_compute_type); + + hipblaslt_ext::GemmProblemType problemType; +- problemType.op_a = (hipblasOperation_t)prob.trans_a; +- problemType.op_b = (hipblasOperation_t)prob.trans_b; +- problemType.type_a = hipblaslt_datatype; +- problemType.type_b = hipblaslt_datatype; +- problemType.type_c = hipblaslt_datatype; +- problemType.type_d = hipblaslt_datatype; +- problemType.type_compute = hipblaslt_compute_type; ++ problemType.setOpA((hipblasOperation_t)prob.trans_a); ++ problemType.setOpB((hipblasOperation_t)prob.trans_b); ++ problemType.setTypeA(hipblaslt_datatype); ++ problemType.setTypeB(hipblaslt_datatype); ++ problemType.setTypeC(hipblaslt_datatype); ++ problemType.setTypeD(hipblaslt_datatype); ++ problemType.setTypeCompute(hipblaslt_compute_type); + + std::vector Ms(prob.batch_count); + std::vector Ns(prob.batch_count); +@@ -251,12 +251,12 @@ namespace + stridecs[batch] = prob.batch_stride_c; + strideds[batch] = prob.batch_stride_d; + batch_counts[batch] = 1; +- inputs[batch].a = (void*)(prob.batch_A[batch] + prob.buffer_offset_a); +- inputs[batch].b = (void*)(prob.batch_B[batch] + prob.buffer_offset_b); +- inputs[batch].c = (void*)(prob.batch_C[batch] + prob.buffer_offset_c); +- inputs[batch].d = (void*)(prob.batch_D[batch] + prob.buffer_offset_d); +- inputs[batch].alpha = (void*)prob.alpha; +- inputs[batch].beta = (void*)prob.beta; ++ inputs[batch].setA((void*)(prob.batch_A[batch] + prob.buffer_offset_a)); ++ inputs[batch].setB((void*)(prob.batch_B[batch] + prob.buffer_offset_b)); ++ inputs[batch].setC((void*)(prob.batch_C[batch] + prob.buffer_offset_c)); ++ inputs[batch].setD((void*)(prob.batch_D[batch] + prob.buffer_offset_d)); ++ inputs[batch].setAlpha((void*)prob.alpha); ++ inputs[batch].setBeta((void*)prob.beta); + } + + gemm.setProblem(Ms, +diff --git a/library/src/tensile_host.cpp b/library/src/tensile_host.cpp +index 1b1289f3..ed463725 100644 +--- a/library/src/tensile_host.cpp ++++ b/library/src/tensile_host.cpp +@@ -271,14 +271,6 @@ namespace + { + return Tensile::LazyLoadingInit::gfx90a; + } +- else if(deviceString.find("gfx940") != std::string::npos) +- { +- return Tensile::LazyLoadingInit::gfx940; +- } +- else if(deviceString.find("gfx941") != std::string::npos) +- { +- return Tensile::LazyLoadingInit::gfx941; +- } + else if(deviceString.find("gfx942") != std::string::npos) + { + return Tensile::LazyLoadingInit::gfx942; diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix index cd07af5d4cdf8..0140218222a7b 100644 --- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix @@ -12,6 +12,7 @@ texliveSmall, doxygen, graphviz, + writableTmpDirAsHomeHook, buildDocs ? true, }: @@ -52,7 +53,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocdbgapi"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "ROCdbgapi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-6itfBrWVspobU47aiJAOQoxT8chwrq9scRn0or3bXto="; + hash = "sha256-Rr8+SNeFps0rjk4Jn2+rFmtRJfL42l0tNOz13oZQy+I="; }; # FIXME: remove once https://github.com/doxygen/doxygen/issues/11634 is resolved @@ -84,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { git ] ++ lib.optionals buildDocs [ + writableTmpDirAsHomeHook latex doxygen graphviz @@ -106,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: { # Unfortunately, it seems like we have to call make on this manually postBuild = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) make -j$NIX_BUILD_CORES doc ''; diff --git a/pkgs/development/rocm-modules/6/rocfft/default.nix b/pkgs/development/rocm-modules/6/rocfft/default.nix index dc64f6bf3e933..0f948250297c6 100644 --- a/pkgs/development/rocm-modules/6/rocfft/default.nix +++ b/pkgs/development/rocm-modules/6/rocfft/default.nix @@ -14,18 +14,19 @@ gtest, openmp, rocrand, + hiprand, gpuTargets ? clr.localGpuTargets or clr.gpuTargets, }: stdenv.mkDerivation (finalAttrs: { pname = "rocfft${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-RrxdwZ64uC7lQzyJI1eGHX2dmRnW8TfNThnuvuz5XWo="; + hash = "sha256-yaOjBF2aJkCBlxkydyOsrfT4lNZ0BVkS2jJC0fEiBug="; }; nativeBuildInputs = [ @@ -35,14 +36,23 @@ stdenv.mkDerivation (finalAttrs: { rocm-cmake ]; - # FIXME: rocfft_aot_helper runs at the end of the build and has a risk of timing it out - # due to a long period with no terminal output - buildInputs = [ sqlite ]; + buildInputs = [ + sqlite + hiprand + ]; + + patches = [ + # Fixes build timeout due to no log output during rocfft_aot step + ./log-every-n-aot-jobs.patch + ]; cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" "-DSQLITE_USE_SYSTEM_PACKAGE=ON" + "-DHIP_PLATFORM=amd" + "-DBUILD_CLIENTS=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DUSE_HIPRAND=ON" + "-DROCFFT_KERNEL_CACHE_ENABLE=ON" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -50,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_INCLUDEDIR=include" ] ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ]; passthru = { @@ -74,11 +84,7 @@ stdenv.mkDerivation (finalAttrs: { gtest openmp rocrand - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" + hiprand ]; postInstall = '' @@ -112,11 +118,6 @@ stdenv.mkDerivation (finalAttrs: { rocrand ]; - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ]; - postInstall = '' cp -a ../../../scripts/perf "$out/bin" ''; @@ -141,11 +142,6 @@ stdenv.mkDerivation (finalAttrs: { rocrand ]; - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ]; - installPhase = '' runHook preInstall mkdir "$out" diff --git a/pkgs/development/rocm-modules/6/rocfft/log-every-n-aot-jobs.patch b/pkgs/development/rocm-modules/6/rocfft/log-every-n-aot-jobs.patch new file mode 100644 index 0000000000000..266f495d3e7c0 --- /dev/null +++ b/pkgs/development/rocm-modules/6/rocfft/log-every-n-aot-jobs.patch @@ -0,0 +1,35 @@ +diff --git a/library/src/rocfft_aot_helper.cpp b/library/src/rocfft_aot_helper.cpp +index f0a889f4..452eb37f 100644 +--- a/library/src/rocfft_aot_helper.cpp ++++ b/library/src/rocfft_aot_helper.cpp +@@ -771,26 +771,22 @@ int main(int argc, char** argv) + for(size_t i = 0; i < NUM_THREADS; ++i) + { + threads.emplace_back([&queue, &gpu_archs]() { ++ int compile_count = 0; + while(true) + { + auto item = queue.pop(); + if(item.kernel_name.empty()) + break; + ++ if(++compile_count % 16 == 0) ++ std::cerr << "rocfft_aot_helper processing " << item.kernel_name << std::endl << std::flush; + for(const auto& gpu_arch : gpu_archs) + { +- if(item.sol_arch_name.empty()) ++ if(item.sol_arch_name.empty() || gpu_arch.find(item.sol_arch_name) != std::string::npos) + { + RTCCache::cached_compile( + item.kernel_name, gpu_arch, item.generate_src, generator_sum()); + } +- else if(gpu_arch.find(item.sol_arch_name) != std::string::npos) +- { +- // std::cout << "arch: " << gpu_arch +- // << ", solution-kernel: " << item.kernel_name << std::endl; +- RTCCache::cached_compile( +- item.kernel_name, gpu_arch, item.generate_src, generator_sum()); +- } + } + } + }); diff --git a/pkgs/development/rocm-modules/6/rocgdb/default.nix b/pkgs/development/rocm-modules/6/rocgdb/default.nix index 8e009e583b08c..96909655c5c29 100644 --- a/pkgs/development/rocm-modules/6/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/6/rocgdb/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCgdb"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Z+uk+ViLXgk5hXrIhVHRY0Kly7mktYms7M3o9Tmxv8s="; + hash = "sha256-evDWg2w2FHv6OU5BQOCAXTlDm7JpwdJ3Wh5a2i5r1gQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix b/pkgs/development/rocm-modules/6/rocm-cmake/default.nix index 23a48dcd55b2b..8ccc8ff182adb 100644 --- a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-cmake/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-cmake"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-U4vGkH2iUlNJkqiNmVuFianD4WR9yuGvZsYG58smg0k="; + hash = "sha256-wAipNWAB66YNf7exLSNPAzg3NgkGD9LPKfKiulL5yak="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix index 58b35a1a7621a..de0b2434cfacf 100644 --- a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { }) #[Comgr] Extend ISA compatibility for CCOB (fetchpatch { - sha256 = "sha256-6Rwz12Lk4R2JK3olii3cr2Zd0ZLYe7VSpK1YRCOsJWY="; - url = "https://github.com/GZGavinZhao/rocm-llvm-project/commit/2d8c459a4d4c0567a7a275b4b54560d88e5c6919.patch"; + sha256 = "sha256-PCi0QHLiEQCTIYRtSSbhOjXANJ3zC3VLdMED1BEfQeg="; + url = "https://github.com/GZGavinZhao/rocm-llvm-project/commit/fa80abb77d5ae6f8d89ab956e7ebda9c802a804f.patch"; relative = "amd/comgr"; }) ]; diff --git a/pkgs/development/rocm-modules/6/rocm-core/default.nix b/pkgs/development/rocm-modules/6/rocm-core/default.nix index 8f5100ec0000c..6c0e178aad866 100644 --- a/pkgs/development/rocm-modules/6/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-core/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocm-core"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-core"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-UDnPGvgwzwv49CzF+Kt0v95CsxS33BZeqNcKw1K6jRI="; + hash = "sha256-Z21k+0vi/P35WTHGAdfUAX7/jVv+d9g5YBo+HTi1Mpk="; }; patches = [ diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix index 748b53914e7bb..9bdc8d1865334 100644 --- a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, cmake, ninja, libxml2, @@ -30,7 +31,14 @@ stdenv.mkDerivation { cd amd/device-libs ''; - patches = [ ./cmake.patch ]; + patches = [ + ./cmake.patch + (fetchpatch { + name = "cmake-4-compat-dont-set-cmp0053.patch"; + url = "https://github.com/ROCm/llvm-project/commit/a18cc4c7cb51f94182b6018c7c73acde1b8ebddb.patch"; + hash = "sha256-LNT7srxd4gXDAJ6lSsJXKnRQKSepkAbHeRNH+eZYIFk="; + }) + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix index c86fa10cdff40..c8329621d5f68 100644 --- a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix @@ -24,14 +24,14 @@ # FIXME: Move to rocmPackages_common buildPythonPackage rec { pname = "rocm-docs-core"; - version = "1.17.0"; + version = "1.23.0"; format = "pyproject"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-docs-core"; rev = "v${version}"; - hash = "sha256-fGRJyQq0Eook1Dc9Qy+dehQ5BVNX+6pkkFN9adb21Eo="; + hash = "sha256-5Qh83eJ9vju/uUb9gGA4B5Bh1WZCygIRbSnaEZzIdbw="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index c40f270699ce0..2bc797759af30 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -19,17 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-du20+5VNYgwchGO7W7FIVebBqLPtfSBnmPVbPpgEZjo="; + hash = "sha256-zs0nydwYUY+8uiPyJxgTfAiV7spUMbESb0jUUvFf+AU="; }; - env.CFLAGS = "-I${numactl.dev}/include -I${elfutils.dev}/include -w"; - env.CXXFLAGS = "-I${numactl.dev}/include -I${elfutils.dev}/include -w"; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + __structuredAttrs = true; nativeBuildInputs = [ pkg-config @@ -56,17 +57,17 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ + (fetchpatch { + # rocr: Extend HIP ISA compatibility check + sha256 = "sha256-8r2Lb5lBfFaZC3knCxfXGcnkzNv6JxOKyJn2rD5gus4="; + url = "https://github.com/GZGavinZhao/ROCR-Runtime/commit/7c63e7185d8fcf08537a278908946145f6231121.patch"; + }) # Patches for UB at runtime https://github.com/ROCm/ROCR-Runtime/issues/272 (fetchpatch { # [PATCH] hsa-runtime: set underlying type of hsa_region_info_t and hsa_amd_region_info_t to int url = "https://github.com/ROCm/ROCR-Runtime/commit/39a6a168fa07e289a10f6e20e6ead4e303e99ba0.patch"; hash = "sha256-CshJJDvII1nNyNmt+YjwMwfBHUTlrdsxkhwfgBwO+WE="; }) - (fetchpatch { - # [PATCH] rocr: refactor of runtime.cpp based on Coverity - url = "https://github.com/ROCm/ROCR-Runtime/commit/441bd9fe6c7bdb5c4c31f71524ed642786bc923e.patch"; - hash = "sha256-7bQXxGkipzgT2aXRxCuh3Sfmo/zc/IOmA0x1zB+fMb0="; - }) (fetchpatch { # [PATCH] queues: fix UB due to 1 << 31 url = "https://github.com/ROCm/ROCR-Runtime/commit/9b8a0f5dbee1903fa990a7d8accc1c5fbc549636.patch"; @@ -82,6 +83,9 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/ROCR-Runtime/commit/41bfc66aef437a5b349f71105fa4b907cc7e17d5.patch"; hash = "sha256-A7VhPR3eSsmjq2cTBSjBIz9i//WiNjoXm0EsRKtF+ns="; }) + # This causes a circular dependency, aqlprofile relies on hsa-runtime64 + # which is part of rocm-runtime + # Worked around by having rocprofiler load aqlprofile directly ./remove-hsa-aqlprofile-dep.patch ]; diff --git a/pkgs/development/rocm-modules/6/rocm-smi/default.nix b/pkgs/development/rocm-modules/6/rocm-smi/default.nix index 981c3ca6f892c..f146d6f9fb43e 100644 --- a/pkgs/development/rocm-modules/6/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-smi/default.nix @@ -3,26 +3,35 @@ stdenv, fetchFromGitHub, rocmUpdateScript, + pkg-config, + libdrm, cmake, wrapPython, }: stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-j9pkyUt+p6IkhawIhiTymqDBydxXZunxmdyCyRN0RxE="; + hash = "sha256-yJ3Bf+tM39JWbY+A0NlpHNkvythdAdz6ZVp1AvLcXhk="; }; - patches = [ ./cmake.patch ]; + patches = [ + ./cmake.patch + ]; + + propagatedBuildInputs = [ + libdrm + ]; nativeBuildInputs = [ cmake wrapPython + pkg-config ]; cmakeFlags = [ @@ -33,11 +42,21 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; - postInstall = '' - wrapPythonProgramsIn $out - mv $out/libexec/rocm_smi/.rsmiBindingsInit.py-wrapped $out/libexec/rocm_smi/rsmiBindingsInit.py - mv $out/libexec/rocm_smi/.rsmiBindings.py-wrapped $out/libexec/rocm_smi/rsmiBindings.py - ''; + postInstall = + # wrap python programs, but undo two that need to be importable at that path + '' + wrapPythonProgramsIn $out + mv $out/libexec/rocm_smi/.rsmiBindingsInit.py-wrapped $out/libexec/rocm_smi/rsmiBindingsInit.py + mv $out/libexec/rocm_smi/.rsmiBindings.py-wrapped $out/libexec/rocm_smi/rsmiBindings.py + '' + # workaround: propagate libdrm/ manually + # rocmcxx doesn't automatically add buildInputs to isystem include path like + # wrapper based toolchains, cmake files often don't find_package(rocm-smi) so + # can't rely on cmake propagated interface + # upstream have been shipping libdrm copied into /opt/rocm + + '' + ln -s ${libdrm.dev}/include/libdrm/ $out/include/ + ''; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/6/rocminfo/default.nix index 18166bc780df0..e3e76b4fd35f8 100644 --- a/pkgs/development/rocm-modules/6/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/6/rocminfo/default.nix @@ -9,25 +9,17 @@ busybox, python3, gnugrep, - clr, # Only for localGpuTargets - # rocminfo requires that the calling user have a password and be in - # the video group. If we let rocm_agent_enumerator rely upon - # rocminfo's output, then it, too, has those requirements. Instead, - # we can specify the GPU targets for this system (e.g. "gfx803" for - # Polaris) such that no system call is needed for downstream - # compilers to determine the desired target. - defaultTargets ? (clr.localGpuTargets or [ ]), }: stdenv.mkDerivation (finalAttrs: { - version = "6.3.3"; + version = "6.4.3"; pname = "rocminfo"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocminfo"; rev = "rocm-${finalAttrs.version}"; - sha256 = "sha256-fQPtO5TNbCbaZZ7VtGkkqng5QZ+FcScdh1opWr5YkLU="; + sha256 = "sha256-YscZ5sFsLOVBg98w2X6vTzniTvl9NfCkIE+HAH6vv5Y="; }; strictDeps = true; @@ -46,10 +38,6 @@ stdenv.mkDerivation (finalAttrs: { sed 's,lsmod | grep ,${busybox}/bin/lsmod | ${gnugrep}/bin/grep ,' -i rocminfo.cc ''; - postInstall = lib.optionalString (defaultTargets != [ ]) '' - echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst - ''; - passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; inherit (finalAttrs.src) owner; diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/6/rocmlir/default.nix index 480b9d2fa48dd..281b75f76814f 100644 --- a/pkgs/development/rocm-modules/6/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/6/rocmlir/default.nix @@ -5,7 +5,6 @@ rocmUpdateScript, cmake, rocm-cmake, - rocminfo, clr, git, libxml2, @@ -41,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -54,13 +53,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-0SQ6uLDRfVfdCX+8a7D6pu6dYlFvX0HFzCDEvlKYfak="; + hash = "sha256-p/gvr1Z6yZtO5N+ecSouXiCrf520jt1HMOy/tohUHfI="; }; nativeBuildInputs = [ cmake rocm-cmake - clr python3Packages.python python3Packages.tomli ]; @@ -77,10 +75,6 @@ stdenv.mkDerivation (finalAttrs: { ncurses ]; - patches = [ - ./initparamdata-sort-const.patch - ]; - cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" "-DCMAKE_BUILD_TYPE=Release" @@ -109,12 +103,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace mlir/lib/Analysis/BufferDependencyAnalysis.cpp \ --replace-fail "enum EffectType { read, write, unknown };" "enum class EffectType { read, write, unknown };" - # remove when no longer required - substituteInPlace mlir/test/{e2e/generateE2ETest.py,fusion/e2e/generate-fusion-tests.py} \ - --replace-fail "\"/opt/rocm/bin" "\"${rocminfo}/bin" - substituteInPlace mlir/utils/performance/common/CMakeLists.txt \ - --replace-fail "/opt/rocm" "${clr}" + --replace-fail " PATHS /opt/rocm" "" ''; dontBuild = true; diff --git a/pkgs/development/rocm-modules/6/rocmlir/initparamdata-sort-const.patch b/pkgs/development/rocm-modules/6/rocmlir/initparamdata-sort-const.patch deleted file mode 100644 index 37f521f6e02d7..0000000000000 --- a/pkgs/development/rocm-modules/6/rocmlir/initparamdata-sort-const.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mlir/include/mlir/Dialect/Rock/Tuning/GridwiseGemmParams.h b/mlir/include/mlir/Dialect/Rock/Tuning/GridwiseGemmParams.h -index 3f5ee596819a..590d53788822 100644 ---- a/mlir/include/mlir/Dialect/Rock/Tuning/GridwiseGemmParams.h -+++ b/mlir/include/mlir/Dialect/Rock/Tuning/GridwiseGemmParams.h -@@ -209,7 +209,7 @@ private: - size_t original_pos; - int64_t padding_amount; - -- bool operator<(const InitParamData &rhs) { -+ bool operator<(const InitParamData &rhs) const { - if (this->padding_amount < rhs.padding_amount) { - return true; - } else if (this->padding_amount == rhs.padding_amount) { diff --git a/pkgs/development/rocm-modules/6/rocprim/default.nix b/pkgs/development/rocm-modules/6/rocprim/default.nix index 1b92663403c4c..567fe7b6ae97c 100644 --- a/pkgs/development/rocm-modules/6/rocprim/default.nix +++ b/pkgs/development/rocm-modules/6/rocprim/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-0aHxpBuYIYhI2UER45YhHHL5YcxA+XeXoihcUs2AmCo="; + hash = "sha256-lH4MlBEkVJocq1VliGBtb7VvWfS6p/uIKWR239fSjRY="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" + "-DHIP_CXX_COMPILER=amdclang++" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" diff --git a/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix index 64ef999a506c5..7a3a0b004c974 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix @@ -18,22 +18,29 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler-register"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler-register"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-UZsCiGnudsbL1v5lKBx7Vz3/HRnGn4f86Pd+qu3ryh0="; + hash = "sha256-HaN4XMHuCRDfKOpfuZ2SkOEQfAZKouh6luqbtATUYm0="; fetchSubmodules = true; }; + # vendored glog is too old and breaks on CMake 4, gets bumped in ROCm 7.0 + postPatch = '' + substituteInPlace external/glog/cmake/GetCacheVariables.cmake \ + --replace-fail "(VERSION 3.3)" "(VERSION 3.5)" + ''; + nativeBuildInputs = [ cmake clang clr ]; + # TODO(@LunNova): use system fmt&glog once upstream fixes flag to not vendor buildInputs = [ numactl libpciaccess diff --git a/pkgs/development/rocm-modules/6/rocprofiler/0000-dont-install-tests-hsaco.patch b/pkgs/development/rocm-modules/6/rocprofiler/0000-dont-install-tests-hsaco.patch deleted file mode 100644 index 70550d0119a95..0000000000000 --- a/pkgs/development/rocm-modules/6/rocprofiler/0000-dont-install-tests-hsaco.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 46efbd5..ca2cc3b 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -127,10 +127,6 @@ function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE) - DEPENDS ${INPUT_FILE} clang - COMMENT "Building ${OUTPUT_FILE}..." - VERBATIM) -- install( -- FILES ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests-v1 -- COMPONENT tests) - set(HSACO_TARGET_LIST - ${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} - PARENT_SCOPE) diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/6/rocprofiler/default.nix index 06612a65d5912..341aae4d1e950 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/6/rocprofiler/default.nix @@ -7,6 +7,7 @@ cmake, clang, clr, + aqlprofile, rocm-core, rocm-runtime, rocm-device-libs, @@ -44,22 +45,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-x6DVt1logBE8aNnuwukQhsv/vRqkJALcfAF+6yEQuIk="; + hash = "sha256-CgW8foM4W3K19kUK/l8IsH2Q9DHi/z88viXTxhNqlHQ="; fetchSubmodules = true; }; - patches = [ - # These just simply won't build - ./0000-dont-install-tests-hsaco.patch - ./optional-aql-in-cmake.patch - ]; - nativeBuildInputs = [ cmake clang @@ -80,12 +75,11 @@ stdenv.mkDerivation (finalAttrs: { mpi systemd gtest + aqlprofile ]; propagatedBuildInputs = [ rocmtoolkit-merged ]; - # HACK: allow building without aqlprofile, probably explodes at runtime if use profiling - env.LDFLAGS = "-z nodefs -Wl,-undefined,dynamic_lookup,--unresolved-symbols=ignore-all"; #HACK: rocprofiler's cmake doesn't add these deps properly env.CXXFLAGS = "-I${libpciaccess}/include -I${numactl.dev}/include -I${rocmtoolkit-merged}/include -I${elfutils.dev}/include -w"; @@ -95,9 +89,6 @@ stdenv.mkDerivation (finalAttrs: { "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DBUILD_TEST=OFF" - "-DROCPROFILER_BUILD_TESTS=0" - "-DROCPROFILER_BUILD_SAMPLES=0" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" @@ -123,6 +114,14 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # Why do these have the executable bit set? chmod -x $out/libexec/rocprofiler/counters/*.xml + # rocprof shell script wants to find it in the same bin dir, easiest to symlink in + ln -s ${clr}/bin/rocm_agent_enumerator $out/bin/rocm_agent_enumerator + ''; + + postFixup = '' + patchelf $out/lib/*.so \ + --add-rpath ${aqlprofile}/lib \ + --add-needed libhsa-amd-aqlprofile64.so ''; passthru.updateScript = rocmUpdateScript { diff --git a/pkgs/development/rocm-modules/6/rocprofiler/optional-aql-in-cmake.patch b/pkgs/development/rocm-modules/6/rocprofiler/optional-aql-in-cmake.patch deleted file mode 100644 index 83bf88fb1e7e8..0000000000000 --- a/pkgs/development/rocm-modules/6/rocprofiler/optional-aql-in-cmake.patch +++ /dev/null @@ -1,147 +0,0 @@ -From https://raw.githubusercontent.com/AphidGit/rocm_compile/refs/heads/main/rocprofiler.patch -diff --git a/cmake_modules/rocprofiler_env.cmake b/cmake_modules/rocprofiler_env.cmake -index 7b7c472..0aba3ed 100644 ---- a/cmake_modules/rocprofiler_env.cmake -+++ b/cmake_modules/rocprofiler_env.cmake -@@ -36,6 +36,7 @@ if(ROCPROFILER_DEBUG_TRACE) - target_compile_definitions(rocprofiler-build-flags INTERFACE DEBUG_TRACE=1) - endif() - -+set(ROCPROFILER_LD_AQLPROFILE false) - # Enable direct loading of AQL-profile HSA extension - if(ROCPROFILER_LD_AQLPROFILE) - target_compile_definitions(rocprofiler-build-flags INTERFACE ROCP_LD_AQLPROFILE=1) -@@ -80,9 +81,3 @@ if("${ROCM_ROOT_DIR}" STREQUAL "") - message(FATAL_ERROR "ROCM_ROOT_DIR is not found.") - endif() - --find_library( -- HSA_AMD_AQLPROFILE_LIBRARY -- NAMES hsa-amd-aqlprofile64 -- HINTS ${CMAKE_PREFIX_PATH} -- PATHS ${ROCM_ROOT_DIR} -- PATH_SUFFIXES lib REQUIRED) -diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt -index 61782f0..16c83bf 100644 ---- a/src/api/CMakeLists.txt -+++ b/src/api/CMakeLists.txt -@@ -51,15 +51,6 @@ find_file( - NO_DEFAULT_PATH REQUIRED) - get_filename_component(HSA_RUNTIME_INC_PATH ${HSA_H} DIRECTORY) - --find_library( -- AQLPROFILE_LIB "libhsa-amd-aqlprofile64.so" -- HINTS ${CMAKE_PREFIX_PATH} -- PATHS ${ROCM_PATH} -- PATH_SUFFIXES lib) -- --if(NOT AQLPROFILE_LIB) -- message(FATAL_ERROR "AQL_PROFILE not installed. Please install hsa-amd-aqlprofile!") --endif() - - # ######################################################################################## - # Adding Old Library Files -@@ -247,7 +238,7 @@ target_include_directories( - PUBLIC $ - PRIVATE ${LIB_DIR} ${ROOT_DIR} ${PROJECT_SOURCE_DIR}/include/rocprofiler) - target_link_libraries( -- ${ROCPROFILER_TARGET} PRIVATE ${AQLPROFILE_LIB} hsa-runtime64::hsa-runtime64 c stdc++ -+ ${ROCPROFILER_TARGET} PRIVATE hsa-runtime64::hsa-runtime64 c stdc++ - dl rocprofiler::build-flags rocprofiler::memcheck) - - get_target_property(ROCPROFILER_LIBRARY_V1_NAME ${ROCPROFILER_TARGET} NAME) -@@ -325,8 +316,7 @@ target_link_options( - -Wl,--no-undefined) - target_link_libraries( - rocprofiler-v2 -- PRIVATE ${AQLPROFILE_LIB} -- hsa-runtime64::hsa-runtime64 -+ PRIVATE hsa-runtime64::hsa-runtime64 - Threads::Threads - atomic - numa -diff --git a/src/util/hsa_rsrc_factory.cpp b/src/util/hsa_rsrc_factory.cpp -index 2c47186..6b39634 100644 ---- a/src/util/hsa_rsrc_factory.cpp -+++ b/src/util/hsa_rsrc_factory.cpp -@@ -155,17 +155,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool initialize_hsa) : initialize_hsa_(initialize - if (kern_arg_pool_ == nullptr) - CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); - -- // Get AqlProfile API table -- aqlprofile_api_ = {}; --#ifdef ROCP_LD_AQLPROFILE -- status = LoadAqlProfileLib(&aqlprofile_api_); --#else -- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, -- hsa_ven_amd_aqlprofile_VERSION_MAJOR, -- sizeof(aqlprofile_api_), &aqlprofile_api_); --#endif -- CHECK_STATUS("aqlprofile API table load failed", status); -- - // Get Loader API table - loader_api_ = {}; - status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_LOADER, 1, -diff --git a/test/util/hsa_rsrc_factory.cpp b/test/util/hsa_rsrc_factory.cpp -index 0a44d18..fab5b75 100644 ---- a/test/util/hsa_rsrc_factory.cpp -+++ b/test/util/hsa_rsrc_factory.cpp -@@ -137,17 +137,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool initialize_hsa) : initialize_hsa_(initialize - if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); - if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); - -- // Get AqlProfile API table -- aqlprofile_api_ = {0}; --#ifdef ROCP_LD_AQLPROFILE -- status = LoadAqlProfileLib(&aqlprofile_api_); --#else -- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, -- hsa_ven_amd_aqlprofile_VERSION_MAJOR, -- sizeof(aqlprofile_api_), &aqlprofile_api_); --#endif -- CHECK_STATUS("aqlprofile API table load failed", status); -- - // Get Loader API table - loader_api_ = {0}; - status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_LOADER, 1, -diff --git a/tests-v2/unittests/core/CMakeLists.txt b/tests-v2/unittests/core/CMakeLists.txt -index 107cb51..0f6d4bf 100644 ---- a/tests-v2/unittests/core/CMakeLists.txt -+++ b/tests-v2/unittests/core/CMakeLists.txt -@@ -235,8 +235,7 @@ set_target_properties(runCoreUnitTests PROPERTIES - INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests") - target_link_libraries( - runCoreUnitTests -- PRIVATE ${AQLPROFILE_LIB} -- test_hsatool_library -+ PRIVATE test_hsatool_library - hsa-runtime64::hsa-runtime64 - Threads::Threads - GTest::gtest GTest::gtest_main -@@ -285,4 +284,4 @@ endif() - # for the *_FilePlugin tests - if(NOT EXISTS "${PROJECT_BINARY_DIR}/test-output") - file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/test-output") --endif() -\ No newline at end of file -+endif() -diff --git a/tests-v2/unittests/profiler/CMakeLists.txt b/tests-v2/unittests/profiler/CMakeLists.txt -index 53180d5..0c4d4a7 100644 ---- a/tests-v2/unittests/profiler/CMakeLists.txt -+++ b/tests-v2/unittests/profiler/CMakeLists.txt -@@ -122,7 +122,7 @@ target_compile_definitions( - PRIVATE PROF_API_IMPL HIP_PROF_HIP_API_STRING=1 __HIP_PLATFORM_AMD__=1) - - target_link_libraries( -- runUnitTests PRIVATE rocprofiler-v2 ${AQLPROFILE_LIB} hsa-runtime64::hsa-runtime64 -+ runUnitTests PRIVATE rocprofiler-v2 hsa-runtime64::hsa-runtime64 - GTest::gtest GTest::gtest_main stdc++fs ${PCIACCESS_LIBRARIES} dw elf c dl) - - add_dependencies(tests runUnitTests) -@@ -158,4 +158,4 @@ endif() - # for the *_FilePlugin tests - if(NOT EXISTS "${PROJECT_BINARY_DIR}/test-output") - file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/test-output") --endif() -\ No newline at end of file -+endif() diff --git a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix index 7fbf0a04da090..2b1501dca51a6 100644 --- a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocr-debug-agent"; - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocr_debug_agent"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-HYag5/E72hopDhS9EVcdyGgSvzbCMzKqLC+SIS28Y9M="; + hash = "sha256-otoxZ2NHkPDIFhvn4/nvaQ/W4LF38Nx9MZ9IYEf1DyY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocrand/default.nix b/pkgs/development/rocm-modules/6/rocrand/default.nix index d58e596d97a80..f0219f66955b9 100644 --- a/pkgs/development/rocm-modules/6/rocrand/default.nix +++ b/pkgs/development/rocm-modules/6/rocrand/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-rrRLPqEw39M+6dtPW8DcnQiSZNwxWNINJ1wjU098Vkk="; + hash = "sha256-pZAwmsWup0byGxJ5ADbztco8svBpIjBWITjs+OgKvQc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocsolver/default.nix b/pkgs/development/rocm-modules/6/rocsolver/default.nix index f5daea4de5db5..c055e5abf735d 100644 --- a/pkgs/development/rocm-modules/6/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/6/rocsolver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-+sGU+0CB48iolJSyYo+xH36q5LCUp+nKtOYbguzMuhg="; + hash = "sha256-JthNY5rkrrm9bf1fgkO9HnARdX6H0kiF9EW1jMbBmj4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocsparse/default.nix b/pkgs/development/rocm-modules/6/rocsparse/default.nix index ee7fd4d96f15c..5b17880b2ea04 100644 --- a/pkgs/development/rocm-modules/6/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/6/rocsparse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-6Cut5rbyqKFzHaXfJZGApyY9Mj1Zq/+U8MkXgy4X4Pw="; + hash = "sha256-PrLyqHMAJYACkBMz97iBfwCaQ9Kf1IBL7IEf1IF1/m0="; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_CXX_COMPILER=amdclang++" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" diff --git a/pkgs/development/rocm-modules/6/rocthrust/default.nix b/pkgs/development/rocm-modules/6/rocthrust/default.nix index 0a5254f60b958..bf334571c68fa 100644 --- a/pkgs/development/rocm-modules/6/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/6/rocthrust/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-c1+hqP/LipaQ2/lPJo79YBd9H0n0Y7yHkxe0/INE14s="; + hash = "sha256-IfMBVISClD1dk7FnAakP2GIpyZFrCnAloFRTaNdSKyw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/roctracer/default.nix b/pkgs/development/rocm-modules/6/roctracer/default.nix index e45b340c9a636..f560e4a235ec1 100644 --- a/pkgs/development/rocm-modules/6/roctracer/default.nix +++ b/pkgs/development/rocm-modules/6/roctracer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "roctracer"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-GhnF7rqNLQLLB7nzIp0xNqyqBOwj9ZJ+hzzj1EAaXWU="; + hash = "sha256-Dwk5cBZLysmsVA2kwpQM0FQt2KXOGcaZcAw/d8VUaXw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocwmma/default.nix b/pkgs/development/rocm-modules/6/rocwmma/default.nix index 718f45b18519f..bfed05aaf72b4 100644 --- a/pkgs/development/rocm-modules/6/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/6/rocwmma/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "6.3.3"; + version = "6.4.3"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-kih3hn6QhcMmyj9n8f8eO+RIgKQgWKIuzg8fb0eoRPE="; + hash = "sha256-fjyxMrzt74rE7Gf4v4WawYltuw1fvahwZUpauMIE3qc="; }; patches = lib.optionals (buildTests || buildBenchmarks) [ @@ -61,9 +61,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_omp_LIBRARY=${openmp}/lib" "-DROCWMMA_BUILD_TESTS=${if buildTests || buildBenchmarks then "ON" else "OFF"}" "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}" # Manually define CMAKE_INSTALL_ diff --git a/pkgs/development/rocm-modules/6/rpp/default.nix b/pkgs/development/rocm-modules/6/rpp/default.nix index 4185c91e079f5..41cbf54089e09 100644 --- a/pkgs/development/rocm-modules/6/rpp/default.nix +++ b/pkgs/development/rocm-modules/6/rpp/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "6.3.3"; + version = "6.4.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rpp"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-METwagek17/DdZGaOTQqvyU6xGt7OBMLHk4YM4KmgtA="; + hash = "sha256-rccVjSrOVIe4ZDtloCoCCI3u9UIcUqdirHIzS7ffAas="; }; nativeBuildInputs = [ @@ -54,12 +54,7 @@ stdenv.mkDerivation (finalAttrs: { boost ]; - CFLAGS = "-I${openmp.dev}/include"; - CXXFLAGS = "-I${openmp.dev}/include"; cmakeFlags = [ - "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include" - "-DOpenMP_omp_LIBRARY=${openmp}/lib" "-DROCM_PATH=${clr}" ] ++ lib.optionals (gpuTargets != [ ]) [ diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix index 9446452692f21..d54c5dd923654 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/6/tensile/default.nix @@ -6,55 +6,43 @@ buildPythonPackage, pytestCheckHook, setuptools, + distro, pyyaml, msgpack, - simplejson, - ujson, - orjson, pandas, joblib, filelock, clr, rich, - isTensileLite ? false, }: buildPythonPackage rec { - pname = if isTensileLite then "tensilelite" else "tensile"; - # Using a specific commit which has code object compression support from after the 6.3 release + pname = "tensile"; + # Using a specific commit which has compression support from after the 6.4 release # Without compression packages are too large for hydra - version = "6.3-unstable-2024-12-10"; + version = "6.4-unstable-2025-06-12"; format = "pyproject"; src = fetchFromGitHub { owner = "ROCm"; repo = "Tensile"; - rev = "1752af518190500891a865379a4569b8abf6ba01"; - hash = "sha256-Wvz4PVs//3Ox7ykZHpjPzOVwlyATyc+MmVVenfTzWK4="; + rev = "1ce87a9fe73610ffb962082f0a882360cd39b103"; + hash = "sha256-qIuoIbmridy1HQVV10qPTzbccuxNJPsOvePaQQnClZc="; }; # TODO: It should be possible to run asm caps test ONCE for all supported arches # We currently disable the test because it's slow and runs each time tensile launches - - postPatch = - lib.optionalString (!isTensileLite) '' - if grep -F .SafeLoader Tensile/LibraryIO.py; then - substituteInPlace Tensile/LibraryIO.py \ - --replace-fail "yaml.SafeLoader" "yaml.CSafeLoader" - fi - # See TODO above about asm caps test - substituteInPlace Tensile/Common.py \ - --replace-fail 'if globalParameters["AssemblerPath"] is not None:' "if False:" - '' - + '' - # Add an assert that the fallback 9,0,0 is supported before setting the kernel to it - # If it's not detected as supported we have an issue with compiler paths or the compiler is broken - # and it's better to stop immediately - substituteInPlace Tensile/KernelWriter.py \ - --replace-fail '= (9,0,0)' '= (9,0,0);assert(globalParameters["AsmCaps"][(9,0,0)]["SupportedISA"])' - find . -type f -iname "*.sh" -exec chmod +x {} \; - patchShebangs Tensile - ''; + postPatch = '' + substituteInPlace Tensile/Common.py \ + --replace-fail 'if globalParameters["AssemblerPath"] is not None:' "if False:" + # Add an assert that the fallback 9,0,0 is supported before setting the kernel to it + # If it's not detected as supported we have an issue with compiler paths or the compiler is broken + # and it's better to stop immediately + substituteInPlace Tensile/KernelWriter.py \ + --replace-fail '= (9,0,0)' '= (9,0,0);assert(globalParameters["AsmCaps"][(9,0,0)]["SupportedISA"])' + find . -type f -iname "*.sh" -exec chmod +x {} \; + patchShebangs Tensile + ''; buildInputs = [ setuptools ]; @@ -63,27 +51,19 @@ buildPythonPackage rec { msgpack pandas joblib - ] - ++ lib.optionals (!isTensileLite) [ + distro rich - ] - ++ lib.optionals isTensileLite [ - simplejson - ujson - orjson ]; - patches = - lib.optional (!isTensileLite) ./tensile-solutionstructs-perf-fix.diff - ++ lib.optional (!isTensileLite) ./tensile-create-library-dont-copy-twice.diff - ++ lib.optional (!isTensileLite) (fetchpatch { + patches = [ + ./tensile-solutionstructs-perf-fix.diff + ./tensile-create-library-dont-copy-twice.diff + (fetchpatch { # [PATCH] Extend Tensile HIP ISA compatibility sha256 = "sha256-d+fVf/vz+sxGqJ96vuxe0jRMgbC5K6j5FQ5SJ1e3Sl8="; url = "https://github.com/GZGavinZhao/Tensile/commit/855cb15839849addb0816a6dde45772034a3e41f.patch"; }) - ++ lib.optional isTensileLite ./tensilelite-create-library-dont-copy-twice.diff - ++ lib.optional isTensileLite ./tensilelite-gen_assembly-venv-err-handling.diff - ++ lib.optional isTensileLite ./tensilelite-compression.diff; + ]; doCheck = false; # Too many errors, not sure how to set this up properly diff --git a/pkgs/development/rocm-modules/6/tensile/tensilelite-compression.diff b/pkgs/development/rocm-modules/6/tensile/tensilelite-compression.diff deleted file mode 100644 index bfc0146efe3d8..0000000000000 --- a/pkgs/development/rocm-modules/6/tensile/tensilelite-compression.diff +++ /dev/null @@ -1,345 +0,0 @@ -diff --git a/Tensile/TensileCreateLibrary.py b/Tensile/TensileCreateLibrary.py -index b8cea84558..1bc24bd1dd 100644 ---- a/Tensile/TensileCreateLibrary.py -+++ b/Tensile/TensileCreateLibrary.py -@@ -41,6 +41,7 @@ - from .SolutionLibrary import MasterSolutionLibrary - from .SolutionStructs import Solution - from .CustomYamlLoader import load_logic_gfx_arch -+from .Utilities.Profile import profile - - import argparse - import collections -@@ -1233,7 +1234,7 @@ def validateLibrary(masterLibraries: MasterSolutionLibrary, - ################################################################################ - # Tensile Create Library - ################################################################################ --@timing -+@profile - def TensileCreateLibrary(): - print1("") - print1(HR) -@@ -1558,7 +1559,6 @@ def param(key, value): - - print1("# Check if generated files exists.") - -- @timing - def checkFileExistence(files): - for filePath in files: - if not os.path.exists(filePath): -diff --git a/Tensile/Utilities/Profile.py b/Tensile/Utilities/Profile.py -new file mode 100644 -index 0000000000..cc3c7eb44c ---- /dev/null -+++ b/Tensile/Utilities/Profile.py -@@ -0,0 +1,77 @@ -+################################################################################ -+# -+# Copyright (C) 2016-2024 Advanced Micro Devices, Inc. All rights reserved. -+# -+# Permission is hereby granted, free of charge, to any person obtaining a copy -+# of this software and associated documentation files (the "Software"), to deal -+# in the Software without restriction, including without limitation the rights -+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+# copies of the Software, and to permit persons to whom the Software is -+# furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice shall be included in -+# all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+# SOFTWARE. -+# -+################################################################################ -+ -+import cProfile -+import pstats -+import os -+ -+from pathlib import Path -+from datetime import datetime, timezone -+from typing import Callable, Tuple -+ -+PROFILE_ENV_VAR = "TENSILE_PROFILE" -+ -+def profile(func: Callable) -> Callable: -+ """Profiling decorator. -+ -+ Add ``@profile`` to mark a function for profiling; set the environment variable -+ TENSILE_PROFILE=ON to enable profiling decorated functions. -+ """ -+ if not envVariableIsSet(PROFILE_ENV_VAR): -+ return func -+ def wrapper(*args, **kwargs): -+ path, filename = initProfileArtifacts(func.__name__) -+ -+ prof = cProfile.Profile() -+ output = prof.runcall(func, *args, **kwargs) -+ result = pstats.Stats(prof) -+ result.sort_stats(pstats.SortKey.TIME) -+ result.dump_stats(path/filename) -+ -+ return output -+ return wrapper -+ -+def envVariableIsSet(varName: str) -> bool: -+ """Checks if the provided environment variable is set to "ON", "TRUE", or "1" -+ Args: -+ varName: Environment variable name. -+ Returns: -+ True if the environment variable is set, otherwise False. -+ """ -+ value = os.environ.get(varName, "").upper() -+ return True if value in ["ON", "TRUE", "1"] else False -+ -+def initProfileArtifacts(funcName: str) -> Tuple[Path, str]: -+ """Initializes filenames and paths for profiling artifacts based on the current datetime -+ Args: -+ funcName: The name of the function being profiled, nominally passed via func.__name__ -+ Returns: -+ A tuple (path, filename) where the path is the artifact directory and filename is -+ a .prof file with the profiling results. -+ """ -+ dt = datetime.now(timezone.utc) -+ filename = f"{funcName}-{dt.strftime('%Y-%m-%dT%H-%M-%SZ')}.prof" -+ path = Path().cwd()/f"profiling-results-{dt.strftime('%Y-%m-%d')}" -+ path.mkdir(exist_ok=True) -+ return path, filename - -diff --git a/Tensile/TensileCreateLibrary.py b/Tensile/TensileCreateLibrary.py -index e62b0072df..2c843ba936 100644 ---- a/Tensile/TensileCreateLibrary.py -+++ b/Tensile/TensileCreateLibrary.py -@@ -56,7 +56,7 @@ - import sys - from timeit import default_timer as timer - from pathlib import Path --from typing import Sequence, List -+from typing import Sequence, List, Union - - def timing(func): - def wrapper(*args, **kwargs): -@@ -90,87 +90,142 @@ def processKernelSource(kernel, kernelWriterAssembly, ti): - - return (err, src, header, kernelName, filename) - --def getAssemblyCodeObjectFiles(kernels, kernelWriterAssembly, outputPath): -- destDir = ensurePath(os.path.join(outputPath, 'library')) -- asmDir = kernelWriterAssembly.getAssemblyDirectory() -- archs = collections.defaultdict(list) -+def linkIntoCodeObject( -+ objFiles: List[str], coPathDest: Union[Path, str], kernelWriterAssembly: KernelWriterAssembly -+): -+ """Links object files into a code object file. - -- for k in filter(lambda k: k['KernelLanguage'] == 'Assembly', kernels): -- archs[tuple(k['ISA'])].append(k) -+ Args: -+ objectFiles: A list of object files to be linked. -+ coPathDest: The destination path for the code object file. -+ kernelWriterAssembly: An instance of KernelWriterAssembly to get link arguments. - -- coFiles = [] -+ Raises: -+ RuntimeError: If linker invocation fails. -+ """ -+ if os.name == "nt": -+ # On Windows, the objectFiles list command line (including spaces) -+ # exceeds the limit of 8191 characters, so using response file -+ -+ responseFile = os.path.join('/tmp', 'clangArgs.txt') -+ with open(responseFile, 'wt') as file: -+ file.write(" ".join(objFiles)) -+ file.flush() -+ -+ args = [globalParameters['AssemblerPath'], '-target', 'amdgcn-amd-amdhsa', '-o', coFileRaw, '@clangArgs.txt'] -+ subprocess.check_call(args, cwd=asmDir) -+ else: -+ numObjFiles = len(objFiles) -+ maxObjFiles = 10000 -+ -+ if numObjFiles > maxObjFiles: -+ batchedObjFiles = [objFiles[i:i+maxObjFiles] for i in range(0, numObjFiles, maxObjFiles)] -+ batchSize = int(math.ceil(numObjFiles / maxObjFiles)) -+ -+ newObjFiles = [str(coPathDest) + "." + str(i) for i in range(0, batchSize)] -+ newObjFilesOutput = [] -+ -+ for batch, filename in zip(batchedObjFiles, newObjFiles): -+ if len(batch) > 1: -+ args = [globalParameters["ROCmLdPath"], "-r"] + batch + [ "-o", filename] -+ print2(f"Linking object files into fewer object files: {' '.join(args)}") -+ subprocess.check_call(args) -+ newObjFilesOutput.append(filename) -+ else: -+ newObjFilesOutput.append(batchedObjFiles[0]) -+ -+ args = kernelWriterAssembly.getLinkCodeObjectArgs(newObjFilesOutput, str(coPathDest)) -+ print2(f"Linking object files into code object: {' '.join(args)}") -+ subprocess.check_call(args) -+ else: -+ args = kernelWriterAssembly.getLinkCodeObjectArgs(objFiles, str(coPathDest)) -+ print2(f"Linking object files into code object: {' '.join(args)}") -+ subprocess.check_call(args) -+ -+ -+def compressCodeObject( -+ coPathSrc: Union[Path, str], coPathDest: Union[Path, str], gfx: str, bundler: str -+): -+ """Compresses a code object file using the provided bundler. -+ -+ Args: -+ coPathSrc: The source path of the code object file to be compressed. -+ coPathDest: The destination path for the compressed code object file. -+ gfx: The target GPU architecture. -+ bundler: The path to the Clang Offload Bundler executable. -+ -+ Raises: -+ RuntimeError: If compressing the code object file fails. -+ """ -+ args = [ -+ bundler, -+ "--compress", -+ "--type=o", -+ "--bundle-align=4096", -+ f"--targets=host-x86_64-unknown-linux,hipv4-amdgcn-amd-amdhsa--{gfx}", -+ "--input=/dev/null", -+ f"--input={str(coPathSrc)}", -+ f"--output={str(coPathDest)}", -+ ] -+ -+ print2(f"Bundling/compressing code objects: {' '.join(args)}") -+ try: -+ out = subprocess.check_output(args, stderr=subprocess.STDOUT) -+ print2(f"Output: {out}") -+ except subprocess.CalledProcessError as err: -+ raise RuntimeError( -+ f"Error compressing code object via bundling: {err.output}\nFailed command: {' '.join(args)}" -+ ) -+ -+def buildAssemblyCodeObjectFiles(kernels, kernelWriterAssembly, outputPath): -+ -+ isAsm = lambda k: k["KernelLanguage"] == "Assembly" -+ -+ extObj = ".o" -+ extCo = ".co" -+ extCoRaw = ".co.raw" - -- for arch, archKernels in archs.items(): -+ destDir = Path(ensurePath(os.path.join(outputPath, 'library'))) -+ asmDir = Path(kernelWriterAssembly.getAssemblyDirectory()) -+ -+ archKernelMap = collections.defaultdict(list) -+ for k in filter(isAsm, kernels): -+ archKernelMap[tuple(k['ISA'])].append(k) -+ -+ coFiles = [] -+ for arch, archKernels in archKernelMap.items(): - if len(archKernels) == 0: - continue - -- archName = getGfxName(arch) -+ gfx = getGfxName(arch) - - if globalParameters["MergeFiles"] or globalParameters["NumMergedFiles"] > 1 or globalParameters["LazyLibraryLoading"]: -- objectFiles = [kernelWriterAssembly.getKernelFileBase(k) + '.o' for k in archKernels if 'codeObjectFile' not in k] -+ objectFiles = [str(asmDir / (kernelWriterAssembly.getKernelFileBase(k) + extObj)) for k in archKernels if 'codeObjectFile' not in k] - -- #Group kernels from placeholder libraries - coFileMap = collections.defaultdict(list) -+ - if len(objectFiles): -- coFileMap[os.path.join(destDir, "TensileLibrary_"+archName+".co")] = objectFiles -+ coFileMap[asmDir / ("TensileLibrary_"+ gfx + extCoRaw)] = objectFiles - - for kernel in archKernels: - coName = kernel.get("codeObjectFile", None) - if coName: -- coFileMap[os.path.join(destDir, coName+".co")] += [kernelWriterAssembly.getKernelFileBase(kernel) + '.o'] -+ coFileMap[asmDir / (coName + extCoRaw)].append(str(asmDir / (kernelWriterAssembly.getKernelFileBase(kernel) + extObj))) - -- for coFile, objectFiles in coFileMap.items(): -- if os.name == "nt": -- # On Windows, the objectFiles list command line (including spaces) -- # exceeds the limit of 8191 characters, so using response file -+ for coFileRaw, objFiles in coFileMap.items(): - -- responseArgs = objectFiles -- responseFile = os.path.join(asmDir, 'clangArgs.txt') -- with open(responseFile, 'wt') as file: -- file.write( " ".join(responseArgs) ) -- file.flush() -- -- args = [globalParameters['AssemblerPath'], '-target', 'amdgcn-amd-amdhsa', '-o', coFile, '@clangArgs.txt'] -- subprocess.check_call(args, cwd=asmDir) -- else: -- numOfObjectFiles = len(objectFiles) -- splitFiles = 10000 -- if numOfObjectFiles > splitFiles: -- slicedObjectFilesList = [objectFiles[x:x+splitFiles] for x in range(0, numOfObjectFiles, splitFiles)] -- objectFileBasename = os.path.split(coFile)[-1].split('.')[0] -- numOfOneSliceOfObjectFiles = int(math.ceil(numOfObjectFiles / splitFiles)) -- newObjectFiles = [ objectFileBasename + "_" + str(i) + ".o" for i in range(0, numOfOneSliceOfObjectFiles)] -- newObjectFilesOutput = [] -- for slicedObjectFiles, objectFile in zip(slicedObjectFilesList, newObjectFiles): -- if len(slicedObjectFiles) > 1: -- args = [globalParameters["ROCmLdPath"], "-r"] + slicedObjectFiles + [ "-o", objectFile ] -- if globalParameters["PrintCodeCommands"]: -- print(asmDir) -- print(' '.join(args)) -- subprocess.check_call(args, cwd=asmDir) -- newObjectFilesOutput.append(objectFile) -- else: -- newObjectFilesOutput.append(slicedObjectFiles[0]) -- args = kernelWriterAssembly.getLinkCodeObjectArgs(newObjectFilesOutput, coFile) -- if globalParameters["PrintCodeCommands"]: -- print(asmDir) -- print(' '.join(args)) -- subprocess.check_call(args, cwd=asmDir) -- else: -- args = kernelWriterAssembly.getLinkCodeObjectArgs(objectFiles, coFile) -- if globalParameters["PrintCodeCommands"]: -- print(asmDir) -- print(' '.join(args)) -- subprocess.check_call(args, cwd=asmDir) -+ linkIntoCodeObject(objFiles, coFileRaw, kernelWriterAssembly) -+ coFile = destDir / coFileRaw.name.replace(extCoRaw, extCo) -+ compressCodeObject(coFileRaw, coFile, gfx, globalParameters["ClangOffloadBundlerPath"]) - - coFiles.append(coFile) - else: - # no mergefiles - def newCoFileName(kName): - if globalParameters["PackageLibrary"]: -- return os.path.join(destDir, archName, kName + '.co') -+ return os.path.join(destDir, gfx, kName + '.co') - else: -- return os.path.join(destDir, kName + '_' + archName + '.co') -+ return os.path.join(destDir, kName + '_' + gfx + '.co') - - def orgCoFileName(kName): - return os.path.join(asmDir, kName + '.co') -@@ -179,6 +234,8 @@ def orgCoFileName(kName): - map(lambda k: kernelWriterAssembly.getKernelFileBase(k), archKernels)), "Copying code objects"): - shutil.copyfile(src, dst) - coFiles.append(dst) -+ printWarning("Code object files are not compressed in `--no-merge-files` build mode.") -+ - return coFiles - - def which(p): -@@ -645,7 +702,7 @@ def success(kernel): - - if not globalParameters["GenerateSourcesAndExit"]: - codeObjectFiles += buildSourceCodeObjectFiles(CxxCompiler, kernelFiles, outputPath) -- codeObjectFiles += getAssemblyCodeObjectFiles(kernelsToBuild, kernelWriterAssembly, outputPath) -+ codeObjectFiles += buildAssemblyCodeObjectFiles(kernelsToBuild, kernelWriterAssembly, outputPath) - - Common.popWorkingPath() # build_tmp - Common.popWorkingPath() # workingDir - diff --git a/pkgs/development/rocm-modules/6/tensile/tensilelite-create-library-dont-copy-twice.diff b/pkgs/development/rocm-modules/6/tensile/tensilelite-create-library-dont-copy-twice.diff deleted file mode 100644 index c630803c191f4..0000000000000 --- a/pkgs/development/rocm-modules/6/tensile/tensilelite-create-library-dont-copy-twice.diff +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/Tensile/TensileCreateLibrary.py b/Tensile/TensileCreateLibrary.py -index 2b9da394..b001fa7c 100644 ---- a/Tensile/TensileCreateLibrary.py -+++ b/Tensile/TensileCreateLibrary.py -@@ -808,10 +808,13 @@ def copyStaticFiles(outputPath=None): - "ReductionTemplate.h", - "memory_gfx.h" ] - -+ import filecmp - for fileName in libraryStaticFiles: -- # copy file -- shutil.copy( os.path.join(globalParameters["SourcePath"], fileName), \ -- outputPath ) -+ src = os.path.join(globalParameters["SourcePath"], fileName) -+ dst = os.path.join(outputPath, os.path.basename(src)) -+ # no need to copy twice if it has already been copied -+ if not os.path.isfile(dst) or not filecmp.cmp(src, dst): -+ shutil.copyfile(src, dst) - - return libraryStaticFiles - -@@ -1417,9 +1420,13 @@ def TensileCreateLibrary(): - writeCMake(outputPath, solutionFiles, sourceKernelFiles, staticFiles, masterLibraries) - - # Make sure to copy the library static files. -+ import filecmp - for fileName in staticFiles: -- shutil.copy( os.path.join(globalParameters["SourcePath"], fileName), \ -- outputPath ) -+ src = os.path.join(globalParameters["SourcePath"], fileName) -+ dst = os.path.join(outputPath, os.path.basename(src)) -+ # no need to copy twice if it has already been copied -+ if not os.path.isfile(dst) or not filecmp.cmp(src, dst): -+ shutil.copyfile(src, dst) - - # write solutions and kernels - codeObjectFiles = writeSolutionsAndKernels(outputPath, CxxCompiler, None, solutions, diff --git a/pkgs/development/rocm-modules/6/tensile/tensilelite-gen_assembly-venv-err-handling.diff b/pkgs/development/rocm-modules/6/tensile/tensilelite-gen_assembly-venv-err-handling.diff deleted file mode 100644 index 0667599a58391..0000000000000 --- a/pkgs/development/rocm-modules/6/tensile/tensilelite-gen_assembly-venv-err-handling.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/Tensile/Ops/gen_assembly.sh b/Tensile/Ops/gen_assembly.sh -index 0b21b6c6..609f1dd1 100755 ---- a/Tensile/Ops/gen_assembly.sh -+++ b/Tensile/Ops/gen_assembly.sh -@@ -23,6 +23,8 @@ - # - ################################################################################ - -+set -x -+ - archStr=$1 - dst=$2 - venv=$3 -@@ -35,7 +37,13 @@ fi - - toolchain=${rocm_path}/llvm/bin/clang++ - --. ${venv}/bin/activate -+if ! [ -z ${TENSILE_GEN_ASSEMBLY_TOOLCHAIN+x} ]; then -+ toolchain="${TENSILE_GEN_ASSEMBLY_TOOLCHAIN}" -+fi -+ -+if [ -f ${venv}/bin/activate ]; then -+ . ${venv}/bin/activate -+fi - - IFS=';' read -r -a archs <<< "$archStr" - -@@ -77,4 +85,6 @@ for arch in "${archs[@]}"; do - python3 ./ExtOpCreateLibrary.py --src=$dst --co=$dst/extop_$arch.co --output=$dst --arch=$arch - done - --deactivate -+if [ -f ${venv}/bin/activate ]; then -+ deactivate -+fi diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix index f2d0c6d4bf634..488066b341dc5 100644 --- a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix +++ b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix @@ -52,7 +52,7 @@ tcl.mkTclDerivation rec { strictDeps = true; env = lib.optionalAttrs stdenv.cc.isGNU { - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -std=gnu17"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 0bf02da22143f..801e6592d030e 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -9,6 +9,7 @@ qt5, libiconv, spdlog, + fmt, sqlite, }: @@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libiconv spdlog + fmt sqlite ] ++ lib.optionals (qt5 != null) ( @@ -53,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Duse_sys_spdlog=ON" + "-Duse_sys_fmt=ON" "-Duse_sys_sqlite3=ON" ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 3b3fbf923cb8d..bedef826ea5e8 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -140,6 +140,15 @@ in url = "https://github.com/chromium/chromium/commit/6aae0e2353c857d98980ff677bf304288d7c58de.patch"; hash = "sha256-Dd38c/0hiH+PbGPJhhEFuW6kUR45A36XZqOVExoxlhM="; }) + ] + ++ lib.optionals (lib.versionOlder info.version "38") [ + # Fix build with LLVM 21+ + # https://chromium-review.googlesource.com/c/chromium/src/+/6633292 + (fetchpatch { + name = "Dont-return-an-enum-from-EnumSizeTraits-Count.patch"; + url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch"; + hash = "sha256-YIWcsCj5w0jUd7D67hsuk0ljTA/IbHwA6db3eK4ggUY="; + }) ]; npmRoot = "third_party/node"; diff --git a/pkgs/development/tools/haskell/hadrian/hadrian.nix b/pkgs/development/tools/haskell/hadrian/hadrian.nix index 17c5a3466e151..62b1a91f6c9b2 100644 --- a/pkgs/development/tools/haskell/hadrian/hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/hadrian.nix @@ -1,4 +1,4 @@ -# See also ./make-hadria.nix +# See also ./make-hadrian.nix { mkDerivation, base, @@ -24,6 +24,8 @@ # GHC source tree to build hadrian from ghcSrc, ghcVersion, + # GHC we are using to bootstrap hadrian (stage0) + bootGhcVersion, # Customization userSettings ? null, }: @@ -48,12 +50,19 @@ mkDerivation { "-O0" ]; jailbreak = - # Ignore lower bound on directory. Upstream uses this to avoid a race condition + # Ignore bound directory >= 1.3.9.0, unless the bootstrapping GHC ships it + # which is the case for >= 9.12. Upstream uses this to avoid a race condition # that only seems to affect Windows. We never build GHC natively on Windows. - # https://gitlab.haskell.org/ghc/ghc/-/issues/24382 - # https://gitlab.haskell.org/ghc/ghc/-/commit/a2c033cf82635c83f3107706634bebee43297b99 - (lib.versionAtLeast ghcVersion "9.6.7" && lib.versionOlder ghcVersion "9.7") - || (lib.versionAtLeast ghcVersion "9.12" && lib.versionOlder ghcVersion "9.15"); + # See also https://gitlab.haskell.org/ghc/ghc/-/issues/24382, + # https://gitlab.haskell.org/ghc/ghc/-/commit/a2c033cf826, + # https://gitlab.haskell.org/ghc/ghc/-/commit/7890f2d8526… + ( + lib.versionOlder bootGhcVersion "9.12" + && ( + (lib.versionAtLeast ghcVersion "9.6.7" && lib.versionOlder ghcVersion "9.7") + || lib.versionAtLeast ghcVersion "9.11" + ) + ); isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index d2463865c1992..2d86c96c82b9b 100644 --- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -55,6 +55,8 @@ in callPackage' ./hadrian.nix ( { inherit userSettings; + # Taking `ghc` as an input may be too confusing + bootGhcVersion = bootPkgs.ghc.version; } // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.9") { # Starting with GHC 9.9 development, additional in tree packages are required diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 02de6f6e1ab46..f1c947d83097e 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -14,9 +14,7 @@ let [ self.ihaskell self.ihaskell-blaze - # Doesn't work with latest ihaskell versions missing an unrelated change - # https://github.com/IHaskell/IHaskell/issues/1378 - # self.ihaskell-diagrams + self.ihaskell-diagrams ] ++ packages self ); diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 63393afbb5e72..505182bc06aa5 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -112,14 +112,19 @@ buildPythonApplication rec { "test_index" ]; - # Hardcode libclang paths - postPatch = '' - substituteInPlace hotdoc/extensions/c/c_extension.py \ - --replace "shutil.which('llvm-config')" 'True' \ - --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \ - --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${lib.getLib llvmPackages.libclang}"' \ - --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${lib.getLib llvmPackages.libclang}/lib"' - ''; + postPatch = + # Hardcode libclang paths + '' + substituteInPlace hotdoc/extensions/c/c_extension.py \ + --replace "shutil.which('llvm-config')" 'True' \ + --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \ + --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${lib.getLib llvmPackages.libclang}"' \ + --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${lib.getLib llvmPackages.libclang}/lib"' + '' + # + + '' + patch -p1 -d cmark -i ${./fix-cmake-4.patch} + ''; # Make pytest run from a temp dir to have it pick up installed package for cmark preCheck = '' diff --git a/pkgs/development/tools/hotdoc/fix-cmake-4.patch b/pkgs/development/tools/hotdoc/fix-cmake-4.patch new file mode 100644 index 0000000000000..d9617793f481d --- /dev/null +++ b/pkgs/development/tools/hotdoc/fix-cmake-4.patch @@ -0,0 +1,69 @@ +From 60cac435fb801b3efce4f85643ac42cef5b22805 Mon Sep 17 00:00:00 2001 +From: Saleem Abdulrasool +Date: Sun, 22 Dec 2019 11:32:37 -0800 +Subject: [PATCH 1/2] build: chmod -x CMakeLists.txt (NFC) + +Remove the unnecessary execute permission on CMakeLists.txt. +--- + CMakeLists.txt | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + mode change 100755 => 100644 CMakeLists.txt + +diff --git a/CMakeLists.txt b/CMakeLists.txt +old mode 100755 +new mode 100644 + +From e922e337bf405b043788dd5febf9957e19d11300 Mon Sep 17 00:00:00 2001 +From: Chris Mayo +Date: Wed, 13 Aug 2025 19:27:03 +0100 +Subject: [PATCH 2/2] CMake 4 compatibility + +All CMake versions older than 3.10 are deprecated. +--- + CMakeLists.txt | 17 ++--------------- + extensions/CMakeLists.txt | 2 +- + 2 files changed, 3 insertions(+), 16 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ff97419f8..83d44f0a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,12 +1,6 @@ +-cmake_minimum_required(VERSION 2.8.9) ++cmake_minimum_required(VERSION 3.10) + +-# prevent ugly developer warnings because version is set directly, not through project() +-# it should be redone properly by using VERSION in project() if on CMake 3.x +-if(CMAKE_MAJOR_VERSION GREATER 2) +- cmake_policy(SET CMP0048 OLD) +-endif() +- +-project(cmark) ++project(cmark VERSION 0.28.3) + + include("FindAsan.cmake") + +@@ -14,13 +8,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") + message(FATAL_ERROR "Do not build in-source.\nPlease remove CMakeCache.txt and the CMakeFiles/ directory.\nThen: mkdir build ; cd build ; cmake .. ; make") + endif() + +-set(PROJECT_NAME "cmark") +- +-set(PROJECT_VERSION_MAJOR 0) +-set(PROJECT_VERSION_MINOR 28) +-set(PROJECT_VERSION_PATCH 3) +-set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} ) +- + option(CMARK_TESTS "Build cmark tests and enable testing" ON) + option(CMARK_STATIC "Build static libcmark library" ON) + option(CMARK_SHARED "Build shared libcmark library" ON) +diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt +index e62d1550f..b6a1556e9 100644 +--- a/extensions/CMakeLists.txt ++++ b/extensions/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.10) + set(LIBRARY "cmarkextensions") + set(LIBRARY_SOURCES + core-extensions.c diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index ceb3f269c904b..0fba91572fc56 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -36,6 +36,7 @@ let ninja python3 pkg-config + llvmPackages.llvm # workaround for a meson bug, where llvm-config is not found, making the build fail ]; mesonBuildType = "release"; diff --git a/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT-darwin.patch b/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT-darwin.patch index 028214bc2fbff..28abc2efb837f 100644 --- a/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT-darwin.patch +++ b/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT-darwin.patch @@ -1,5 +1,6 @@ Sandboxed builds need a fallback value for the version of the Command Line Tools -being used. +being used. Not calling `CLTVersion()` avoids relying on absolute paths, +improving the reproducibility of non-sandboxed builds. diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py index 508f6ccac3e..44bcd988c4c 100644 diff --git a/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT.patch b/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT.patch deleted file mode 100644 index cf094fdacc46a..0000000000000 --- a/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT.patch +++ /dev/null @@ -1,25 +0,0 @@ -Sandboxed builds need a fallback value for the version of the Command Line Tools -being used. - ---- a/tools/gyp/pylib/gyp/xcode_emulation.py -+++ b/tools/gyp/pylib/gyp/xcode_emulation.py -@@ -1552,7 +1552,7 @@ def CLTVersion(): - output = GetStdout(["/usr/sbin/softwareupdate", "--history"]) - return re.search(regex, output).groupdict()["version"] - except (GypError, OSError): -- return None -+ return "11.0.0.0.1.1567737322" - - - def GetStdoutQuiet(cmdlist): ---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -@@ -1552,7 +1552,7 @@ def CLTVersion(): - output = GetStdout(["/usr/sbin/softwareupdate", "--history"]) - return re.search(regex, output).groupdict()["version"] - except (GypError, OSError): -- return None -+ return "11.0.0.0.1.1567737322" - - - def GetStdoutQuiet(cmdlist): diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix index 3dd60e8a7e851..f41d1e1d5384a 100644 --- a/pkgs/development/web/nodejs/gyp-patches.nix +++ b/pkgs/development/web/nodejs/gyp-patches.nix @@ -1,19 +1,13 @@ { lib, - stdenv, fetchpatch2, patch_npm ? true, patch_tools ? true, - patch_npm_catch_oserror ? patch_npm, - patch_tools_catch_oserror ? patch_tools, - patch_npm_regex_handling ? patch_npm && stdenv.buildPlatform.isDarwin, - patch_tools_regex_handling ? patch_tools && stdenv.buildPlatform.isDarwin, }: let url = "https://github.com/nodejs/gyp-next/commit/8224deef984add7e7afe846cfb82c9d3fa6da1fb.patch?full_index=1"; - url_regex_handling = "https://github.com/nodejs/gyp-next/commit/b21ee3150eea9fc1a8811e910e5ba64f42e1fb77.patch?full_index=1"; in -lib.optionals patch_tools_catch_oserror [ +lib.optionals patch_tools [ # Fixes builds with Nix sandbox on Darwin for gyp. (fetchpatch2 { inherit url; @@ -22,7 +16,7 @@ lib.optionals patch_tools_catch_oserror [ extraPrefix = "tools/gyp/"; }) ] -++ lib.optionals patch_npm_catch_oserror [ +++ lib.optionals patch_npm [ (fetchpatch2 { inherit url; hash = "sha256-cXTwmCRHrNhuY1+3cD/EvU0CJ+1Nk4TRh6c3twvfaW8="; @@ -30,24 +24,6 @@ lib.optionals patch_tools_catch_oserror [ extraPrefix = "deps/npm/node_modules/node-gyp/gyp/"; }) ] -++ lib.optionals patch_tools_regex_handling [ - # Fixes builds with Nix sandbox on Darwin for gyp. - (fetchpatch2 { - url = url_regex_handling; - hash = "sha256-xDZO8GgZLPvCeTrCu6RVVFV5bmbuz9UPgHiaAJE6im0="; - stripLen = 1; - extraPrefix = "tools/gyp/"; - }) -] -++ lib.optionals patch_npm_regex_handling [ - (fetchpatch2 { - url = url_regex_handling; - hash = "sha256-fW5kQh+weCK0g3wzTJLZgAuXxetb14UAf6yxW6bIgbU="; - stripLen = 1; - extraPrefix = "deps/npm/node_modules/node-gyp/gyp/"; - }) -] -# TODO: remove the Darwin conditionals from this file -++ lib.optionals stdenv.buildPlatform.isDarwin [ +++ [ ./gyp-patches-set-fallback-value-for-CLT-darwin.patch ] diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 9c7d0ff66d816..fad46782599c8 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -7,7 +7,6 @@ zlib, libuv, sqlite, - http-parser, icu, bash, ninja, @@ -99,16 +98,11 @@ let null; # TODO: also handle MIPS flags (mips_arch, mips_fpu, mips_float_abi). - useSharedHttpParser = - !stdenv.hostPlatform.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4"; useSharedSQLite = lib.versionAtLeast version "22.5"; sharedLibDeps = { inherit openssl zlib libuv; } - // (lib.optionalAttrs useSharedHttpParser { - inherit http-parser; - }) // (lib.optionalAttrs useSharedSQLite { inherit sqlite; }); @@ -191,7 +185,6 @@ let zlib libuv openssl - http-parser icu bash ] diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 02112523ada8c..5afc4cc04b753 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -30,7 +30,6 @@ let }) ./gyp-patches-pre-v22-import-sys.patch - ./gyp-patches-set-fallback-value-for-CLT.patch ]; in buildNodejs { diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 49066f95d19a1..0a794f6e3e419 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -15,14 +15,7 @@ let python = python3; }; - gypPatches = - if stdenv.buildPlatform.isDarwin then - callPackage ./gyp-patches.nix { } - ++ [ - ./gyp-patches-set-fallback-value-for-CLT.patch - ] - else - [ ]; + gypPatches = if stdenv.buildPlatform.isDarwin then callPackage ./gyp-patches.nix { } else [ ]; in buildNodejs { inherit enableNpm; diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index d1e28c481f444..f952c8374898b 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -17,10 +17,7 @@ let gypPatches = if stdenv.buildPlatform.isDarwin then - callPackage ./gyp-patches.nix { patch_tools_catch_oserror = false; } - ++ [ - ./gyp-patches-set-fallback-value-for-CLT.patch - ] + callPackage ./gyp-patches.nix { patch_tools = false; } else [ ]; in diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index a068c052825ff..1254070e6f6f9 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -106,6 +106,14 @@ let # Fix multiple definition errors by using C++17 instead of C++11 substituteInPlace CMakeLists.txt \ --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 17)" + # Fix the build with CMake 4. + # See: + # * + # * + substituteInPlace third_party/sjpeg/CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.7)' \ + 'cmake_minimum_required(VERSION 3.5...3.10)' ''; postInstall = ""; diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index c8bdfc4f51f92..88b26e0a1175b 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -18,7 +18,7 @@ python3, qtbase, qttools, - tbb, + onetbb, unshield, wrapQtAppsHook, xz, @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { minizip qtbase qttools - tbb + onetbb xz zlib ]; diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 97f9890824947..54f7f922d94e8 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -153,7 +153,6 @@ let propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; strictDeps = true; - dontFixCmake = true; cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ] ++ extraCmakeFlags; separateDebugInfo = true; diff --git a/pkgs/os-specific/bsd/freebsd/update.py b/pkgs/os-specific/bsd/freebsd/update.py index f6a7911e7e752..873dee6554d35 100755 --- a/pkgs/os-specific/bsd/freebsd/update.py +++ b/pkgs/os-specific/bsd/freebsd/update.py @@ -66,7 +66,7 @@ def query_version(work_dir: str) -> dict[str, typing.Any]: fields["major"] = parsed.major fields["minor"] = parsed.minor - # Extract the patch number from `RELAESE-p`, which is used + # Extract the patch number from `RELEASE-p`, which is used # e.g. in the "releng" branches. m = _RELEASE_PATCH_PATTERN.match(fields["branch"]) if m is not None: diff --git a/pkgs/os-specific/bsd/setup-hook.sh b/pkgs/os-specific/bsd/setup-hook.sh index 08dfdd4b14b6f..faf3f19749479 100644 --- a/pkgs/os-specific/bsd/setup-hook.sh +++ b/pkgs/os-specific/bsd/setup-hook.sh @@ -95,7 +95,7 @@ moveUsrDir() { if [ -d "$prefix/usr" ]; then # Didn't try using rsync yet because per # https://unix.stackexchange.com/questions/127712/merging-folders-with-mv, - # it's not neessarily better. + # it's not necessarily better. pushd "$prefix/usr" find . -type d -exec mkdir -p "$out/{}" \; find . \( -type f -o -type l \) -exec mv "{}" "$out/{}" \; diff --git a/pkgs/os-specific/darwin/libcxx/default.nix b/pkgs/os-specific/darwin/libcxx/default.nix new file mode 100644 index 0000000000000..f1a0e63833b5a --- /dev/null +++ b/pkgs/os-specific/darwin/libcxx/default.nix @@ -0,0 +1,28 @@ +{ + # Use the text-based stubs and headers from the latest SDK (currently 15.x). This is safe because + # using features that are not available on an older deployment target is a hard error. + apple-sdk_15, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "libcxx"; + # Keep this in sync with the corresponding LLVM libc++ version + # defined as `_LIBCPP_VERSION` in `usr/include/c++/v1/__config`. + version = "19.1.2+apple-sdk-${apple-sdk_15.version}"; + inherit (apple-sdk_15) src; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out/include" "$out/lib" + cp -v usr/lib/libc++abi.tbd usr/lib/libc++.1.tbd "$out/lib" + ln -s libc++.1.tbd "$out/lib/libc++.tbd" + cp -rv usr/include/c++ "$out/include" + runHook postInstall + ''; + + passthru.isLLVM = true; +}) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 0b36cdcbcedfb..b03a97d348ad0 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -152,13 +152,13 @@ in linuxHeaders = let - version = "6.16"; + version = "6.16.7"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - hash = "sha256-Gkvi/mtSRqpKyJh6ikrzTEKo3X0ItGq0hRa8wb77zYM="; + hash = "sha256-W+PaoflCexvbNMSJTZwa36w4z/Z0N2/gYRowZXKaGoE="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index cd207f1d610c5..36a70941f046b 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -483,12 +483,12 @@ lib.makeOverridable ( # headers on 3.10 though. chmod u+w -R .. - arch=$(cd $dev/lib/modules/${modDirVersion}/build/arch; ls) + buildArchDir="$dev/lib/modules/${modDirVersion}/build/arch" # Remove unused arches for d in $(cd arch/; ls); do - if [ "$d" = "$arch" ]; then continue; fi - if [ "$arch" = arm64 ] && [ "$d" = arm ]; then continue; fi + if [ -d "$buildArchDir/$d" ]; then continue; fi + if [ -d "$buildArchDir/arm64" ] && [ "$d" = arm ]; then continue; fi rm -rf arch/$d done @@ -502,7 +502,7 @@ lib.makeOverridable ( find . -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w # Keep root and arch-specific Makefiles - chmod u-w Makefile arch/"$arch"/Makefile* + chmod u-w Makefile arch/*/Makefile* # Keep whole scripts dir chmod u-w -R scripts diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 774f3df953dac..19e62bd4a2f7d 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.33"; - hash = "sha256-vkur2KmG1zJ58edfux0zy0FVm3XCBjYReBv+uMLe8Tk="; + version = "2.03.35"; + hash = "sha256-6/KLNCdTXitavZmRzYObYWIqDb+4yG3w968fadyqg3E="; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index dc8af18a8472b..e5c4809352309 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -144,6 +144,8 @@ stdenv.mkDerivation rec { } )) ./fix-stdio-usage.patch + # https://gitlab.com/lvmteam/lvm2/-/merge_requests/33 + ./fix-manpage-reproducibility.patch ]; doCheck = false; # requires root @@ -202,6 +204,7 @@ stdenv.mkDerivation rec { moveToOutput bin/blkdeactivate $scripts moveToOutput bin/lvmdump $scripts moveToOutput bin/lvm_import_vdo $scripts + moveToOutput bin/lvmpersist $scripts moveToOutput libexec/lvresize_fs_helper $scripts/lib '' + lib.optionalString (!enableCmdlib) '' diff --git a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch b/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch new file mode 100644 index 0000000000000..1e687f3630cc0 --- /dev/null +++ b/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch @@ -0,0 +1,31 @@ +commit 950f219ed287358df8c128f7e22989177a8de47c +Author: Arnout Engelen +Date: Mon Aug 25 15:55:44 2025 +0200 + + man: simplify vmautoactivation(7) + + Previously this was hard-coded to: "Autoactivation commands use a number + of temp files in /run/lvm (with the expectation that /run is cleared + between boots.)" + + Since c1bfc8737f08bf7558b2d788e9756f895cd9eaaa it was made more generic, + but on some systems this logic leads to "Autoactivation commands use a + number of temp files in /run/lvm (with the expectation that /var/run + is cleared between boots)." which I'd say adds more confusion than it + solves. + +diff --git a/man/lvmautoactivation.7_main b/man/lvmautoactivation.7_main +index e55943b29..9d429055c 100644 +--- a/man/lvmautoactivation.7_main ++++ b/man/lvmautoactivation.7_main +@@ -175,9 +175,7 @@ is reserved for udev output.) + . + Autoactivation commands use a number of temp files in + .I #DEFAULT_RUN_DIR# +-(with the expectation that +-.I #DEFAULT_PID_DIR# +-is cleared between boots). ++(with the expectation that it is cleared between boots). + . + .TP + .B pvs_online diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 3e011ed60d6ed..070a260002601 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -26,12 +26,12 @@ }: stdenv.mkDerivation rec { - version = "1.1.4"; + version = "1.1.5"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; - hash = "sha256-NETwASrwRyOZ7q6Jp1i5xtxfMR9sZ6SJiPoWAPxLrIY="; + hash = "sha256-Ha8Q8yLhT9kKAXU4qvLANNfMHrHMQY3tR0RdcU6haNQ="; }; patches = [ diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index a8fbc328b1785..33030883efdad 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -8,8 +8,8 @@ # `ps` with systemd support is able to properly report different # attributes like unit name, so we want to have it on linux. - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, - systemd, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs, + systemdLibs, # procps is mostly Linux-only. Most commands require a running Linux # system (or very similar like that found in Cygwin). The one @@ -21,17 +21,17 @@ procps, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "procps"; version = "4.0.4"; # The project's releases are on SF, but git repo on gitlab. src = fetchurl { - url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; + url = "mirror://sourceforge/procps-ng/procps-ng-${finalAttrs.version}.tar.xz"; hash = "sha256-IocNb+skeK22F85PCaeHrdry0mDFqKp7F9iJqWLF5C4="; }; - buildInputs = [ ncurses ] ++ lib.optional withSystemd systemd; + buildInputs = [ ncurses ] ++ lib.optionals withSystemd [ systemdLibs ]; nativeBuildInputs = [ pkg-config autoreconfHook @@ -46,16 +46,20 @@ stdenv.mkDerivation rec { "--disable-modern-top" "--enable-watch8bit" ] - ++ lib.optional withSystemd "--with-systemd" - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-w" + ++ lib.optionals withSystemd [ "--with-systemd" ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ "--disable-w" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; installPhase = lib.optionalString watchOnly '' + runHook preInstall + install -m 0755 -D src/watch $out/bin/watch install -m 0644 -D man/watch.1 $out/share/man/man1/watch.1 + + runHook postInstall ''; # no obvious exec in documented arguments; haven't trawled source @@ -64,12 +68,12 @@ stdenv.mkDerivation rec { execer cannot bin/{ps,top,free} ''; - meta = with lib; { + meta = { homepage = "https://gitlab.com/procps-ng/procps"; description = "Utilities that give information about processes using the /proc filesystem"; priority = 11; # less than coreutils, which also provides "kill" and "uptime" - license = licenses.gpl2Plus; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index c1141f246d0e8..27f1b741ec209 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -15,7 +15,7 @@ jq, gcc, elfutils, - tbb, + onetbb, protobuf, grpc, yaml-cpp, @@ -74,7 +74,7 @@ stdenv.mkDerivation { openssl curl jq - tbb + onetbb re2 protobuf grpc diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 37d2b43f0baf5..7e35a8a068424 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -205,7 +205,7 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "257.8"; + version = "257.9"; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly # This has proven to be less error-prone than the previous systemd fork. @@ -213,7 +213,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd"; rev = "v${finalAttrs.version}"; - hash = "sha256-XQ+IyRar74qQij96CKClHXW0kkPnGeKUgA8ULiWh5YY="; + hash = "sha256-3Ig5TXhK99iOu41k4c5CgC4R3HhBftSAb9UbXvFY6lo="; }; # On major changes, or when otherwise required, you *must* : diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 85bb78fcb89b9..9a83d607c4c3f 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation { "--sysconfdir=/etc" "--localstatedir=/var" (if withNcurses then "--with-curses" else "--without-curses") + # The code won't compile in c23 mode. + # https://gcc.gnu.org/gcc-15/porting_to.html#c23-fn-decls-without-parameters + "CFLAGS=-std=gnu17" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 430f5a6574faa..64ae1151400e0 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2025-07-23T15-54-02Z"; + version = "2025-09-07T16-13-09Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-hBkWekmzTuvA8aiUrZjQXFEDB2+vT42bBy9fl9iXBlo="; + hash = "sha256-0IVxxeM+h3josP+wnS3q4Nrmd3fT9V+KlHxlwz3QyIQ="; }; - vendorHash = "sha256-XxvSTdHC8l3EwRP8odtcyGv9dlCTCl9dho8BOg6J8zY="; + vendorHash = "sha256-JrDLUVGtwYqwwB+Suutewi6snHyIpG3DOnDn5O0C+L0="; doCheck = false; diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 4d4c9c214778d..969cf26b5b4c4 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, curl, openssl, @@ -28,6 +29,21 @@ stdenv.mkDerivation { inherit hash; }; + patches = lib.optionals (lib.versionOlder version "3.4") [ + # fix compilation against gcc15 + (fetchpatch { + url = "https://github.com/mariadb-corporation/mariadb-connector-c/commit/e8448137f3365568090d5c0d4051039ddc1cdb6f.patch"; + hash = "sha256-aDbaaJA8DxGG5RrOa+CHhk4wuzlBy5tWyS+f/zVYU0c="; + }) + + # Fix the build with CMake 4. + (fetchpatch { + name = "mariadb-connector-c-fix-cmake-4.patch"; + url = "https://github.com/mariadb-corporation/mariadb-connector-c/commit/598dc3d2d7a63e5d250421dd0ea88be55ea8511f.patch"; + hash = "sha256-HojNRobguBmtpEdr2lVi/MpcoDAsZnb3+tw/pt376es="; + }) + ]; + outputs = [ "out" "dev" @@ -42,19 +58,19 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace mariadb_config/mariadb_config.c.in \ - --replace '#define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql"' "#define INCLUDE \"-I$dev/include -I$dev/include/mysql\"" \ - --replace '#define LIBS "-L%s/@INSTALL_LIBDIR@/ -lmariadb"' "#define LIBS \"-L$out/lib/mariadb -lmariadb\"" \ - --replace '#define PKG_LIBDIR "%s/@INSTALL_LIBDIR@"' "#define PKG_LIBDIR \"$out/lib/mariadb\"" \ - --replace '#define PLUGIN_DIR "%s/@INSTALL_PLUGINDIR@"' "#define PLUGIN_DIR \"$out/lib/mariadb/plugin\"" \ - --replace '#define PKG_PLUGINDIR "%s/@INSTALL_PLUGINDIR@"' "#define PKG_PLUGINDIR \"$out/lib/mariadb/plugin\"" + --replace-fail '#define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql"' "#define INCLUDE \"-I$dev/include -I$dev/include/mysql\"" \ + --replace-fail '#define LIBS "-L%s/@INSTALL_LIBDIR@/ -lmariadb"' "#define LIBS \"-L$out/lib/mariadb -lmariadb\"" \ + --replace-fail '#define PKG_LIBDIR "%s/@INSTALL_LIBDIR@"' "#define PKG_LIBDIR \"$out/lib/mariadb\"" \ + --replace-fail '#define PLUGIN_DIR "%s/@INSTALL_PLUGINDIR@"' "#define PLUGIN_DIR \"$out/lib/mariadb/plugin\"" \ + --replace-fail '#define PKG_PLUGINDIR "%s/@INSTALL_PLUGINDIR@"' "#define PKG_PLUGINDIR \"$out/lib/mariadb/plugin\"" '' + lib.optionalString stdenv.hostPlatform.isStatic '' # Disables all dynamic plugins substituteInPlace cmake/plugins.cmake \ - --replace 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "DYNAMIC")' 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "INVALID")' + --replace-fail 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "DYNAMIC")' 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "INVALID")' # Force building static libraries substituteInPlace libmariadb/CMakeLists.txt \ - --replace 'libmariadb SHARED' 'libmariadb STATIC' + --replace-fail 'libmariadb SHARED' 'libmariadb STATIC' ''; # The cmake setup-hook uses $out/lib by default, this is not the case here. @@ -86,6 +102,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Client library that can be used to connect to MySQL or MariaDB"; + homepage = "https://github.com/mariadb-corporation/mariadb-connector-c"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ globin ]; platforms = platforms.all; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index f02c9c579df94..752e9d0440ca8 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -46,11 +46,11 @@ let libxml2, linux-pam, numactl, - fmt_11, + fmt, withStorageMroonga ? true, kytea, libsodium, - msgpack, + msgpack-cxx, zeromq, withStorageRocks ? true, withEmbedded ? false, @@ -231,7 +231,7 @@ let ]; buildInputs = - common.buildInputs ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ]; + common.buildInputs ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt ]; cmakeFlags = common.cmakeFlags ++ [ "-DPLUGIN_AUTH_PAM=NO" @@ -283,10 +283,10 @@ let ++ lib.optionals withStorageMroonga [ kytea libsodium - msgpack + msgpack-cxx zeromq ] - ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ]; + ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt ]; propagatedBuildInputs = lib.optional withNuma numactl; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index c22a071299717..d07f97e9840c3 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -86,7 +86,7 @@ let # Building with JIT in pkgsStatic fails like this: # fatal error: 'stdio.h' file not found && !stdenv.hostPlatform.isStatic, - llvmPackages, + llvmPackages_20, nukeReferences, overrideCC, @@ -162,6 +162,13 @@ let dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary; + # Pin LLVM 20 until upstream has resolved: + # https://www.postgresql.org/message-id/flat/d25e6e4a-d1b4-84d3-2f8a-6c45b975f53d%40applied-asynchrony.com + # TODO: Remove with next minor releases + llvmPackages = lib.warnIf ( + version == "17.7" + ) "PostgreSQL: Is the pin for LLVM 20 still needed?" llvmPackages_20; + stdenv' = if !stdenv.cc.isClang then overrideCC llvmPackages.stdenv ( diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c03863a205d9a..3e348cfcef797 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -28,6 +28,7 @@ libxau, libxaw, libxcb, + libxcb-cursor, libxcb-errors, libxcb-image, libxcb-keysyms, @@ -49,21 +50,29 @@ libxxf86dga, libxxf86misc, libxxf86vm, + listres, lndir, luit, makedepend, mkfontscale, pixman, sessreg, + smproxy, + tab-window-manager, transset, util-macros, + viewres, + xauth, + xbacklight, xbitmaps, xcb-proto, xcmsdb, + xconsole, xcursorgen, xcursor-themes, xdriinfo, xev, + xfontsel, xfsinfo, xgamma, xgc, @@ -74,7 +83,10 @@ xlsatoms, xlsclients, xlsfonts, + xmag, + xmessage, xmodmap, + xmore, xorg-cf-files, xorg-docs, xorgproto, @@ -82,6 +94,10 @@ xprop, xrandr, xrefresh, + xset, + xsetroot, + xsm, + xstdcmap, xtrans, xvinfo, xwininfo, @@ -100,18 +116,25 @@ self: with self; { libpciaccess libxcb libxcvt + listres lndir luit makedepend mkfontscale pixman sessreg + smproxy transset + viewres + xauth + xbacklight xbitmaps xcmsdb + xconsole xcursorgen xdriinfo xev + xfontsel xfsinfo xgamma xgc @@ -121,11 +144,18 @@ self: with self; { xlsatoms xlsclients xlsfonts + xmag + xmessage xmodmap + xmore xorgproto xprop xrandr xrefresh + xset + xsetroot + xsm + xstdcmap xtrans xvinfo xwininfo @@ -164,8 +194,10 @@ self: with self; { libXxf86dga = libxxf86dga; libXxf86misc = libxxf86misc; libXxf86vm = libxxf86vm; + twm = tab-window-manager; utilmacros = util-macros; xcbproto = xcb-proto; + xcbutilcursor = libxcb-cursor; xcbutilerrors = libxcb-errors; xcbutilimage = libxcb-image; xcbutilkeysyms = libxcb-keysyms; @@ -1511,11 +1543,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "libXScrnSaver"; - version = "1.2.4"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz"; - sha256 = "1zi0r6mqa1g0hhsp02cdsjcxmsbipiv0v65c1h4pl84fydcjikbm"; + url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz"; + sha256 = "004drphnsckx30g8xn554a1nr17p1zhl2547fpif0lvjhigkcmsh"; }; hardeningDisable = [ "bindnow" @@ -1911,11 +1943,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "libXpresent"; - version = "1.0.1"; + version = "1.0.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz"; - sha256 = "06r34v7z3jb0x7l5ghlc1g82gjjp5ilq5p6j11galv86bagdyr5r"; + url = "mirror://xorg/individual/lib/libXpresent-1.0.2.tar.xz"; + sha256 = "00knsc4hrxzq3rx7ff1h0k0h418p66p0cdh14fra81i2h6s22nsf"; }; hardeningDisable = [ "bindnow" @@ -1951,11 +1983,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "libXres"; - version = "1.2.2"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXres-1.2.2.tar.xz"; - sha256 = "0pvlzahqd8fcyq10wi7ipbxvgrg93hn0vqsymhw7b6sb93rlcx4s"; + url = "mirror://xorg/individual/lib/libXres-1.2.3.tar.xz"; + sha256 = "1p39xfpgckp22v60h36wvy2zbpmqgra585krja4nmj6n05a8zpnj"; }; hardeningDisable = [ "bindnow" @@ -2084,46 +2116,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - listres = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libXaw, - libXmu, - xorgproto, - libXt, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "listres"; - version = "1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/listres-1.0.6.tar.xz"; - sha256 = "1jj3xqm4bkzzdikb189ga6q79267jklpf5byhzr599lvsvpm672d"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libXaw - libXmu - xorgproto - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! oclock = callPackage ( { @@ -2209,24 +2201,26 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - smproxy = callPackage ( + x11perf = callPackage ( { stdenv, pkg-config, fetchurl, - libICE, - libSM, + libX11, + libXext, + libXft, libXmu, - libXt, + xorgproto, + libXrender, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "smproxy"; - version = "1.0.8"; + pname = "x11perf"; + version = "1.6.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/smproxy-1.0.8.tar.xz"; - sha256 = "1j7n5wxbrbzvrrlmg4r7iak1n9r09543nbfpg38y477cwbm89rgy"; + url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; + sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; }; hardeningDisable = [ "bindnow" @@ -2235,10 +2229,12 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libICE - libSM + libX11 + libXext + libXft libXmu - libXt + xorgproto + libXrender ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -2249,43 +2245,39 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - twm = callPackage ( + xcalc = callPackage ( { stdenv, pkg-config, fetchurl, - libICE, - libSM, libX11, - libXext, - libXmu, + libXaw, xorgproto, - libXrandr, libXt, + wrapWithXFileSearchPathHook, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "twm"; - version = "1.0.13.1"; + pname = "xcalc"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/twm-1.0.13.1.tar.xz"; - sha256 = "1igj7lr8xw5ap5wld5a18vav8jn8pa4ajbz5hk495d58b9sk89d5"; + url = "mirror://xorg/individual/app/xcalc-1.1.2.tar.xz"; + sha256 = "1m0wzhjvc88kmx12ykdml5rqlz9h2iki9mkfdngji53y8nhxyy45"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + ]; buildInputs = [ - libICE - libSM libX11 - libXext - libXmu + libXaw xorgproto - libXrandr libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -2297,25 +2289,29 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - viewres = callPackage ( + xclock = callPackage ( { stdenv, pkg-config, fetchurl, + libX11, libXaw, + libXft, + libxkbfile, libXmu, xorgproto, + libXrender, libXt, wrapWithXFileSearchPathHook, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "viewres"; - version = "1.0.8"; + pname = "xclock"; + version = "1.1.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/viewres-1.0.8.tar.xz"; - sha256 = "1lkc5gx7g8zjgjixinq50vlvnv03z2mvj4incdkb341k20miq8jb"; + url = "mirror://xorg/individual/app/xclock-1.1.1.tar.xz"; + sha256 = "0b3l1zwz2b1cn46f8pd480b835j9anadf929vqpll107iyzylz6z"; }; hardeningDisable = [ "bindnow" @@ -2327,9 +2323,13 @@ self: with self; { wrapWithXFileSearchPathHook ]; buildInputs = [ + libX11 libXaw + libXft + libxkbfile libXmu xorgproto + libXrender libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -2341,26 +2341,26 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - x11perf = callPackage ( + xcompmgr = callPackage ( { stdenv, pkg-config, fetchurl, - libX11, + libXcomposite, + libXdamage, libXext, - libXft, - libXmu, + libXfixes, xorgproto, libXrender, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "x11perf"; - version = "1.6.1"; + pname = "xcompmgr"; + version = "1.1.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; - sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; + url = "mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz"; + sha256 = "13xrn0ii8widz0pw31fbdy7x8paf729yqhkmxbm3497jqh4zf93q"; }; hardeningDisable = [ "bindnow" @@ -2369,10 +2369,10 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 + libXcomposite + libXdamage libXext - libXft - libXmu + libXfixes xorgproto libXrender ]; @@ -2385,38 +2385,56 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xauth = callPackage ( + xdm = callPackage ( { stdenv, pkg-config, fetchurl, libX11, libXau, + libXaw, + libXdmcp, libXext, + libXft, + libXinerama, libXmu, + libXpm, xorgproto, + libXrender, + libXt, + wrapWithXFileSearchPathHook, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xauth"; - version = "1.1.4"; + pname = "xdm"; + version = "1.1.17"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xauth-1.1.4.tar.xz"; - sha256 = "1466a5hj0rm7sm0cr253hmy9f3yjy20aar451zfb9msa8r0q2cg9"; + url = "mirror://xorg/individual/app/xdm-1.1.17.tar.xz"; + sha256 = "0spbxjxxrnfxf8gqncd7bry3z7dvr74ba987cx9iq0qsj7qax54l"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + ]; buildInputs = [ libX11 libXau + libXaw + libXdmcp libXext + libXft + libXinerama libXmu + libXpm xorgproto + libXrender + libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -2427,22 +2445,33 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xbacklight = callPackage ( + xdpyinfo = callPackage ( { stdenv, pkg-config, fetchurl, + libdmx, + libX11, libxcb, - xcbutil, + libXcomposite, + libXext, + libXi, + libXinerama, + xorgproto, + libXrender, + libXtst, + libXxf86dga, + libXxf86misc, + libXxf86vm, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xbacklight"; - version = "1.2.4"; + pname = "xdpyinfo"; + version = "1.3.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xbacklight-1.2.4.tar.xz"; - sha256 = "1vp890ic26y4k2l0haw94z4nim3j7gp3g9w5flw2zj0qdw70phyl"; + url = "mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz"; + sha256 = "0aw2yhx4ys22231yihkzhnw9jsyzksl4yyf3sx0689npvf0sbbd8"; }; hardeningDisable = [ "bindnow" @@ -2451,8 +2480,19 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ + libdmx + libX11 libxcb - xcbutil + libXcomposite + libXext + libXi + libXinerama + xorgproto + libXrender + libXtst + libXxf86dga + libXxf86misc + libXxf86vm ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -2463,39 +2503,43 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcalc = callPackage ( + xeyes = callPackage ( { stdenv, pkg-config, fetchurl, libX11, - libXaw, + libxcb, + libXext, + libXi, + libXmu, xorgproto, + libXrender, libXt, - wrapWithXFileSearchPathHook, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xcalc"; - version = "1.1.2"; + pname = "xeyes"; + version = "1.3.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xcalc-1.1.2.tar.xz"; - sha256 = "1m0wzhjvc88kmx12ykdml5rqlz9h2iki9mkfdngji53y8nhxyy45"; + url = "mirror://xorg/individual/app/xeyes-1.3.0.tar.xz"; + sha256 = "08rhfp5xlmdbyxkvxhgjxdn6vwzrbrjyd7jkk8b7wi1kpw0ccl09"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 - libXaw + libxcb + libXext + libXi + libXmu xorgproto + libXrender libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -2507,765 +2551,100 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcbutilcursor = callPackage ( + xf86inputevdev = callPackage ( { stdenv, pkg-config, fetchurl, - gperf, - libxcb, - xcbutilimage, - xcbutilrenderutil, xorgproto, - m4, + libevdev, + udev, + mtdev, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xcb-util-cursor"; - version = "0.1.5"; + pname = "xf86-input-evdev"; + version = "2.11.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz"; - sha256 = "0mrwcrm6djbd5zdvqb5v4wr87bzawnaacyqwwhfghw09ssq9kbqc"; + url = "mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz"; + sha256 = "058k0xdf4hkn8lz5gx4c08mgbzvv58haz7a32axndhscjgg2403k"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ - pkg-config - m4 - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - gperf - libxcb - xcbutilimage - xcbutilrenderutil xorgproto + libevdev + udev + mtdev + xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xcb-cursor" ]; + pkgConfigModules = [ "xorg-evdev" ]; platforms = lib.platforms.unix; }; }) ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xclock = callPackage ( + xf86inputjoystick = callPackage ( { stdenv, pkg-config, fetchurl, - libX11, - libXaw, - libXft, - libxkbfile, - libXmu, xorgproto, - libXrender, - libXt, - wrapWithXFileSearchPathHook, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xclock"; - version = "1.1.1"; + pname = "xf86-input-joystick"; + version = "1.6.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xclock-1.1.1.tar.xz"; - sha256 = "0b3l1zwz2b1cn46f8pd480b835j9anadf929vqpll107iyzylz6z"; + url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz"; + sha256 = "1lnc6cvrg81chb2hj3jphgx7crr4ab8wn60mn8f9nsdwza2w8plh"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 - libXaw - libXft - libxkbfile - libXmu xorgproto - libXrender - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xcompmgr = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libXcomposite, - libXdamage, - libXext, - libXfixes, - xorgproto, - libXrender, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xcompmgr"; - version = "1.1.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz"; - sha256 = "13xrn0ii8widz0pw31fbdy7x8paf729yqhkmxbm3497jqh4zf93q"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libXcomposite - libXdamage - libXext - libXfixes - xorgproto - libXrender - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xconsole = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXaw, - libXmu, - xorgproto, - libXt, - wrapWithXFileSearchPathHook, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xconsole"; - version = "1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xconsole-1.1.0.tar.xz"; - sha256 = "128i77kn5pfrcrw31p90cb97g8a5y5173admr3gpdnndr9w5jxqc"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; - buildInputs = [ - libX11 - libXaw - libXmu - xorgproto - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xdm = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXau, - libXaw, - libXdmcp, - libXext, - libXft, - libXinerama, - libXmu, - libXpm, - xorgproto, - libXrender, - libXt, - wrapWithXFileSearchPathHook, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xdm"; - version = "1.1.17"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xdm-1.1.17.tar.xz"; - sha256 = "0spbxjxxrnfxf8gqncd7bry3z7dvr74ba987cx9iq0qsj7qax54l"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; - buildInputs = [ - libX11 - libXau - libXaw - libXdmcp - libXext - libXft - libXinerama - libXmu - libXpm - xorgproto - libXrender - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xdpyinfo = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libdmx, - libX11, - libxcb, - libXcomposite, - libXext, - libXi, - libXinerama, - xorgproto, - libXrender, - libXtst, - libXxf86dga, - libXxf86misc, - libXxf86vm, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xdpyinfo"; - version = "1.3.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz"; - sha256 = "0aw2yhx4ys22231yihkzhnw9jsyzksl4yyf3sx0689npvf0sbbd8"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libdmx - libX11 - libxcb - libXcomposite - libXext - libXi - libXinerama - xorgproto - libXrender - libXtst - libXxf86dga - libXxf86misc - libXxf86vm - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xeyes = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libxcb, - libXext, - libXi, - libXmu, - xorgproto, - libXrender, - libXt, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xeyes"; - version = "1.3.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xeyes-1.3.0.tar.xz"; - sha256 = "08rhfp5xlmdbyxkvxhgjxdn6vwzrbrjyd7jkk8b7wi1kpw0ccl09"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libxcb - libXext - libXi - libXmu - xorgproto - libXrender - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputevdev = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libevdev, - udev, - mtdev, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-evdev"; - version = "2.11.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz"; - sha256 = "058k0xdf4hkn8lz5gx4c08mgbzvv58haz7a32axndhscjgg2403k"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libevdev - udev - mtdev - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xorg-evdev" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputjoystick = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-joystick"; - version = "1.6.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz"; - sha256 = "1lnc6cvrg81chb2hj3jphgx7crr4ab8wn60mn8f9nsdwza2w8plh"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xorg-joystick" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputkeyboard = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-keyboard"; - version = "2.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz"; - sha256 = "0mvwxrnkq0lzhjr894p420zxffdn34nc2scinmp7qd1hikr51kkp"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputlibinput = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libinput, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-libinput"; - version = "1.5.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz"; - sha256 = "1rl06l0gdqmc4v08mya93m74ana76b7s3fzkmq8ylm3535gw6915"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libinput - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xorg-libinput" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputmouse = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-mouse"; - version = "1.9.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz"; - sha256 = "0s4rzp7aqpbqm4474hg4bz7i7vg3ir93ck2q12if4lj3nklqmpjg"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xorg-mouse" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputsynaptics = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libevdev, - libX11, - libXi, - xorgserver, - libXtst, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-synaptics"; - version = "1.10.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.10.0.tar.xz"; - sha256 = "1hmm3g6ab4bs4hm6kmv508fdc8kr2blzb1vsz1lhipcf0vdnmhp0"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libevdev - libX11 - libXi - xorgserver - libXtst - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xorg-synaptics" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputvmmouse = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - udev, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-vmmouse"; - version = "13.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz"; - sha256 = "1f1rlgp1rpsan8k4ax3pzhl1hgmfn135r31m80pjxw5q19c7gw2n"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - udev - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputvoid = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgserver, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-void"; - version = "1.4.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz"; - sha256 = "11bqy2djgb82c1g8ylpfwp3wjw4x83afi8mqyn5fvqp03kidh4d2"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgserver - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoamdgpu = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libgbm, - libGL, - libdrm, - udev, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-amdgpu"; - version = "23.0.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz"; - sha256 = "0qf0kjh6pww5abxmqa4c9sfa2qq1hq4p8qcgqpfd1kpkcvmg012g"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libgbm - libGL - libdrm - udev - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoapm = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libpciaccess, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-apm"; - version = "1.3.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2"; - sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ ]; + pkgConfigModules = [ "xorg-joystick" ]; platforms = lib.platforms.unix; }; }) ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoark = callPackage ( + xf86inputkeyboard = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-ark"; - version = "0.7.6"; + pname = "xf86-input-keyboard"; + version = "2.1.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz"; - sha256 = "0p88blr3zgy47jc4aqivc6ypj4zq9pad1cl70wwz9xig29w9xk2s"; + url = "mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz"; + sha256 = "0mvwxrnkq0lzhjr894p420zxffdn34nc2scinmp7qd1hikr51kkp"; }; hardeningDisable = [ "bindnow" @@ -3275,7 +2654,6 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3287,23 +2665,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoast = callPackage ( + xf86inputlibinput = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libpciaccess, + libinput, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-ast"; - version = "1.2.0"; + pname = "xf86-input-libinput"; + version = "1.5.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-ast-1.2.0.tar.xz"; - sha256 = "14sx6dm0nmbf1fs8cazmak0aqjpjpv9wv7v09w86ff04m7f4gal6"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz"; + sha256 = "1rl06l0gdqmc4v08mya93m74ana76b7s3fzkmq8ylm3535gw6915"; }; hardeningDisable = [ "bindnow" @@ -3313,39 +2691,34 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libpciaccess + libinput xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ ]; + pkgConfigModules = [ "xorg-libinput" ]; platforms = lib.platforms.unix; }; }) ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoati = callPackage ( + xf86inputmouse = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libgbm, - libGL, - libdrm, - udev, - libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-ati"; - version = "22.0.0"; + pname = "xf86-input-mouse"; + version = "1.9.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz"; - sha256 = "0vdznwx78alhbb05paw2xd65hcsila2kqflwwnbpq8pnsdbbpj68"; + url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz"; + sha256 = "0s4rzp7aqpbqm4474hg4bz7i7vg3ir93ck2q12if4lj3nklqmpjg"; }; hardeningDisable = [ "bindnow" @@ -3355,39 +2728,37 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libgbm - libGL - libdrm - udev - libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ ]; + pkgConfigModules = [ "xorg-mouse" ]; platforms = lib.platforms.unix; }; }) ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videochips = callPackage ( + xf86inputsynaptics = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libpciaccess, + libevdev, + libX11, + libXi, xorgserver, + libXtst, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-chips"; - version = "1.5.0"; + pname = "xf86-input-synaptics"; + version = "1.10.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz"; - sha256 = "1cyljd3h2hjv42ldqimf4lllqhb8cma6p3n979kr8nn81rjdkhw4"; + url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.10.0.tar.xz"; + sha256 = "1hmm3g6ab4bs4hm6kmv508fdc8kr2blzb1vsz1lhipcf0vdnmhp0"; }; hardeningDisable = [ "bindnow" @@ -3397,35 +2768,38 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libpciaccess + libevdev + libX11 + libXi xorgserver + libXtst ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ ]; + pkgConfigModules = [ "xorg-synaptics" ]; platforms = lib.platforms.unix; }; }) ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videocirrus = callPackage ( + xf86inputvmmouse = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libpciaccess, + udev, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-cirrus"; - version = "1.6.0"; + pname = "xf86-input-vmmouse"; + version = "13.2.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz"; - sha256 = "00b468w01hqjczfqz42v2vqhb14db4wazcqi1w29lgfyhc0gmwqf"; + url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz"; + sha256 = "1f1rlgp1rpsan8k4ax3pzhl1hgmfn135r31m80pjxw5q19c7gw2n"; }; hardeningDisable = [ "bindnow" @@ -3435,7 +2809,7 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libpciaccess + udev xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3447,22 +2821,22 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videodummy = callPackage ( + xf86inputvoid = callPackage ( { stdenv, pkg-config, fetchurl, - xorgproto, xorgserver, + xorgproto, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-dummy"; - version = "0.4.1"; + pname = "xf86-input-void"; + version = "1.4.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz"; - sha256 = "1byzsdcnlnzvkcqrzaajzc3nzm7y7ydrk9bjr4x9lx8gznkj069m"; + url = "mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz"; + sha256 = "11bqy2djgb82c1g8ylpfwp3wjw4x83afi8mqyn5fvqp03kidh4d2"; }; hardeningDisable = [ "bindnow" @@ -3471,8 +2845,8 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorgproto xorgserver + xorgproto ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -3483,23 +2857,26 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videofbdev = callPackage ( + xf86videoamdgpu = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libpciaccess, + libgbm, + libGL, + libdrm, + udev, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-fbdev"; - version = "0.5.1"; + pname = "xf86-video-amdgpu"; + version = "23.0.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz"; - sha256 = "11zk8whari4m99ad3w30xwcjkgya4xbcpmg8710q14phkbxw0aww"; + url = "mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz"; + sha256 = "0qf0kjh6pww5abxmqa4c9sfa2qq1hq4p8qcgqpfd1kpkcvmg012g"; }; hardeningDisable = [ "bindnow" @@ -3509,7 +2886,10 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libpciaccess + libgbm + libGL + libdrm + udev xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3521,7 +2901,7 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videogeode = callPackage ( + xf86videoapm = callPackage ( { stdenv, pkg-config, @@ -3532,12 +2912,12 @@ self: with self; { testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-geode"; - version = "2.18.1"; + pname = "xf86-video-apm"; + version = "1.3.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-geode-2.18.1.tar.xz"; - sha256 = "0a8c6g3ndzf76rrrm3dwzmndcdy4y2qfai4324sdkmi8k9szicjr"; + url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2"; + sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; }; hardeningDisable = [ "bindnow" @@ -3559,22 +2939,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoglide = callPackage ( + xf86videoark = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, + libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-glide"; - version = "1.2.2"; + pname = "xf86-video-ark"; + version = "0.7.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2"; - sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; + url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz"; + sha256 = "0p88blr3zgy47jc4aqivc6ypj4zq9pad1cl70wwz9xig29w9xk2s"; }; hardeningDisable = [ "bindnow" @@ -3584,6 +2965,7 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto + libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3595,23 +2977,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoglint = callPackage ( + xf86videoast = callPackage ( { stdenv, pkg-config, fetchurl, - libpciaccess, xorgproto, + libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-glint"; - version = "1.2.9"; + pname = "xf86-video-ast"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; - sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; + url = "mirror://xorg/individual/driver/xf86-video-ast-1.2.0.tar.xz"; + sha256 = "14sx6dm0nmbf1fs8cazmak0aqjpjpv9wv7v09w86ff04m7f4gal6"; }; hardeningDisable = [ "bindnow" @@ -3620,8 +3002,8 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libpciaccess xorgproto + libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3633,23 +3015,27 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoi128 = callPackage ( + xf86videoati = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, + libgbm, + libGL, + libdrm, + udev, libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-i128"; - version = "1.4.1"; + pname = "xf86-video-ati"; + version = "22.0.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz"; - sha256 = "0imwmkam09wpp3z3iaw9i4hysxicrrax7i3p0l2glgp3zw9var3h"; + url = "mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz"; + sha256 = "0vdznwx78alhbb05paw2xd65hcsila2kqflwwnbpq8pnsdbbpj68"; }; hardeningDisable = [ "bindnow" @@ -3659,6 +3045,10 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto + libgbm + libGL + libdrm + udev libpciaccess xorgserver ]; @@ -3671,7 +3061,7 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoi740 = callPackage ( + xf86videochips = callPackage ( { stdenv, pkg-config, @@ -3682,12 +3072,12 @@ self: with self; { testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-i740"; - version = "1.4.0"; + pname = "xf86-video-chips"; + version = "1.5.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2"; - sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; + url = "mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz"; + sha256 = "1cyljd3h2hjv42ldqimf4lllqhb8cma6p3n979kr8nn81rjdkhw4"; }; hardeningDisable = [ "bindnow" @@ -3709,39 +3099,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videointel = callPackage ( + xf86videocirrus = callPackage ( { stdenv, pkg-config, fetchurl, - cairo, xorgproto, - libdrm, - libpng, - udev, libpciaccess, - libX11, - xcbutil, - libxcb, - libXcursor, - libXdamage, - libXext, - libXfixes, xorgserver, - libXrandr, - libXrender, - libxshmfence, - libXtst, - libXvMC, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-intel"; - version = "2.99.917"; + pname = "xf86-video-cirrus"; + version = "1.6.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2"; - sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; + url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz"; + sha256 = "00b468w01hqjczfqz42v2vqhb14db4wazcqi1w29lgfyhc0gmwqf"; }; hardeningDisable = [ "bindnow" @@ -3750,25 +3124,9 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - cairo xorgproto - libdrm - libpng - udev libpciaccess - libX11 - xcbutil - libxcb - libXcursor - libXdamage - libXext - libXfixes xorgserver - libXrandr - libXrender - libxshmfence - libXtst - libXvMC ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -3779,24 +3137,22 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videomga = callPackage ( + xf86videodummy = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libdrm, - libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-mga"; - version = "2.1.0"; + pname = "xf86-video-dummy"; + version = "0.4.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz"; - sha256 = "0wxbcgg5i4yq22pbc50567877z8irxhqzgl3sk6vf5zs9szmvy3v"; + url = "mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz"; + sha256 = "1byzsdcnlnzvkcqrzaajzc3nzm7y7ydrk9bjr4x9lx8gznkj069m"; }; hardeningDisable = [ "bindnow" @@ -3806,8 +3162,6 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libdrm - libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3819,7 +3173,7 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoneomagic = callPackage ( + xf86videofbdev = callPackage ( { stdenv, pkg-config, @@ -3830,12 +3184,12 @@ self: with self; { testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-neomagic"; - version = "1.3.1"; + pname = "xf86-video-fbdev"; + version = "0.5.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz"; - sha256 = "153lzhq0vahg3875wi8hl9rf4sgizs41zmfg6hpfjw99qdzaq7xn"; + url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz"; + sha256 = "11zk8whari4m99ad3w30xwcjkgya4xbcpmg8710q14phkbxw0aww"; }; hardeningDisable = [ "bindnow" @@ -3857,22 +3211,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videonewport = callPackage ( + xf86videogeode = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, + libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-newport"; - version = "0.2.4"; + pname = "xf86-video-geode"; + version = "2.18.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2"; - sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; + url = "mirror://xorg/individual/driver/xf86-video-geode-2.18.1.tar.xz"; + sha256 = "0a8c6g3ndzf76rrrm3dwzmndcdy4y2qfai4324sdkmi8k9szicjr"; }; hardeningDisable = [ "bindnow" @@ -3882,6 +3237,7 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto + libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3893,25 +3249,22 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videonouveau = callPackage ( + xf86videoglide = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libdrm, - udev, - libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-nouveau"; - version = "3ee7cbca8f9144a3bb5be7f71ce70558f548d268"; + pname = "xf86-video-glide"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { - url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2"; - sha256 = "0rhs3z274jdzd82pcsl25xn8hmw6i4cxs2kwfnphpfhxbbkiq7wl"; + url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2"; + sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; hardeningDisable = [ "bindnow" @@ -3921,9 +3274,6 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libdrm - udev - libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3935,23 +3285,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videonv = callPackage ( + xf86videoglint = callPackage ( { stdenv, pkg-config, fetchurl, - xorgproto, libpciaccess, + xorgproto, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-nv"; - version = "2.1.23"; + pname = "xf86-video-glint"; + version = "1.2.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz"; - sha256 = "1jlap6xjn4pfwg9ab8fxm5mwf4dqfywp70bgc0071m7k66jbv3f6"; + url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; + sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; hardeningDisable = [ "bindnow" @@ -3960,8 +3310,8 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorgproto libpciaccess + xorgproto xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -3973,23 +3323,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoomap = callPackage ( + xf86videoi128 = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libdrm, + libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-omap"; - version = "0.4.5"; + pname = "xf86-video-i128"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2"; - sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; + url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz"; + sha256 = "0imwmkam09wpp3z3iaw9i4hysxicrrax7i3p0l2glgp3zw9var3h"; }; hardeningDisable = [ "bindnow" @@ -3999,7 +3349,7 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libdrm + libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -4011,28 +3361,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoopenchrome = callPackage ( + xf86videoi740 = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libdrm, - udev, libpciaccess, - libX11, - libXext, xorgserver, - libXvMC, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-openchrome"; - version = "0.6.0"; + pname = "xf86-video-i740"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2"; - sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; + url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2"; + sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; }; hardeningDisable = [ "bindnow" @@ -4042,13 +3387,8 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libdrm - udev libpciaccess - libX11 - libXext xorgserver - libXvMC ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -4059,25 +3399,39 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoqxl = callPackage ( + xf86videointel = callPackage ( { stdenv, pkg-config, fetchurl, + cairo, xorgproto, libdrm, + libpng, udev, libpciaccess, + libX11, + xcbutil, + libxcb, + libXcursor, + libXdamage, + libXext, + libXfixes, xorgserver, + libXrandr, + libXrender, + libxshmfence, + libXtst, + libXvMC, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-qxl"; - version = "0.1.6"; + pname = "xf86-video-intel"; + version = "2.99.917"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz"; - sha256 = "0pwncx60r1xxk8kpp9a46ga5h7k7hjqf14726v0gra27vdc9blra"; + url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2"; + sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; hardeningDisable = [ "bindnow" @@ -4086,11 +3440,25 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ + cairo xorgproto libdrm + libpng udev libpciaccess + libX11 + xcbutil + libxcb + libXcursor + libXdamage + libXext + libXfixes xorgserver + libXrandr + libXrender + libxshmfence + libXtst + libXvMC ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -4101,7 +3469,7 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videor128 = callPackage ( + xf86videomga = callPackage ( { stdenv, pkg-config, @@ -4113,12 +3481,12 @@ self: with self; { testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-r128"; - version = "6.13.0"; + pname = "xf86-video-mga"; + version = "2.1.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz"; - sha256 = "0igpfgls5nx4sz8a7yppr42qi37prqmxsy08zqbxbv81q9dfs2zj"; + url = "mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz"; + sha256 = "0wxbcgg5i4yq22pbc50567877z8irxhqzgl3sk6vf5zs9szmvy3v"; }; hardeningDisable = [ "bindnow" @@ -4141,7 +3509,7 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videos3virge = callPackage ( + xf86videoneomagic = callPackage ( { stdenv, pkg-config, @@ -4152,12 +3520,12 @@ self: with self; { testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-s3virge"; - version = "1.11.1"; + pname = "xf86-video-neomagic"; + version = "1.3.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz"; - sha256 = "1qzfcq3rlpfdb6qxz8hrp9py1q11vyzl4iqxip1vpgfnfn83vl6f"; + url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz"; + sha256 = "153lzhq0vahg3875wi8hl9rf4sgizs41zmfg6hpfjw99qdzaq7xn"; }; hardeningDisable = [ "bindnow" @@ -4179,24 +3547,22 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosavage = callPackage ( + xf86videonewport = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libdrm, - libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-savage"; - version = "2.4.1"; + pname = "xf86-video-newport"; + version = "0.2.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz"; - sha256 = "1bqhgldb6yahpgav7g7cyc4kl5pm3mgkq8w2qncj36311hb92hb7"; + url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2"; + sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; hardeningDisable = [ "bindnow" @@ -4206,8 +3572,6 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libdrm - libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -4219,23 +3583,25 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosiliconmotion = callPackage ( + xf86videonouveau = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, + libdrm, + udev, libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-siliconmotion"; - version = "1.7.10"; + pname = "xf86-video-nouveau"; + version = "3ee7cbca8f9144a3bb5be7f71ce70558f548d268"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz"; - sha256 = "1h4g2mqxshaxii416ldw0aqy6cxnsbnzayfin51xm2526dw9q18n"; + url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2"; + sha256 = "0rhs3z274jdzd82pcsl25xn8hmw6i4cxs2kwfnphpfhxbbkiq7wl"; }; hardeningDisable = [ "bindnow" @@ -4245,6 +3611,8 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto + libdrm + udev libpciaccess xorgserver ]; @@ -4257,24 +3625,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosis = callPackage ( + xf86videonv = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libdrm, libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-sis"; - version = "0.12.0"; + pname = "xf86-video-nv"; + version = "2.1.23"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sis-0.12.0.tar.gz"; - sha256 = "00j7i2r81496w27rf4nq9gc66n6nizp3fi7nnywrxs81j1j3pk4v"; + url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz"; + sha256 = "1jlap6xjn4pfwg9ab8fxm5mwf4dqfywp70bgc0071m7k66jbv3f6"; }; hardeningDisable = [ "bindnow" @@ -4284,7 +3651,6 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libdrm libpciaccess xorgserver ]; @@ -4297,23 +3663,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosisusb = callPackage ( + xf86videoomap = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libpciaccess, + libdrm, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-sisusb"; - version = "0.9.7"; + pname = "xf86-video-omap"; + version = "0.4.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2"; - sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; + url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2"; + sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; }; hardeningDisable = [ "bindnow" @@ -4323,7 +3689,7 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libpciaccess + libdrm xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -4335,22 +3701,28 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosuncg6 = callPackage ( + xf86videoopenchrome = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, + libdrm, + udev, + libpciaccess, + libX11, + libXext, xorgserver, + libXvMC, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-suncg6"; - version = "1.1.3"; + pname = "xf86-video-openchrome"; + version = "0.6.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz"; - sha256 = "16c3g5m0f5y9nx2x6w9jdzbs9yr6xhq31j37dcffxbsskmfxq57w"; + url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2"; + sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; hardeningDisable = [ "bindnow" @@ -4360,7 +3732,13 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto + libdrm + udev + libpciaccess + libX11 + libXext xorgserver + libXvMC ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -4371,22 +3749,25 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosunffb = callPackage ( + xf86videoqxl = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, + libdrm, + udev, + libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-sunffb"; - version = "1.2.3"; + pname = "xf86-video-qxl"; + version = "0.1.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz"; - sha256 = "0pf4ddh09ww7sxpzs5gr9pxh3gdwkg3f54067cp802nkw1n8vypi"; + url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz"; + sha256 = "0pwncx60r1xxk8kpp9a46ga5h7k7hjqf14726v0gra27vdc9blra"; }; hardeningDisable = [ "bindnow" @@ -4396,6 +3777,9 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto + libdrm + udev + libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -4407,22 +3791,24 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosunleo = callPackage ( + xf86videor128 = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, + libdrm, + libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-sunleo"; - version = "1.2.3"; + pname = "xf86-video-r128"; + version = "6.13.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz"; - sha256 = "1px670aiqyzddl1nz3xx1lmri39irajrqw6dskirs2a64jgp3dpc"; + url = "mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz"; + sha256 = "0igpfgls5nx4sz8a7yppr42qi37prqmxsy08zqbxbv81q9dfs2zj"; }; hardeningDisable = [ "bindnow" @@ -4432,6 +3818,8 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto + libdrm + libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -4443,24 +3831,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videotdfx = callPackage ( + xf86videos3virge = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libdrm, libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-tdfx"; - version = "1.5.0"; + pname = "xf86-video-s3virge"; + version = "1.11.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2"; - sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; + url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz"; + sha256 = "1qzfcq3rlpfdb6qxz8hrp9py1q11vyzl4iqxip1vpgfnfn83vl6f"; }; hardeningDisable = [ "bindnow" @@ -4470,7 +3857,6 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libdrm libpciaccess xorgserver ]; @@ -4483,23 +3869,24 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videotga = callPackage ( + xf86videosavage = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, + libdrm, libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-tga"; - version = "1.2.2"; + pname = "xf86-video-savage"; + version = "2.4.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2"; - sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; + url = "mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz"; + sha256 = "1bqhgldb6yahpgav7g7cyc4kl5pm3mgkq8w2qncj36311hb92hb7"; }; hardeningDisable = [ "bindnow" @@ -4509,6 +3896,7 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto + libdrm libpciaccess xorgserver ]; @@ -4521,7 +3909,7 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videotrident = callPackage ( + xf86videosiliconmotion = callPackage ( { stdenv, pkg-config, @@ -4532,12 +3920,12 @@ self: with self; { testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-trident"; - version = "1.4.0"; + pname = "xf86-video-siliconmotion"; + version = "1.7.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz"; - sha256 = "16qqn1brz50mwcy42zi1wsw9af56qadsaaiwm9hn1p6plyf22xkz"; + url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz"; + sha256 = "1h4g2mqxshaxii416ldw0aqy6cxnsbnzayfin51xm2526dw9q18n"; }; hardeningDisable = [ "bindnow" @@ -4559,22 +3947,24 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videov4l = callPackage ( + xf86videosis = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, + libdrm, + libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-v4l"; - version = "0.3.0"; + pname = "xf86-video-sis"; + version = "0.12.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; - sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; + url = "mirror://xorg/individual/driver/xf86-video-sis-0.12.0.tar.gz"; + sha256 = "00j7i2r81496w27rf4nq9gc66n6nizp3fi7nnywrxs81j1j3pk4v"; }; hardeningDisable = [ "bindnow" @@ -4584,6 +3974,8 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto + libdrm + libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -4595,7 +3987,7 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videovboxvideo = callPackage ( + xf86videosisusb = callPackage ( { stdenv, pkg-config, @@ -4606,12 +3998,12 @@ self: with self; { testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-vboxvideo"; - version = "1.0.1"; + pname = "xf86-video-sisusb"; + version = "0.9.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz"; - sha256 = "12kzgf516mbdygpni0jzm3dv60vz6vf704f3hgc6pi9bgpy6bz4f"; + url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2"; + sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; hardeningDisable = [ "bindnow" @@ -4633,23 +4025,22 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videovesa = callPackage ( + xf86videosuncg6 = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-vesa"; - version = "2.6.0"; + pname = "xf86-video-suncg6"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz"; - sha256 = "1ccvaigb1f1kz8nxxjmkfn598nabd92p16rx1g35kxm8n5qjf20h"; + url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz"; + sha256 = "16c3g5m0f5y9nx2x6w9jdzbs9yr6xhq31j37dcffxbsskmfxq57w"; }; hardeningDisable = [ "bindnow" @@ -4659,7 +4050,6 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -4671,27 +4061,22 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videovmware = callPackage ( + xf86videosunffb = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libdrm, - udev, - libpciaccess, - libX11, - libXext, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-vmware"; - version = "13.4.0"; + pname = "xf86-video-sunffb"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz"; - sha256 = "06mq7spifsrpbwq9b8kn2cn61xq6mpkq6lvh4qi6xk2yxpjixlxf"; + url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz"; + sha256 = "0pf4ddh09ww7sxpzs5gr9pxh3gdwkg3f54067cp802nkw1n8vypi"; }; hardeningDisable = [ "bindnow" @@ -4701,11 +4086,6 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libdrm - udev - libpciaccess - libX11 - libXext xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -4717,23 +4097,22 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videovoodoo = callPackage ( + xf86videosunleo = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libpciaccess, xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-voodoo"; - version = "1.2.6"; + pname = "xf86-video-sunleo"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz"; - sha256 = "00pn5826aazsdipf7ny03s1lypzid31fmswl8y2hrgf07bq76ab2"; + url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz"; + sha256 = "1px670aiqyzddl1nz3xx1lmri39irajrqw6dskirs2a64jgp3dpc"; }; hardeningDisable = [ "bindnow" @@ -4743,7 +4122,6 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -4755,22 +4133,24 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videowsfb = callPackage ( + xf86videotdfx = callPackage ( { stdenv, pkg-config, fetchurl, - xorgserver, xorgproto, + libdrm, + libpciaccess, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-wsfb"; - version = "0.4.0"; + pname = "xf86-video-tdfx"; + version = "1.5.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2"; - sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; + url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2"; + sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" @@ -4779,8 +4159,10 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorgserver xorgproto + libdrm + libpciaccess + xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -4791,50 +4173,34 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfd = callPackage ( + xf86videotga = callPackage ( { stdenv, pkg-config, fetchurl, - libxkbfile, - fontconfig, - libXaw, - libXft, - libXmu, xorgproto, - libXrender, - libXt, - gettext, - wrapWithXFileSearchPathHook, + libpciaccess, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xfd"; - version = "1.1.4"; + pname = "xf86-video-tga"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xfd-1.1.4.tar.xz"; - sha256 = "1zbnj0z28dx2rm2h7pjwcz7z1jnl28gz0v9xn3hs2igxcvxhyiym"; + url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2"; + sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ - pkg-config - gettext - wrapWithXFileSearchPathHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libxkbfile - fontconfig - libXaw - libXft - libXmu xorgproto - libXrender - libXt + libpciaccess + xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -4845,44 +4211,34 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfontsel = callPackage ( + xf86videotrident = callPackage ( { stdenv, pkg-config, fetchurl, - libX11, - libXaw, - libXmu, xorgproto, - libXt, - gettext, - wrapWithXFileSearchPathHook, + libpciaccess, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xfontsel"; - version = "1.1.1"; + pname = "xf86-video-trident"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz"; - sha256 = "1j827aiv7lsr2y7jgmv6pb5wmr2l3r3nd2pys0z2a0bpi9jqcjvs"; + url = "mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz"; + sha256 = "16qqn1brz50mwcy42zi1wsw9af56qadsaaiwm9hn1p6plyf22xkz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ - pkg-config - gettext - wrapWithXFileSearchPathHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 - libXaw - libXmu xorgproto - libXt + libpciaccess + xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -4893,23 +4249,22 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfs = callPackage ( + xf86videov4l = callPackage ( { stdenv, pkg-config, fetchurl, - libXfont2, xorgproto, - xtrans, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xfs"; - version = "1.2.2"; + pname = "xf86-video-v4l"; + version = "0.3.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xfs-1.2.2.tar.xz"; - sha256 = "1k4f15nrgmqkvsn48hnl1j4giwxpmcpdrnq0bq7b6hg265ix82xp"; + url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; + sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; }; hardeningDisable = [ "bindnow" @@ -4918,9 +4273,8 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libXfont2 xorgproto - xtrans + xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -4931,22 +4285,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xinit = callPackage ( + xf86videovboxvideo = callPackage ( { stdenv, pkg-config, fetchurl, - libX11, xorgproto, + libpciaccess, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xinit"; - version = "1.4.4"; + pname = "xf86-video-vboxvideo"; + version = "1.0.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xinit-1.4.4.tar.xz"; - sha256 = "1ygymifhg500sx1ybk8x4d1zn4g4ywvlnyvqwcf9hzsc2rx7r920"; + url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz"; + sha256 = "12kzgf516mbdygpni0jzm3dv60vz6vf704f3hgc6pi9bgpy6bz4f"; }; hardeningDisable = [ "bindnow" @@ -4955,8 +4310,9 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 xorgproto + libpciaccess + xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -4967,26 +4323,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xinput = callPackage ( + xf86videovesa = callPackage ( { stdenv, pkg-config, fetchurl, xorgproto, - libX11, - libXext, - libXi, - libXinerama, - libXrandr, + libpciaccess, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xinput"; - version = "1.6.4"; + pname = "xf86-video-vesa"; + version = "2.6.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xinput-1.6.4.tar.xz"; - sha256 = "1j2pf28c54apr56v1fmvprp657n6x4sdrv8f24rx3138cl6x015d"; + url = "mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz"; + sha256 = "1ccvaigb1f1kz8nxxjmkfn598nabd92p16rx1g35kxm8n5qjf20h"; }; hardeningDisable = [ "bindnow" @@ -4996,11 +4349,8 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto - libX11 - libXext - libXi - libXinerama - libXrandr + libpciaccess + xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -5011,23 +4361,27 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbcomp = callPackage ( + xf86videovmware = callPackage ( { stdenv, pkg-config, fetchurl, - libX11, - libxkbfile, xorgproto, + libdrm, + udev, + libpciaccess, + libX11, + libXext, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xkbcomp"; - version = "1.4.7"; + pname = "xf86-video-vmware"; + version = "13.4.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz"; - sha256 = "0xqzz209m9i43jbyrf2lh4xdbyhzzzn9mis2f2c32kplwla82a0a"; + url = "mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz"; + sha256 = "06mq7spifsrpbwq9b8kn2cn61xq6mpkq6lvh4qi6xk2yxpjixlxf"; }; hardeningDisable = [ "bindnow" @@ -5036,35 +4390,40 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 - libxkbfile xorgproto + libdrm + udev + libpciaccess + libX11 + libXext + xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xkbcomp" ]; + pkgConfigModules = [ ]; platforms = lib.platforms.unix; }; }) ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbevd = callPackage ( + xf86videovoodoo = callPackage ( { stdenv, pkg-config, fetchurl, - libX11, - libxkbfile, + xorgproto, + libpciaccess, + xorgserver, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xkbevd"; - version = "1.1.6"; + pname = "xf86-video-voodoo"; + version = "1.2.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz"; - sha256 = "0gh73dsf4ic683k9zn2nj9bpff6dmv3gzcb3zx186mpq9kw03d6r"; + url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz"; + sha256 = "00pn5826aazsdipf7ny03s1lypzid31fmswl8y2hrgf07bq76ab2"; }; hardeningDisable = [ "bindnow" @@ -5073,8 +4432,9 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 - libxkbfile + xorgproto + libpciaccess + xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -5085,23 +4445,22 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbprint = callPackage ( + xf86videowsfb = callPackage ( { stdenv, pkg-config, - fetchurl, - libX11, - libxkbfile, + fetchurl, + xorgserver, xorgproto, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xkbprint"; - version = "1.0.7"; + pname = "xf86-video-wsfb"; + version = "0.4.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz"; - sha256 = "1k2rm8lvc2klcdz2s3mymb9a2ahgwqwkgg67v3phv7ij6304jkqw"; + url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2"; + sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; hardeningDisable = [ "bindnow" @@ -5110,8 +4469,7 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 - libxkbfile + xorgserver xorgproto ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -5123,27 +4481,30 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xload = callPackage ( + xfd = callPackage ( { stdenv, pkg-config, fetchurl, - libX11, + libxkbfile, + fontconfig, libXaw, + libXft, libXmu, xorgproto, + libXrender, libXt, gettext, wrapWithXFileSearchPathHook, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xload"; - version = "1.2.0"; + pname = "xfd"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xload-1.2.0.tar.xz"; - sha256 = "104snn0rpnc91bmgj797cj6sgmkrp43n9mg20wbmr8p14kbfc3rc"; + url = "mirror://xorg/individual/app/xfd-1.1.4.tar.xz"; + sha256 = "1zbnj0z28dx2rm2h7pjwcz7z1jnl28gz0v9xn3hs2igxcvxhyiym"; }; hardeningDisable = [ "bindnow" @@ -5156,10 +4517,13 @@ self: with self; { wrapWithXFileSearchPathHook ]; buildInputs = [ - libX11 + libxkbfile + fontconfig libXaw + libXft libXmu xorgproto + libXrender libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -5171,42 +4535,34 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmag = callPackage ( + xfs = callPackage ( { stdenv, pkg-config, fetchurl, - libX11, - libXaw, - libXmu, + libXfont2, xorgproto, - libXt, - wrapWithXFileSearchPathHook, + xtrans, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xmag"; - version = "1.0.8"; + pname = "xfs"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xmag-1.0.8.tar.xz"; - sha256 = "0clm0vm35lkcir5w3bkypax9j57vyzkl9l89qqxbanvr7mc3qv9j"; + url = "mirror://xorg/individual/app/xfs-1.2.2.tar.xz"; + sha256 = "1k4f15nrgmqkvsn48hnl1j4giwxpmcpdrnq0bq7b6hg265ix82xp"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 - libXaw - libXmu + libXfont2 xorgproto - libXt + xtrans ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -5217,36 +4573,32 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmessage = callPackage ( + xinit = callPackage ( { stdenv, pkg-config, fetchurl, - libXaw, - libXt, - wrapWithXFileSearchPathHook, + libX11, + xorgproto, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xmessage"; - version = "1.0.7"; + pname = "xinit"; + version = "1.4.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xmessage-1.0.7.tar.xz"; - sha256 = "0mh3lclzh82l4wkwg1d9gflnm1irjydihg30gqfxcwmpl2vwqgvh"; + url = "mirror://xorg/individual/app/xinit-1.4.4.tar.xz"; + sha256 = "1ygymifhg500sx1ybk8x4d1zn4g4ywvlnyvqwcf9hzsc2rx7r920"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libXaw - libXt + libX11 + xorgproto ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -5257,38 +4609,40 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmore = callPackage ( + xinput = callPackage ( { stdenv, pkg-config, fetchurl, - libXaw, xorgproto, - libXt, - wrapWithXFileSearchPathHook, + libX11, + libXext, + libXi, + libXinerama, + libXrandr, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xmore"; - version = "1.0.4"; + pname = "xinput"; + version = "1.6.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xmore-1.0.4.tar.xz"; - sha256 = "16havfffngvx5kc9lam8rhsdfabsj1rsv4g49z346knyq7dn1dby"; + url = "mirror://xorg/individual/app/xinput-1.6.4.tar.xz"; + sha256 = "1j2pf28c54apr56v1fmvprp657n6x4sdrv8f24rx3138cl6x015d"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libXaw xorgproto - libXt + libX11 + libXext + libXi + libXinerama + libXrandr ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -5299,33 +4653,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgserver = callPackage ( + xkbcomp = callPackage ( { stdenv, pkg-config, fetchurl, - xorgproto, - openssl, libX11, - libXau, - libxcb, - xcbutil, - xcbutilwm, - xcbutilimage, - xcbutilkeysyms, - xcbutilrenderutil, - libXdmcp, - libXfixes, libxkbfile, + xorgproto, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xorg-server"; - version = "21.1.18"; + pname = "xkbcomp"; + version = "1.4.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz"; - sha256 = "0lk3268gzpll547zvaa64rdhs4z89d7w567lbd55swl71n9x2y68"; + url = "mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz"; + sha256 = "0xqzz209m9i43jbyrf2lh4xdbyhzzzn9mis2f2c32kplwla82a0a"; }; hardeningDisable = [ "bindnow" @@ -5334,46 +4678,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorgproto - openssl libX11 - libXau - libxcb - xcbutil - xcbutilwm - xcbutilimage - xcbutilkeysyms - xcbutilrenderutil - libXdmcp - libXfixes libxkbfile + xorgproto ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xorg-server" ]; + pkgConfigModules = [ "xkbcomp" ]; platforms = lib.platforms.unix; }; }) ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xpr = callPackage ( + xkbevd = callPackage ( { stdenv, pkg-config, fetchurl, libX11, - libXmu, - xorgproto, + libxkbfile, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xpr"; - version = "1.2.0"; + pname = "xkbevd"; + version = "1.1.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xpr-1.2.0.tar.xz"; - sha256 = "1hyf6mc2l7lzkf21d5j4z6glg9y455hlsg8lv2lz028k6gw0554b"; + url = "mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz"; + sha256 = "0gh73dsf4ic683k9zn2nj9bpff6dmv3gzcb3zx186mpq9kw03d6r"; }; hardeningDisable = [ "bindnow" @@ -5383,8 +4716,7 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 - libXmu - xorgproto + libxkbfile ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -5395,23 +4727,23 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xrdb = callPackage ( + xkbprint = callPackage ( { stdenv, pkg-config, fetchurl, libX11, - libXmu, + libxkbfile, xorgproto, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xrdb"; - version = "1.2.2"; + pname = "xkbprint"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xrdb-1.2.2.tar.xz"; - sha256 = "1x1ka0zbcw66a06jvsy92bvnsj9vxbvnq1hbn1az4f0v4fmzrx9i"; + url = "mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz"; + sha256 = "1k2rm8lvc2klcdz2s3mymb9a2ahgwqwkgg67v3phv7ij6304jkqw"; }; hardeningDisable = [ "bindnow" @@ -5421,7 +4753,7 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 - libXmu + libxkbfile xorgproto ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -5433,38 +4765,44 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xset = callPackage ( + xload = callPackage ( { stdenv, pkg-config, fetchurl, libX11, - libXext, + libXaw, libXmu, xorgproto, - libXxf86misc, + libXt, + gettext, + wrapWithXFileSearchPathHook, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xset"; - version = "1.2.5"; + pname = "xload"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xset-1.2.5.tar.xz"; - sha256 = "0bsyyx3k32k9vpb8x3ks7hlfr03nm0i14fv3cg6n4f2vcdajsscz"; + url = "mirror://xorg/individual/app/xload-1.2.0.tar.xz"; + sha256 = "104snn0rpnc91bmgj797cj6sgmkrp43n9mg20wbmr8p14kbfc3rc"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + gettext + wrapWithXFileSearchPathHook + ]; buildInputs = [ libX11 - libXext + libXaw libXmu xorgproto - libXxf86misc + libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -5475,25 +4813,33 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xsetroot = callPackage ( + xorgserver = callPackage ( { stdenv, pkg-config, fetchurl, - libX11, - xbitmaps, - libXcursor, - libXmu, xorgproto, + openssl, + libX11, + libXau, + libxcb, + xcbutil, + xcbutilwm, + xcbutilimage, + xcbutilkeysyms, + xcbutilrenderutil, + libXdmcp, + libXfixes, + libxkbfile, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xsetroot"; - version = "1.1.3"; + pname = "xorg-server"; + version = "21.1.18"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz"; - sha256 = "1l9qcv4mldj70slnmfg56nv7yh9j9ca1x795bl26whmlkrdb90b0"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz"; + sha256 = "0lk3268gzpll547zvaa64rdhs4z89d7w567lbd55swl71n9x2y68"; }; hardeningDisable = [ "bindnow" @@ -5502,59 +4848,57 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 - xbitmaps - libXcursor - libXmu xorgproto + openssl + libX11 + libXau + libxcb + xcbutil + xcbutilwm + xcbutilimage + xcbutilkeysyms + xcbutilrenderutil + libXdmcp + libXfixes + libxkbfile ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ ]; + pkgConfigModules = [ "xorg-server" ]; platforms = lib.platforms.unix; }; }) ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xsm = callPackage ( + xpr = callPackage ( { stdenv, pkg-config, fetchurl, - libICE, - libSM, libX11, - libXaw, + libXmu, xorgproto, - libXt, - wrapWithXFileSearchPathHook, testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xsm"; - version = "1.0.6"; + pname = "xpr"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xsm-1.0.6.tar.xz"; - sha256 = "1kk398lbwyag8dljfmjfn4psdwmh66yhvab85xckf306qrscfk5p"; + url = "mirror://xorg/individual/app/xpr-1.2.0.tar.xz"; + sha256 = "1hyf6mc2l7lzkf21d5j4z6glg9y455hlsg8lv2lz028k6gw0554b"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libICE - libSM libX11 - libXaw + libXmu xorgproto - libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { @@ -5565,7 +4909,7 @@ self: with self; { ) { }; # THIS IS A GENERATED FILE. DO NOT EDIT! - xstdcmap = callPackage ( + xrdb = callPackage ( { stdenv, pkg-config, @@ -5576,12 +4920,12 @@ self: with self; { testers, }: stdenv.mkDerivation (finalAttrs: { - pname = "xstdcmap"; - version = "1.0.5"; + pname = "xrdb"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz"; - sha256 = "1061b95j08mlwpadyilmpbzfgmm08z69k8nrkbn9k11rg7ilfn1n"; + url = "mirror://xorg/individual/app/xrdb-1.2.2.tar.xz"; + sha256 = "1x1ka0zbcw66a06jvsy92bvnsj9vxbvnq1hbn1az4f0v4fmzrx9i"; }; hardeningDisable = [ "bindnow" diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9975b4053e152..87ce0a89df21f 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -58,6 +58,7 @@ $pcMap{"xcb-icccm"} = "xcbutilwm"; $pcMap{"xcb-image"} = "xcbutilimage"; $pcMap{"xcb-keysyms"} = "xcbutilkeysyms"; +$pcMap{"xcb-cursor"} = "xcbutilcursor"; $pcMap{"xcb-proto"} = "xcbproto"; $pcMap{"xcb-renderutil"} = "xcbutilrenderutil"; $pcMap{"xcb-util"} = "xcbutil"; @@ -344,6 +345,7 @@ libxau, libxaw, libxcb, + libxcb-cursor, libxcb-errors, libxcb-image, libxcb-keysyms, @@ -365,21 +367,29 @@ libxxf86dga, libxxf86misc, libxxf86vm, + listres, lndir, luit, makedepend, mkfontscale, pixman, sessreg, + smproxy, + tab-window-manager, transset, util-macros, + viewres, + xauth, + xbacklight, xbitmaps, xcb-proto, xcmsdb, + xconsole, xcursorgen, xcursor-themes, xdriinfo, xev, + xfontsel, xfsinfo, xgamma, xgc, @@ -390,7 +400,10 @@ xlsatoms, xlsclients, xlsfonts, + xmag, + xmessage, xmodmap, + xmore, xorg-cf-files, xorg-docs, xorgproto, @@ -398,6 +411,10 @@ xprop, xrandr, xrefresh, + xset, + xsetroot, + xsm, + xstdcmap, xtrans, xvinfo, xwininfo, @@ -416,18 +433,25 @@ libpciaccess libxcb libxcvt + listres lndir luit makedepend mkfontscale pixman sessreg + smproxy transset + viewres + xauth + xbacklight xbitmaps xcmsdb + xconsole xcursorgen xdriinfo xev + xfontsel xfsinfo xgamma xgc @@ -437,11 +461,18 @@ xlsatoms xlsclients xlsfonts + xmag + xmessage xmodmap + xmore xorgproto xprop xrandr xrefresh + xset + xsetroot + xsm + xstdcmap xtrans xvinfo xwininfo @@ -480,8 +511,10 @@ libXxf86dga = libxxf86dga; libXxf86misc = libxxf86misc; libXxf86vm = libxxf86vm; + twm = tab-window-manager; utilmacros = util-macros; xcbproto = xcb-proto; + xcbutilcursor = libxcb-cursor; xcbutilerrors = libxcb-errors; xcbutilimage = libxcb-image; xcbutilkeysyms = libxcb-keysyms; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b3d4af551ea7b..7ebd6f9ed6e8b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -170,8 +170,6 @@ self: super: configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; }); - listres = addMainProgram super.listres { }; - xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: { configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; preConfigure = @@ -323,9 +321,6 @@ self: super: }); oclock = addMainProgram super.oclock { }; - smproxy = addMainProgram super.smproxy { }; - - viewres = addMainProgram super.viewres { }; x11perf = super.x11perf.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ @@ -339,16 +334,6 @@ self: super: xcalc = addMainProgram super.xcalc { }; - xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: { - outputs = [ - "out" - "dev" - ]; - meta = attrs.meta // { - maintainers = [ lib.maintainers.lovek323 ]; - }; - }); - xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: { outputs = [ "out" @@ -851,33 +836,8 @@ self: super: ]; }); - twm = super.twm.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ - bison - flex - ]; - meta = attrs.meta // { - mainProgram = "twm"; - }; - }); - - xauth = super.xauth.overrideAttrs (attrs: { - doCheck = false; # fails - preConfigure = - attrs.preConfigure or "" - # missing transitive dependencies - + lib.optionalString stdenv.hostPlatform.isStatic '' - export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" - ''; - meta = attrs.meta // { - mainProgram = "xauth"; - }; - }); - - xbacklight = addMainProgram super.xbacklight { }; xclock = addMainProgram super.xclock { }; xcompmgr = addMainProgram super.xcompmgr { }; - xconsole = addMainProgram super.xconsole { }; xinit = (super.xinit.override { @@ -963,15 +923,11 @@ self: super: }); xfd = addMainProgram super.xfd { }; - xfontsel = addMainProgram super.xfontsel { }; xfs = addMainProgram super.xfs { }; xinput = addMainProgram super.xinput { }; xkbevd = addMainProgram super.xkbevd { }; xkbprint = addMainProgram super.xkbprint { }; xload = addMainProgram super.xload { }; - xmag = addMainProgram super.xmag { }; - xmessage = addMainProgram super.xmessage { }; - xmore = addMainProgram super.xmore { }; xpr = addMainProgram super.xpr { }; @@ -982,10 +938,6 @@ self: super: }; }); - xset = addMainProgram super.xset { }; - xsetroot = addMainProgram super.xsetroot { }; - xsm = addMainProgram super.xsm { }; - xstdcmap = addMainProgram super.xstdcmap { }; xwd = addMainProgram super.xwd { }; # convert Type1 vector fonts to OpenType fonts diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index b9f495cf71f5f..fc60f6a79529c 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -3,24 +3,16 @@ mirror://xorg/individual/app/bitmap-1.1.1.tar.xz mirror://xorg/individual/app/editres-1.0.9.tar.xz mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz mirror://xorg/individual/app/iceauth-1.0.10.tar.xz -mirror://xorg/individual/app/listres-1.0.6.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.8.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.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/xcompmgr-1.1.10.tar.xz -mirror://xorg/individual/app/xconsole-1.1.0.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/xeyes-1.3.0.tar.xz mirror://xorg/individual/app/xfd-1.1.4.tar.xz -mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz mirror://xorg/individual/app/xfs-1.2.2.tar.xz mirror://xorg/individual/app/xinit-1.4.4.tar.xz mirror://xorg/individual/app/xinput-1.6.4.tar.xz @@ -28,15 +20,8 @@ mirror://xorg/individual/app/xkbcomp-1.4.7.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/xload-1.2.0.tar.xz -mirror://xorg/individual/app/xmag-1.0.8.tar.xz -mirror://xorg/individual/app/xmessage-1.0.7.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/xrdb-1.2.2.tar.xz -mirror://xorg/individual/app/xset-1.2.5.tar.xz -mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz -mirror://xorg/individual/app/xsm-1.0.6.tar.xz -mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/xwd-1.0.9.tar.xz mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz @@ -125,11 +110,10 @@ mirror://xorg/individual/lib/libXi-1.8.2.tar.xz mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz mirror://xorg/individual/lib/libXp-1.0.4.tar.xz -mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz -mirror://xorg/individual/lib/libXres-1.2.2.tar.xz -mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz +mirror://xorg/individual/lib/libXpresent-1.0.2.tar.xz +mirror://xorg/individual/lib/libXres-1.2.3.tar.xz +mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz -mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.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 9d27f6bf40a13..4ef0e31896df7 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -67,50 +67,6 @@ rec { extraBuildInputs = (prev.extraBuildInputs or [ ]) ++ pkgs; }); - # Override the libc++ dynamic library used in the stdenv to use the one from the platform’s - # default stdenv. This allows building packages and linking dependencies with different - # compiler versions while still using the same libc++ implementation for compatibility. - # - # Note that this adapter still uses the headers from the new stdenv’s libc++. This is necessary - # because older compilers may not be able to parse the headers from the default stdenv’s libc++. - overrideLibcxx = - stdenv: - assert stdenv.cc.libcxx != null; - assert pkgs.stdenv.cc.libcxx != null; - # only unified libcxx / libcxxabi stdenv's are supported - assert lib.versionAtLeast pkgs.stdenv.cc.libcxx.version "12"; - assert lib.versionAtLeast stdenv.cc.libcxx.version "12"; - let - llvmLibcxxVersion = lib.getVersion llvmLibcxx; - - stdenvLibcxx = pkgs.stdenv.cc.libcxx; - llvmLibcxx = stdenv.cc.libcxx; - - libcxx = - pkgs.runCommand "${stdenvLibcxx.name}-${llvmLibcxxVersion}" - { - outputs = [ - "out" - "dev" - ]; - isLLVM = true; - } - '' - mkdir -p "$dev/nix-support" - ln -s '${stdenvLibcxx}' "$out" - echo '${stdenvLibcxx}' > "$dev/nix-support/propagated-build-inputs" - ln -s '${lib.getDev llvmLibcxx}/include' "$dev/include" - ''; - in - overrideCC stdenv ( - stdenv.cc.override { - inherit libcxx; - extraPackages = [ - pkgs.buildPackages.targetPackages."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt - ]; - } - ); - # Override the setup script of stdenv. Useful for testing new # versions of the setup script without causing a rebuild of # everything. diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 4709d53569f06..1954e861eae16 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -31,7 +31,7 @@ # [ pkgset -> (args to stage/default.nix) or ({ __raw = true; } // pkgs) ] # -> pkgset # -# In english: This takes a list of function from the previous stage pkgset and +# In English: This takes a list of function from the previous stage pkgset and # returns the final pkgset. Each of those functions returns, if `__raw` is # undefined or false, args for this stage's pkgset (the most complex and # important arg is the stdenv), or, if `__raw = true`, simply this stage's diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index f7780aacb8926..cc53957eee0dc 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -117,7 +117,7 @@ lib.init bootStages then throw "no C compiler provided for this platform" else if crossSystem.isDarwin then - buildPackages.llvmPackages.libcxxClang + buildPackages.llvmPackages.systemLibcxxClang else if crossSystem.useLLVM or false then buildPackages.llvmPackages.clang else if crossSystem.useZig or false then diff --git a/pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix b/pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix index 0af9115a32e35..9d014ae3be178 100644 --- a/pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix +++ b/pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix @@ -1,3 +1,5 @@ +# FIXME: Changed to arm64-apple-darwin in release.nix stdenvBootstrapTools, please handle when refreshing + # Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: # $ ./refresh-tarballs.bash --targets=aarch64-apple-darwin # diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index e28b3a0be1f5f..0b7aade7e3111 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -133,7 +133,14 @@ let isClang = true; inherit (prevStage) libc; - inherit (prevStage.llvmPackages) libcxx; + # TODO: replace with `darwin.libcxx` once the bootstrap tools no longer have libc++. + libcxx = + if + prevStage.darwin.libcxx == null || name == "bootstrap-stage1" || name == "bootstrap-stage-xclang" + then + prevStage.llvmPackages.libcxx + else + prevStage.darwin.libcxx; inherit lib; inherit (prevStage) coreutils gnugrep; @@ -298,6 +305,7 @@ let # LLVM tools packages are staged separately (xclang, stage3) from LLVM libs (xclang). llvmLibrariesPackages = prevStage: { inherit (prevStage.llvmPackages) compiler-rt libcxx; }; + llvmLibrariesDarwinDepsNoCC = prevStage: { inherit (prevStage.darwin) libcxx; }; llvmLibrariesDeps = _: { }; llvmToolsPackages = prevStage: { @@ -365,6 +373,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check darwin = { binutils = null; binutils-unwrapped = null; + libcxx = null; libSystem = null; sigtool = null; }; @@ -986,7 +995,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check _: _: llvmToolsPackages prevStage // { - libcxxClang = super.wrapCCWith rec { + systemLibcxxClang = super.wrapCCWith rec { nativeTools = false; nativeLibc = false; @@ -1008,7 +1017,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check isClang = true; libc = self.darwin.libSystem; - inherit (self.llvmPackages) libcxx; + inherit (self.darwin) libcxx; inherit lib; inherit (self) @@ -1160,6 +1169,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ] ++ lib.optionals localSystem.isx86_64 [ prevStage.darwin.Csu ] ++ (with prevStage.darwin; [ + libcxx libiconv.out libresolv.out libsbuf.out @@ -1172,8 +1182,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check (lib.getLib clang-unwrapped) compiler-rt compiler-rt.dev - libcxx - libcxx.dev lld llvm llvm.lib @@ -1268,7 +1276,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.clang-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libllvm; - assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libcxx; assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.compiler-rt; # Make sure these evaluate since they were disabled explicitly in the bootstrap. diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index a716ca389d1c7..46c463bf48841 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -230,7 +230,7 @@ stdenv.mkDerivation (finalAttrs: { rpath='@loader_path/..' ;; *) - echo unkown executable $1 >&2 + echo unknown executable $1 >&2 exit 1 ;; esac diff --git a/pkgs/stdenv/darwin/test-bootstrap-tools.nix b/pkgs/stdenv/darwin/test-bootstrap-tools.nix index 0773ed5acc57a..596c31cd5be69 100644 --- a/pkgs/stdenv/darwin/test-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/test-bootstrap-tools.nix @@ -55,7 +55,8 @@ derivation { # The stdenv bootstrap builds the SDK in the bootstrap. Use an existing SDK to test the tools. export SDKROOT='${apple-sdk.sdkroot}' - export flags="-idirafter $SDKROOT/usr/include --sysroot=$SDKROOT -L$SDKROOT/usr/lib -L$tools/lib -DTARGET_OS_IPHONE=0" + export resource_dir="$(echo "$tools"/lib/clang/*)" # Expand wildcard + export flags="-resource-dir=$resource_dir -idirafter $SDKROOT/usr/include --sysroot=$SDKROOT -L$SDKROOT/usr/lib -L$tools/lib -DTARGET_OS_IPHONE=0" export CPP="clang -E $flags" export CC="clang $flags" @@ -77,7 +78,7 @@ derivation { # using -Wl,-flat_namespace is required to generate an error mkdir libtest/ ln -s $tools/lib/libc++.dylib libtest/ - clang++ -Wl,-flat_namespace -idirafter $SDKROOT/usr/include -isystem$tools/include/c++/v1 \ + clang++ -Wl,-flat_namespace -resource-dir=$resource_dir -idirafter $SDKROOT/usr/include -isystem$tools/include/c++/v1 \ --sysroot=$SDKROOT -L$SDKROOT/usr/lib -L./libtest -L$PWD/libSystem-boot hello3.cc tar xvf ${hello.src} diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 4d9bb81fbbcea..d28af17692cbe 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -8,7 +8,7 @@ let initialPath, # If we don't have a C compiler, we might either have `cc = null` or `cc = - # throw ...`, but if we do have a C compiler we should definiely have `cc != + # throw ...`, but if we do have a C compiler we should definitely have `cc != # null`. # # TODO(@Ericson2314): Add assert without creating infinite recursion diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index bd26a6024ce50..6881718eb3625 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -23,7 +23,7 @@ # Stages are described below along with their definitions. # # Debugging stdenv dependency graph: -# An useful tool to explore dependencies across stages is to use +# A useful tool to explore dependencies across stages is to use # '__bootPackages' attribute of 'stdenv. Examples of last 3 stages: # - stdenv # - stdenv.__bootPackages.stdenv @@ -430,6 +430,11 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # ...-binutils-patchelfed-ld-2.40/bin/ld: ...-xgcc-13.0.0/libexec/gcc/x86_64-unknown-linux-gnu/13.0.1/liblto_plugin.so: # error loading plugin: ...-bootstrap-tools/lib/libpthread.so.0: undefined symbol: __libc_vfork, version GLIBC_PRIVATE enableLTO = false; + + # relocatable libs may not be available in the bootstrap + # which will cause compilation to fail with + # configure: error: C compiler cannot create executables + enableDefaultPie = false; } )).overrideAttrs (a: { diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 6a1507df734d1..d9f968c84300c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -47,10 +47,21 @@ rec { ''; }; - bootGCC = pkgs.gcc.cc.override { - enableLTO = false; - isl = null; - }; + bootGCC = + (pkgs.gcc.cc.override { + enableLTO = false; + isl = null; + }).overrideAttrs + (old: { + patches = old.patches or [ ] ++ [ + (pkgs.fetchpatch { + # c++tools: Don't check --enable-default-pie. + # --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found + url = "https://github.com/gcc-mirror/gcc/commit/3f1f99ef82a65d66e3aaa429bf4fb746b93da0db.patch"; + hash = "sha256-wKVuwrW22gSN1woYFYxsyVk49oYmbogIN6FWbU8cVds="; + }) + ]; + }); bootBinutils = pkgs.binutils.bintools.override { withAllTargets = false; diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index e91649233c91c..c6dda7e169621 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -1,6 +1,7 @@ { lib, writeText, + srcOnly, haskellPackages, cabal-install, }: @@ -20,9 +21,9 @@ sourceRoot=$(pwd)/scratch mkdir -p "$sourceRoot" cd "$sourceRoot" - tar -xf ${haskellPackages.constraints.src} - tar -xf ${haskellPackages.cereal.src} - cp ${writeText "cabal.project" "packages: constraints* cereal*"} cabal.project + cp -r "${srcOnly haskellPackages.constraints}" constraints + cp -r "${srcOnly haskellPackages.cereal}" cereal + cp ${writeText "cabal.project" "packages: constraints cereal"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index dcc80c0acca7a..7d43131ea403b 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -10,6 +10,7 @@ fuse, openssl, tinyxml2, + gtest, }: stdenv.mkDerivation rec { @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { fuse openssl tinyxml2 + gtest ]; nativeBuildInputs = [ cmake @@ -49,6 +51,12 @@ stdenv.mkDerivation rec { "-DUSE_INTERNAL_TINYXML=OFF" "-DBUILD_SHARED_LIBS=ON" "-DINSTALL_LIBENCFS=ON" + + # Fix the build with CMake 4. + # + # Upstream is deprecated, so it won’t be fixed there. We should + # probably phase this package out. + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ]; meta = with lib; { diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index 290059b1c114f..85a540fc32516 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -1,11 +1,11 @@ /* - If user need access to more haskell package for building his - diagrams, he simply has to pass these package through the - extra packages function as follow in `config.nix`: + If a user needs access to more haskell packages for building their + diagrams, they simply have to pass these packages through the + extraPackages function, as follows: ~~~ diagrams-builder.override { - extraPackages = self : [myHaskellPackage]; + extraPackages = self: [ self.myHaskellPackage ]; } ­~~~ */ @@ -25,27 +25,37 @@ let wrappedGhc = ghcWithPackages (self: [ diagrams-builder ] ++ extraPackages self); ghc = lib.getExe' wrappedGhc "ghc"; - exeWrapper = backend: '' - makeWrapper \ - "${diagrams-builder}/bin/diagrams-builder-${backend}" "$out/bin/diagrams-builder-${backend}" \ - --set NIX_GHC ${ghc} \ - --set NIX_GHC_LIBDIR "$(${ghc} --print-libdir)" - ''; - - backends = [ + exeWrapper = + backend: + let + exe = "${diagrams-builder}/bin/diagrams-builder-${backend}"; + in + '' + test ! -x "${exe}" || \ + makeWrapper "${exe}" \ + "$out/bin/diagrams-builder-${backend}" \ + --set NIX_GHC ${ghc} \ + --set NIX_GHC_LIBDIR "$(${ghc} --print-libdir)" + ''; + + # Needs to match executable, suffix, not flag name + allBackends = [ "svg" - "cairo" "ps" + "cairo" + "rasterific" + "pgf" ]; in stdenv.mkDerivation { - name = "diagrams-builder"; + pname = "diagrams-builder"; + inherit (diagrams-builder) version; nativeBuildInputs = [ makeWrapper ]; - buildCommand = lib.concatStringsSep "\n" (map exeWrapper backends); + buildCommand = lib.concatStringsSep "\n" (map exeWrapper allBackends); # Will be faster to build the wrapper locally then to fetch it from a binary cache. preferLocalBuild = true; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 57fb400332af2..ee01ad87f88f0 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -105,6 +105,11 @@ stdenv.mkDerivation rec { echo "int main() { return 77; }" > "$f" done + # These tests sometimes fail on ZFS-backed NFS filesystems + sed '2i echo "Skipping test: fails on zfs " && exit 77' -i gnulib-tests/test-file-has-acl-1.sh + sed '2i echo "Skipping test: fails on zfs " && exit 77' -i gnulib-tests/test-set-mode-acl-1.sh + sed '2i echo "Skipping test: ls/removed-directory" && exit 77' -i ./tests/ls/removed-directory.sh + # intermittent failures on builders, unknown reason sed '2i echo Skipping du basic test && exit 77' -i ./tests/du/basic.sh diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 7a8711cefaed0..da35192c5e5a4 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -227,13 +227,6 @@ lib.makeExtensible ( hash = "sha256-Rmq98EchbKygPo+2g0nDsZ7QNMLe+loiMbflV5VKDzc="; }; - patches = [ - # Bumping to toml11 ≥4.0.0 makes integer parsing throw (as it should) instead of saturate on overflow. - # However, the updated version is not in nixpkgs yet, and the released versions still have the saturation bug. - # Hence reverting the bump for now seems to be the least bad option. - ./revert-toml11-bump.patch - ]; - cargoDeps = rustPlatform.fetchCargoVendor { name = "lix-${version}"; inherit src; diff --git a/pkgs/tools/package-management/lix/revert-toml11-bump.patch b/pkgs/tools/package-management/lix/revert-toml11-bump.patch deleted file mode 100644 index b92187d23a895..0000000000000 --- a/pkgs/tools/package-management/lix/revert-toml11-bump.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/doc/manual/rl-next/toml-number-overflow.md b/doc/manual/rl-next/toml-number-overflow.md -deleted file mode 100644 -index 1522213cb4..0000000000 ---- a/doc/manual/rl-next/toml-number-overflow.md -+++ /dev/null -@@ -1,14 +0,0 @@ ----- --synopsis: Reject overflowing TOML integer literals --issues: [] --cls: [3916] --category: "Breaking Changes" --credits: [emilazy] ----- -- --The toml11 library used by Lix was updated. The new --version aligns with the [TOML v1.0.0 specification’s --requirement](https://toml.io/en/v1.0.0#integer) to reject integer --literals that cannot be losslessly parsed. This means that code like --`builtins.fromTOML "v=0x8000000000000000"` will now produce an error --rather than silently saturating the integer result. -diff --git a/lix/libexpr/primops/fromTOML.cc b/lix/libexpr/primops/fromTOML.cc -index 9d4b5e6abf..3e26773eac 100644 ---- a/lix/libexpr/primops/fromTOML.cc -+++ b/lix/libexpr/primops/fromTOML.cc -@@ -65,10 +65,13 @@ - val, - toml::parse( - tomlStream, -- "fromTOML", /* the "filename" */ -+ "fromTOML" /* the "filename" */ -+#if HAVE_TOML11_4 -+ , - toml::spec::v( - 1, 0, 0 - ) // Be explicit that we are parsing TOML 1.0.0 without extensions -+#endif - ) - ); - } catch (std::exception & e) { // NOLINT(lix-foreign-exceptions) // TODO: toml::syntax_error -diff --git a/meson.build b/meson.build -index bede78a647..a72016522e 100644 ---- a/meson.build -+++ b/meson.build -@@ -363,7 +363,10 @@ - dependency('gmock_main', required : enable_tests, include_type : 'system'), - ] - --toml11 = dependency('toml11', version : '>=4.0.0', required : true, method : 'cmake', include_type : 'system') -+toml11 = dependency('toml11', version : '>=3.7.0', required : true, method : 'cmake', include_type : 'system') -+configdata += { -+ 'HAVE_TOML11_4': toml11.version().version_compare('>= 4.0.0').to_int(), -+} - - pegtl = dependency( - 'pegtl', -diff --git a/package.nix b/package.nix -index eb0e5c602a..9357b8ebd1 100644 ---- a/package.nix -+++ b/package.nix -@@ -57,7 +57,6 @@ - systemtap-lix ? __forDefaults.systemtap-lix, - # FIXME: remove default after dropping NixOS 25.05 - toml11-lix ? __forDefaults.toml11-lix, -- toml11, - util-linuxMinimal ? utillinuxMinimal, - utillinuxMinimal ? null, - xz, -@@ -118,8 +117,7 @@ - - passt-lix = callPackage ./misc/passt.nix { }; - -- toml11-lix = -- if lib.versionOlder toml11.version "4.4.0" then callPackage ./misc/toml11.nix { } else toml11; -+ toml11-lix = callPackage ./misc/toml11.nix { }; - }, - }: - -diff --git a/tests/functional2/lang/fromTOML-overflowing/eval-fail-overflow.err.exp b/tests/functional2/lang/fromTOML-overflowing/eval-fail-overflow.err.exp -deleted file mode 100644 -index 0c90e85edf..0000000000 ---- a/tests/functional2/lang/fromTOML-overflowing/eval-fail-overflow.err.exp -+++ /dev/null -@@ -1,13 +0,0 @@ --error: -- … while calling the 'fromTOML' builtin -- at /pwd/in.nix:1:1: -- 1| builtins.fromTOML ''attr = 9223372036854775808'' -- | ^ -- 2| -- -- error: while parsing TOML: [error] toml::parse_dec_integer: too large integer: current max digits = 2^63 -- --> fromTOML -- | -- 1 | attr = 9223372036854775808 -- | ^-- must be < 2^63 -- -diff --git a/tests/functional2/lang/fromTOML-overflowing/eval-fail-underflow.err.exp b/tests/functional2/lang/fromTOML-overflowing/eval-fail-underflow.err.exp -deleted file mode 100644 -index a287e18655..0000000000 ---- a/tests/functional2/lang/fromTOML-overflowing/eval-fail-underflow.err.exp -+++ /dev/null -@@ -1,13 +0,0 @@ --error: -- … while calling the 'fromTOML' builtin -- at /pwd/in.nix:1:1: -- 1| builtins.fromTOML ''attr = -9223372036854775809'' -- | ^ -- 2| -- -- error: while parsing TOML: [error] toml::parse_dec_integer: too large integer: current max digits = 2^63 -- --> fromTOML -- | -- 1 | attr = -9223372036854775809 -- | ^-- must be < 2^63 -- -diff --git a/tests/functional2/lang/fromTOML-overflowing/in-overflow.nix b/tests/functional2/lang/fromTOML-overflowing/in-overflow.nix -deleted file mode 100644 -index 17f0448b3d..0000000000 ---- a/tests/functional2/lang/fromTOML-overflowing/in-overflow.nix -+++ /dev/null -@@ -1,1 +0,0 @@ --builtins.fromTOML ''attr = 9223372036854775808'' -diff --git a/tests/functional2/lang/fromTOML-overflowing/in-underflow.nix b/tests/functional2/lang/fromTOML-overflowing/in-underflow.nix -deleted file mode 100644 -index 923fdf3545..0000000000 ---- a/tests/functional2/lang/fromTOML-overflowing/in-underflow.nix -+++ /dev/null -@@ -1,1 +0,0 @@ --builtins.fromTOML ''attr = -9223372036854775809'' diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 0732ef3c404ec..72f93b261e616 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -196,7 +196,7 @@ lib.makeExtensible ( latest = self.nix_2_31; # Read ./README.md before bumping a major release - stable = addFallbackPathsCheck self.nix_2_28; + stable = addFallbackPathsCheck self.nix_2_31; } // lib.optionalAttrs config.allowAliases ( lib.listToAttrs ( diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix index 67d96fa6e2538..bbca2d7e7d449 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/components.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix @@ -151,18 +151,6 @@ let ]; separateDebugInfo = !stdenv.hostPlatform.isStatic; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; - env = - prevAttrs.env or { } - // lib.optionalAttrs ( - stdenv.isLinux - && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") - && !( - stdenv.buildPlatform.config != stdenv.hostPlatform.config - && stdenv.hostPlatform.system == "powerpc64-linux" - ) - && !(stdenv.system == "loongarch64-linux") - && !(stdenv.hostPlatform.useLLVM or false) - ) { LDFLAGS = "-fuse-ld=gold"; }; }; mesonLibraryLayer = finalAttrs: prevAttrs: { diff --git a/pkgs/tools/package-management/nix/tests.nix b/pkgs/tools/package-management/nix/tests.nix index c9c7ddf2f0c09..5a7e9c245c863 100644 --- a/pkgs/tools/package-management/nix/tests.nix +++ b/pkgs/tools/package-management/nix/tests.nix @@ -56,7 +56,8 @@ }; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - nixStatic = pkgsStatic.nixVersions.${self_attribute_name}; + # unfortunally nixpkgs pkgsStatic is too often broken including the dependency closure of nix + # nixStatic = pkgsStatic.nixVersions.${self_attribute_name}; # Basic smoke tests that needs to pass when upgrading nix. # Note that this test does only test the nixVersions.stable attribute. diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 916dc22555762..d82686d98c3e8 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { # https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00021.html # Multiple upstream commits squashed with adjustments, see header ./gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch + ] + ++ lib.optionals stdenv.hostPlatform.useLLVM [ + ./musl-llvm.patch ]; nativeBuildInputs = [ diff --git a/pkgs/tools/text/diffutils/musl-llvm.patch b/pkgs/tools/text/diffutils/musl-llvm.patch new file mode 100644 index 0000000000000..535a64d1ab795 --- /dev/null +++ b/pkgs/tools/text/diffutils/musl-llvm.patch @@ -0,0 +1,15 @@ +--- + gnulib-tests/test-c32ispunct.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/gnulib-tests/test-c32ispunct.c ++++ b/gnulib-tests/test-c32ispunct.c +@@ -255,7 +255,7 @@ main (int argc, char *argv[]) + is = for_character ("\360\235\204\200", 4); + ASSERT (is != 0); + #endif +- #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__) ++ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__) + /* U+E003A TAG COLON */ + is = for_character ("\363\240\200\272", 4); + ASSERT (is == 0); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 928c06da2bea4..7d6c1298b940d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -383,6 +383,8 @@ mapAliases { AusweisApp2 = ausweisapp; # Added 2023-11-08 a4term = a4; # Added 2023-10-06 abseil-cpp_202301 = throw "abseil-cpp_202301 has been removed as it was unused in tree"; # Added 2025-08-09 + abseil-cpp_202501 = throw "abseil-cpp_202501 has been removed as it was unused in tree"; # Added 2025-09-15 + abseil-cpp_202505 = throw "abseil-cpp_202505 has been removed as it was unused in tree"; # Added 2025-09-15 acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27 acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04 adminer-pematon = adminneo; # Added 2025-02-20 @@ -582,6 +584,7 @@ mapAliases { callPackage_i686 = pkgsi686Linux.callPackage; cargo-asm = throw "'cargo-asm' has been removed due to lack of upstream maintenance. Consider 'cargo-show-asm' as an alternative."; # Added 2025-01-29 cask = emacs.pkgs.cask; # Added 2022-11-12 + catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21 catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 @@ -600,6 +603,8 @@ mapAliases { cataract-unstable = throw "'cataract-unstable' has been removed due to a lack of maintenace"; # Added 2025-08-25 cde = throw "'cde' has been removed as it is unmaintained and broken"; # Added 2025-05-17 centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18 + cereal_1_3_0 = throw "cereal_1_3_0 has been removed as it was unused; use cereal intsead"; # Added 2025-09-12 + cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12 certmgr-selfsigned = certmgr; # Added 2023-11-30 cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30 @@ -703,6 +708,7 @@ mapAliases { cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 + curlHTTP3 = lib.warnOnInstantiate "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22 cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 @@ -838,6 +844,7 @@ mapAliases { emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsPackages = emacs.pkgs; # Added 2025-03-02 + embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 enyo-doom = enyo-launcher; # Added 2022-09-09 eolie = throw "'eolie' has been removed due to being unmaintained"; # Added 2025-04-15 @@ -1746,6 +1753,7 @@ mapAliases { mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21 mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 + msgpack = throw "msgpack has been split into msgpack-c and msgpack-cxx"; # Added 2025-09-14 mumps_par = lib.warnOnInstantiate "mumps_par has been renamed to mumps-mpi" mumps-mpi; # Added 2025-05-07 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 music-player = throw "'music-player' has been removed due to lack of maintenance upstream. Consider using 'fum' or 'termusic' instead."; # Added 2025-05-02 @@ -1989,6 +1997,7 @@ mapAliases { OSCAR = oscar; # Added 2024-06-12 osm2xmap = throw "osm2xmap has been removed, as it is unmaintained upstream and depended on old dependencies with broken builds"; # Added 2025-09-16 osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 + overrideLibcxx = "overrideLibcxx has beeen removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15 overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub. See for migration instructions"; # Added 2025-08-04 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 oxygen-icons5 = throw '' @@ -2380,6 +2389,7 @@ mapAliases { soundOfSorting = sound-of-sorting; # Added 2023-07-07 SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 + spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet spark2014 = gnatprove; # Added 2024-02-25 space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08 spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12 @@ -2485,7 +2495,10 @@ mapAliases { taplo-lsp = taplo; # Added 2022-07-30 targetcli = targetcli-fb; # Added 2025-03-14 taro = taproot-assets; # Added 2023-07-04 - tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use tbb_2022"; # Added 2025-09-13 + tbb = onetbb; # Added 2025-09-14 + tbb_2020 = throw "tbb_2020 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-14 + tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-13 + tbb_2022 = onetbb; # Added 2025-09-14 tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02 tclcurl = tclPackages.tclcurl; # Added 2024-10-02 tcllib = tclPackages.tcllib; # Added 2024-10-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d94e805dab586..ba932e007ef66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -283,8 +283,6 @@ with pkgs; cve = with python3Packages; toPythonApplication cvelib; basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix { - tbb = tbb_2022; - cereal = cereal_1_3_2; opencv = opencv.override { enableGtk3 = true; }; }; @@ -328,8 +326,6 @@ with pkgs; practiceMod = true; }; - cereal = cereal_1_3_0; - chef-cli = callPackage ../tools/misc/chef-cli { }; clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { @@ -391,10 +387,6 @@ with pkgs; protobuf = protobuf_21; }; - vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { - fmt = fmt_11; - }; - r3ctl = qt5.callPackage ../tools/misc/r3ctl { }; deviceTree = callPackage ../os-specific/linux/device-tree { }; @@ -1860,10 +1852,6 @@ with pkgs; capstone = callPackage ../development/libraries/capstone { }; capstone_4 = callPackage ../development/libraries/capstone/4.nix { }; - catch2 = callPackage ../development/libraries/catch2 { }; - - catch2_3 = callPackage ../development/libraries/catch2/3.nix { }; - ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; @@ -2392,7 +2380,7 @@ with pkgs; # To see which `fmt` version Ceph upstream recommends, check its `src/fmt` submodule. # - # Ceph does not currently build with `fmt_10`; see https://github.com/NixOS/nixpkgs/issues/281027#issuecomment-1899128557 + # Ceph does not currently build with `fmt_11`; see https://github.com/NixOS/nixpkgs/issues/281027#issuecomment-1899128557 # If we want to switch for that before upstream fixes it, use this patch: # https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899648638 fmt = fmt_9; @@ -2615,15 +2603,12 @@ with pkgs; websocketSupport = true; }; - curlHTTP3 = curl.override { - http3Support = true; - }; - curl = curlMinimal.override ( { idnSupport = true; pslSupport = true; zstdSupport = true; + http3Support = true; } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { brotliSupport = true; @@ -2633,6 +2618,7 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; + ngtcp2 = ngtcp2-gnutls; }; curl-impersonate-ff = curl-impersonate.curl-impersonate-ff; @@ -2736,7 +2722,6 @@ with pkgs; ); embree = callPackage ../development/libraries/embree { }; - embree2 = callPackage ../development/libraries/embree/2.x.nix { }; emborg = python3Packages.callPackage ../development/python-modules/emborg { }; @@ -5023,24 +5008,18 @@ with pkgs; haskell = recurseIntoAttrs (callPackage ./haskell-packages.nix { }); - haskellPackages = - recurseIntoAttrs - # Prefer native-bignum to avoid linking issues with gmp - # GHC 9.6 rts can't be built statically with hadrian, so we need to use 9.4 - # until 9.8 is ready - ( - if stdenv.hostPlatform.isStatic then - haskell.packages.native-bignum.ghc94 - # JS backend can't use gmp - else if stdenv.hostPlatform.isGhcjs then - haskell.packages.native-bignum.ghc98 - # ICEs horribly on i686, see https://gitlab.haskell.org/ghc/ghc/-/issues/25904 - # FIXME: remove when fixed - else if stdenv.hostPlatform.isi686 then - haskell.packages.ghc96 - else - haskell.packages.ghc98 - ); + haskellPackages = recurseIntoAttrs ( + # Prefer native-bignum to avoid linking issues with gmp; + # TemplateHaskell doesn't work with hadrian built GHCs yet + # https://github.com/NixOS/nixpkgs/issues/275304 + if stdenv.hostPlatform.isStatic then + haskell.packages.native-bignum.ghc94 + # JS backend can't use gmp + else if stdenv.hostPlatform.isGhcjs then + haskell.packages.native-bignum.ghc910 + else + haskell.packages.ghc910 + ); # haskellPackages.ghc is build->host (it exposes the compiler used to build the # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more @@ -5051,21 +5030,17 @@ with pkgs; # however, targetPackages won't be populated, so we need to fall back to the # plain, cross-compiled compiler (which is only theoretical at the moment). ghc = - targetPackages.haskellPackages.ghc or - # Prefer native-bignum to avoid linking issues with gmp - # Use 9.4 for static over broken 9.6 - ( + targetPackages.haskellPackages.ghc or ( + # Prefer native-bignum to avoid linking issues with gmp; + # TemplateHaskell doesn't work with hadrian built GHCs yet + # https://github.com/NixOS/nixpkgs/issues/275304 if stdenv.targetPlatform.isStatic then haskell.compiler.native-bignum.ghc94 # JS backend can't use GMP else if stdenv.targetPlatform.isGhcjs then - haskell.compiler.native-bignum.ghc98 - # ICEs horribly on i686, see https://gitlab.haskell.org/ghc/ghc/-/issues/25904 - # FIXME: remove when fixed - else if stdenv.hostPlatform.isi686 then - haskell.compiler.ghc96 + haskell.compiler.native-bignum.ghc910 else - haskell.compiler.ghc98 + haskell.compiler.ghc910 ); alex = haskell.lib.compose.justStaticExecutables haskellPackages.alex; @@ -5102,8 +5077,6 @@ with pkgs; purenix = haskell.lib.compose.justStaticExecutables haskellPackages.purenix; - spago = callPackage ../development/tools/purescript/spago { }; - pulp = nodePackages.pulp; pscid = nodePackages.pscid; @@ -5321,7 +5294,7 @@ with pkgs; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; - llvmPackages = llvmPackages_19; + llvmPackages = llvmPackages_21; inherit (rec { @@ -5482,9 +5455,7 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... }@args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_89 = callPackage ../development/compilers/rust/1_89.nix { - llvm_20 = llvmPackages_20.libllvm; - }; + rust_1_89 = callPackage ../development/compilers/rust/1_89.nix { }; rust = rust_1_89; mrustc = callPackage ../development/compilers/mrustc { }; @@ -5586,9 +5557,6 @@ with pkgs; swi-prolog-gui = swi-prolog.override { withGui = true; }; - # many packages still fail with latest version - tbb = tbb_2020; - teyjus = callPackage ../development/compilers/teyjus { inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage; }; @@ -7114,7 +7082,6 @@ with pkgs; abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix { }; abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix { }; - abseil-cpp = abseil-cpp_202501; acl = callPackage ../development/libraries/acl { }; @@ -7213,7 +7180,6 @@ with pkgs; cctag = callPackage ../development/libraries/cctag { stdenv = clangStdenv; - tbb = tbb_2022; }; ceedling = callPackage ../development/tools/ceedling { }; @@ -7381,7 +7347,7 @@ with pkgs; inherit (callPackages ../development/libraries/fmt { }) fmt_9 fmt_10 fmt_11; - fmt = fmt_10; + fmt = fmt_11; fplll = callPackage ../development/libraries/fplll { }; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; @@ -8374,9 +8340,11 @@ with pkgs; nss = nss_esr; nssTools = nss.tools; - nuspell = callPackage ../development/libraries/nuspell { }; nuspellWithDicts = - dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; + dicts: + lib.warn "nuspellWithDicts is deprecated, please use nuspell.withDicts instead." nuspell.withDicts ( + _: dicts + ); nv-codec-headers-9 = nv-codec-headers.override { majorVersion = "9"; }; nv-codec-headers-10 = nv-codec-headers.override { majorVersion = "10"; }; @@ -8879,10 +8847,6 @@ with pkgs; tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { }; - termbench-pro = callPackage ../by-name/te/termbench-pro/package.nix { - fmt = fmt_11; - }; - tinyxml = tinyxml2; tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; @@ -14762,7 +14726,7 @@ with pkgs; nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate; nix-deploy = haskell.lib.compose.justStaticExecutables haskellPackages.nix-deploy; - nix-derivation = haskell.lib.compose.justStaticExecutables haskellPackages.nix-derivation; + nix-derivation = haskellPackages.nix-derivation.bin; nix-diff = haskell.lib.compose.justStaticExecutables haskellPackages.nix-diff; nix-info = callPackage ../tools/nix/info { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 0bf52553d0295..9adaebefedc52 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -101,6 +101,8 @@ makeScopeWithSplicing' { libunwind = callPackage ../os-specific/darwin/libunwind { }; + libcxx = callPackage ../os-specific/darwin/libcxx { }; + sigtool = callPackage ../os-specific/darwin/sigtool { }; signingUtils = callPackage ../os-specific/darwin/signing-utils { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6da3d96393483..827685681415a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -97,15 +97,6 @@ in inherit buildTargetLlvmPackages llvmPackages; }; ghc94 = compiler.ghc948; - ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix { - bootPkgs = bb.packages.ghc924Binary; - inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - inherit buildTargetLlvmPackages llvmPackages; - }; ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix { bootPkgs = bb.packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; @@ -138,7 +129,7 @@ in # that 9.6.4 bindists pass linker flags our ld doesn't support). # With both 9.6.3 and 9.6.4 binary it is impossible to link against # the clock package (probably a hsc2hs problem). - bb.packages.ghc963 + bb.packages.ghc967 else bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; @@ -156,7 +147,7 @@ in # that 9.6.4 bindists pass linker flags our ld doesn't support). # With both 9.6.3 and 9.6.4 binary it is impossible to link against # the clock package (probably a hsc2hs problem). - bb.packages.ghc963 + bb.packages.ghc967 else bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; @@ -174,7 +165,7 @@ in # that 9.6.4 bindists pass linker flags our ld doesn't support). # With both 9.6.3 and 9.6.4 binary it is impossible to link against # the clock package (probably a hsc2hs problem). - bb.packages.ghc963 + bb.packages.ghc967 else bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; @@ -182,9 +173,7 @@ in # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # 2023-01-15: Support range >= 11 && < 16 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; - llvmPackages = pkgs.llvmPackages_15; + inherit buildTargetLlvmPackages llvmPackages; }; ghc910 = compiler.ghc9103; ghc9121 = callPackage ../development/compilers/ghc/9.12.1.nix { @@ -283,11 +272,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; ghc94 = packages.ghc948; - ghc963 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc963; - ghc = bh.compiler.ghc963; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - }; ghc967 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc967; ghc = bh.compiler.ghc967; @@ -330,7 +314,7 @@ in ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.14.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.16.x.nix { }; }; native-bignum = diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07f7759062456..f97f0f13bb157 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2062,21 +2062,14 @@ with self; AuthenSASL = buildPerlPackage { pname = "Authen-SASL"; - version = "2.1700"; + version = "2.1900"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EH/EHUELS/Authen-SASL-2.1700.tar.gz"; - hash = "sha256-uG1aV2uNOHruJPOfR6VK/RS7ZrCQA9tQZQAfHeA6js4="; + url = "mirror://cpan/authors/id/E/EH/EHUELS/Authen-SASL-2.1900.tar.gz"; + hash = "sha256-vjUzpokbLmdxULR5waDUvxHIu+6+0+e466NAU+k5I7A="; }; - patches = [ - (fetchurl { - name = "CVE-2025-40918.patch"; - url = "https://security.metacpan.org/patches/A/Authen-SASL/2.1800/CVE-2025-40918-r1.patch"; - hash = "sha256-2Mk6RoD7tI8V6YFV8gs08LLs0QeMJqwGz/eZ6zXBBpw="; - }) - ]; propagatedBuildInputs = [ - DigestHMAC CryptURandom + DigestHMAC ]; meta = { description = "SASL Authentication framework"; @@ -39014,10 +39007,10 @@ with self; XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.46"; + version = "0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.46.tar.gz"; - hash = "sha256-ZaJyapEAeUma1LuDxBeAWdpDMGrpLIc0yPoXwC8ioB0="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.48.tar.gz"; + hash = "sha256-hXoHC6Rlq1uJ1NjTbZI1jt1m5ee0qRWEYR2FElrJqcc="; }; buildInputs = [ ExtUtilsCChecker diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7674234b5ff83..6e6e1d7f31600 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -242,6 +242,7 @@ mapAliases { eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 EasyProcess = easyprocess; # added 2023-02-19 email_validator = email-validator; # added 2022-06-22 + embreex = throw "embreex has been removed, as it required embree2"; # added 2025-09-14 enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15 enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64f7de7754713..1bed37db40d10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1138,6 +1138,12 @@ self: super: with self; { audiotools = callPackage ../development/python-modules/audiotools { }; + audit = toPythonModule ( + pkgs.audit.override { + python3Packages = self; + } + ); + auditok = callPackage ../development/python-modules/auditok { }; auditwheel = callPackage ../development/python-modules/auditwheel { @@ -4691,8 +4697,6 @@ self: super: with self; { embrace = callPackage ../development/python-modules/embrace { }; - embreex = callPackage ../development/python-modules/embreex { }; - emcee = callPackage ../development/python-modules/emcee { }; emoji = callPackage ../development/python-modules/emoji { }; @@ -8129,6 +8133,8 @@ self: super: with self; { lektricowifi = callPackage ../development/python-modules/lektricowifi { }; + lerobot = callPackage ../development/python-modules/lerobot { }; + letpot = callPackage ../development/python-modules/letpot { }; leveldb = callPackage ../development/python-modules/leveldb { }; @@ -8968,9 +8974,7 @@ self: super: with self; { callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; - manifold3d = callPackage ../development/python-modules/manifold3d { - inherit (pkgs.manifold.passthru) tbb; - }; + manifold3d = callPackage ../development/python-modules/manifold3d { }; manim = callPackage ../development/python-modules/manim { }; @@ -15512,7 +15516,7 @@ self: super: with self; { qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; - qdldl = callPackage ../development/python-modules/qdldl { }; + qdldl = callPackage ../development/python-modules/qdldl { inherit (pkgs) qdldl; }; qdrant-client = callPackage ../development/python-modules/qdrant-client { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7a32824a5f6a2..5013bf119de82 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -64,11 +64,11 @@ let # list of all compilers to test specific packages on released = with compilerNames; [ ghc948 - ghc963 ghc967 ghc984 ghc9101 ghc9102 + ghc9103 # exclude ghc9121 due to severe miscompilation bug ghc9122 ]; @@ -334,7 +334,7 @@ let shellcheck-minimal sourceAndTags spacecookie - spago + spago-legacy specup splot stack @@ -350,8 +350,7 @@ let uusi uqm uuagc - # vaultenv: broken by connection on 2024-03-16 - wstunnel + vaultenv xmobar xmonadctl xmonad-with-packages @@ -432,8 +431,8 @@ let ; }; - haskell.packages.native-bignum.ghc984 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc984) + haskell.packages.native-bignum.ghc9103 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc9103) hello random QuickCheck @@ -478,14 +477,6 @@ let ; }; - haskell.packages.ghc98 = { - inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghc98) - ghc - hello - microlens - ; - }; - haskell.packages.ghc912 = { inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghc912) ghc @@ -555,6 +546,7 @@ let ] released; Cabal_3_12_1_0 = released; Cabal_3_14_2_0 = released; + Cabal_3_16_0_0 = released; cabal2nix = released; cabal2nix-unstable = released; funcmp = released; @@ -562,12 +554,14 @@ let # for 9.10, test that using filepath (instead of filepath-bytestring) works. compilerNames.ghc9101 compilerNames.ghc9102 + compilerNames.ghc9103 ]; haskell-language-server = released; hoogle = released; hlint = lib.subtractLists [ compilerNames.ghc9101 compilerNames.ghc9102 + compilerNames.ghc9103 compilerNames.ghc9122 ] released; hpack = released; @@ -595,6 +589,7 @@ let weeder = lib.subtractLists [ compilerNames.ghc9101 compilerNames.ghc9102 + compilerNames.ghc9103 compilerNames.ghc9122 ] released; }) @@ -675,7 +670,7 @@ let constituents = accumulateDerivations [ jobs.pkgsStatic.haskell.packages.native-bignum.ghc948 # non-hadrian jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc984 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc9103 ]; }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ff45ccee7bced..e8ce5f1c82b61 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -22,7 +22,7 @@ supportedSystems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json), # The platform triples for which we build bootstrap tools. bootstrapConfigs ? [ - "aarch64-apple-darwin" + "arm64-apple-darwin" "aarch64-unknown-linux-gnu" "aarch64-unknown-linux-musl" "i686-unknown-linux-gnu"